diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index c476bf0a2..b0acce0ba 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2478,7 +2478,7 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) { setReceiverStreamingIP(getReceiverStreamingIP()); setAdditionalJsonHeader(thisDetector->receiver_additionalJsonHeader); enableDataStreamingFromReceiver(enableDataStreamingFromReceiver(-1)); - if (thisDetector->myDetectorType == GOTTHARD) { + if (thisDetector->myDetectorType == GOTTHARD || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) { sendROI(-1, nullptr); } } diff --git a/slsReceiverSoftware/include/GeneralData.h b/slsReceiverSoftware/include/GeneralData.h index 1cd987483..4e7908d72 100644 --- a/slsReceiverSoftware/include/GeneralData.h +++ b/slsReceiverSoftware/include/GeneralData.h @@ -555,18 +555,21 @@ public: * @param t tengiga enable */ void setImageSize(slsDetectorDefs::readOutFlags f, std::vector i, int s, bool t) { - int nchans = 0; - if (f & slsDetectorDefs::NORMAL_READOUT || f & slsDetectorDefs::ANALOG_AND_DIGITAL) { - nchans += NCHAN_ANALOG; - - // if roi - if (i.size()) { - nchans = abs(i[0].xmax - i[0].xmin); - } - } - if (f & slsDetectorDefs::DIGITAL_ONLY || f & slsDetectorDefs::ANALOG_AND_DIGITAL) - nchans += NCHAN_DIGITAL; - + int nchans = 0; + if (f != slsDetectorDefs::GET_READOUT_FLAGS) { + // analog channels + if (f == slsDetectorDefs::NORMAL_READOUT || f & slsDetectorDefs::ANALOG_AND_DIGITAL) { + nchans += NCHAN_ANALOG; + // if roi + if (i.size()) { + nchans = abs(i[0].xmax - i[0].xmin); + } + } + // digital channels + if (f & slsDetectorDefs::DIGITAL_ONLY || f & slsDetectorDefs::ANALOG_AND_DIGITAL) { + nchans += NCHAN_DIGITAL; + } + } nPixelsX = nchans; nPixelsY = s; // 10G diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp index eadfaf74a..010ccf22a 100644 --- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp +++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp @@ -69,7 +69,7 @@ void slsReceiverImplementation::InitializeMembers() { flippedData[0] = 0; flippedData[1] = 0; gapPixelsEnable = false; - readoutFlags = NORMAL_READOUT; + readoutFlags = GET_READOUT_FLAGS; //*** receiver parameters *** numThreads = 1; @@ -457,7 +457,7 @@ int slsReceiverImplementation::setReadOutFlags(const readOutFlags f) { } std::string flag; if (f == NORMAL_READOUT) - flag = "none"; + flag = "normal(analog, no digital)"; else if (f & STORE_IN_RAM) flag.append("storeinram "); if (f & TOT_MODE)