Skip to content

Commit d07e573

Browse files
committed
fix bits_per_pixel issue
1 parent a48136b commit d07e573

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

camerad/archon_interface.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,17 @@ namespace Camera {
854854
return ERROR;
855855
}
856856

857+
std::stringstream msg;
858+
msg << "detector=" << info->detector_pixels[0] << "x" << info->detector_pixels[1]
859+
<< " image_memory=" << info->image_memory
860+
<< " image_data_bytes=" << info->image_data_bytes
861+
<< " num_detect=" << mode->geometry.num_detect
862+
<< " amps=" << mode->geometry.amps[0] << "x" << mode->geometry.amps[1]
863+
<< " pixelcount=" << mode->geometry.pixelcount
864+
<< " linecount=" << mode->geometry.linecount
865+
<< " samplemode=" << mode->samplemode;
866+
logwrite(function, msg.str());
867+
857868
return NO_ERROR;
858869
}
859870
/***** Camera::ArchonInterface::set_image_geometry **************************/

camerad/camera_information.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ namespace Camera {
107107
const std::string function("Camera::Information::set_axes");
108108
std::ostringstream oss;
109109

110-
uint8_t bytes_per_pixel = bits_per_pixel / 2;
110+
uint8_t bytes_per_pixel = bits_per_pixel / 8;
111111

112112
uint32_t cols = this->region_of_interest[1]
113113
- this->region_of_interest[0]

0 commit comments

Comments
 (0)