diff --git a/slsDetectorSoftware/src/CmdLineApp.cpp b/slsDetectorSoftware/src/CmdLineApp.cpp index 3dfddf2de..9f75e4dfd 100644 --- a/slsDetectorSoftware/src/CmdLineApp.cpp +++ b/slsDetectorSoftware/src/CmdLineApp.cpp @@ -50,7 +50,8 @@ int main(int argc, char *argv[]) { parser.Parse(argc, argv); // If we called sls_detector_acquire, add the acquire command - if (action == slsDetectorDefs::READOUT_ACTION || action == slsDetectorDefs::READOUT_ZMQ_ACTION) + if (action == slsDetectorDefs::READOUT_ACTION || + action == slsDetectorDefs::READOUT_ZMQ_ACTION) parser.setCommand("acquire"); if (parser.isHelp()) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 241452922..64688245c 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -206,11 +206,10 @@ std::string CmdProxy::VirtualServer(int action) { } void CmdProxy::EmptyDataCallBack(detectorData *data, uint64_t frameIndex, - uint32_t subFrameIndex, void *this_pointer) { + uint32_t subFrameIndex, void *this_pointer) { LOG(logDEBUG) << "EmptyDataCallBack to start up zmq sockets"; } - std::string CmdProxy::Acquire(int action) { std::ostringstream os; if (action == defs::HELP_ACTION) { diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index d620f0bcb..d58c9dce2 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1350,7 +1350,8 @@ class CmdProxy { std::string GapPixels(int action); std::string BadChannels(int action); /* acquisition parameters */ - static void EmptyDataCallBack(detectorData *data, uint64_t frameIndex, uint32_t subFrameIndex, void *this_pointer); + static void EmptyDataCallBack(detectorData *data, uint64_t frameIndex, + uint32_t subFrameIndex, void *this_pointer); std::string Acquire(int action); std::string Exptime(int action); std::string ReadoutSpeed(int action); diff --git a/slsDetectorSoftware/src/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index f047f7064..294af361b 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -742,8 +742,9 @@ void DetectorImpl::readFrameFromReceiver() { } } - LOG(logDEBUG) << "Call Back Info:" << "\n\t nDetPixelsX: " - << nDetPixelsX << "\n\t nDetPixelsY: " << nDetPixelsY + LOG(logDEBUG) << "Call Back Info:" + << "\n\t nDetPixelsX: " << nDetPixelsX + << "\n\t nDetPixelsY: " << nDetPixelsY << "\n\t databytes: " << multisize << "\n\t dynamicRange: " << dynamicRange; @@ -761,8 +762,8 @@ void DetectorImpl::readFrameFromReceiver() { callbackImage = multigappixels; imagesize = n; } - LOG(logDEBUG) << "Image Info:" << "\n\tnDetActualPixelsX: " - << nDetActualPixelsX + LOG(logDEBUG) << "Image Info:" + << "\n\tnDetActualPixelsX: " << nDetActualPixelsX << "\n\tnDetActualPixelsY: " << nDetActualPixelsY << "\n\timagesize: " << imagesize << "\n\tdynamicRange: " << dynamicRange; @@ -797,7 +798,8 @@ void DetectorImpl::readFrameFromReceiver() { int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable, int dr, int &nPixelsx, int &nPixelsy) { - LOG(logDEBUG) << "Insert Gap pixels:" << "\n\t nPixelsx: " << nPixelsx + LOG(logDEBUG) << "Insert Gap pixels:" + << "\n\t nPixelsx: " << nPixelsx << "\n\t nPixelsy: " << nPixelsy << "\n\t quadEnable: " << quadEnable << "\n\t dr: " << dr; @@ -882,10 +884,12 @@ int DetectorImpl::insertGapPixels(char *image, char *&gpImage, bool quadEnable, << "nMod1Pixelsy: " << nMod1Pixelsy << "\n\t" << "nMod1GapPixelsx: " << nMod1GapPixelsx << "\n\t" << "nMod1GapPixelsy: " << nMod1GapPixelsy << "\n\t" - << "nChipy: " << nChipy << "\n\t" << "nChipx: " << nChipx - << "\n\t" << "nModx: " << nModx << "\n\t" - << "nMody: " << nMody << "\n\t" << "nTotx: " << nTotx - << "\n\t" << "nToty: " << nToty << "\n\t" + << "nChipy: " << nChipy << "\n\t" + << "nChipx: " << nChipx << "\n\t" + << "nModx: " << nModx << "\n\t" + << "nMody: " << nMody << "\n\t" + << "nTotx: " << nTotx << "\n\t" + << "nToty: " << nToty << "\n\t" << "bytesPerPixel: " << bytesPerPixel << "\n\t" << "imagesize: " << imagesize << "\n\t" << "nChipBytesx: " << nChipBytesx << "\n\t" @@ -1319,7 +1323,7 @@ void DetectorImpl::startAcquisition(const bool blocking, Positions pos) { if (blocking) { Parallel(&Module::startAndReadAll, masters); // ensure all status normal (slaves not blocking) - // to catch those slaves that are still 'waiting' + // to catch those slaves that are still 'waiting' auto statusList = Parallel(&Module::getRunStatus, pos); // if any slave still waiting, wait up to 1s (gotthard) for (int i = 0; i != 20 && statusList.any(WAITING); ++i) { diff --git a/slsSupportLib/include/sls/sls_detector_defs.h b/slsSupportLib/include/sls/sls_detector_defs.h index 6c682ae74..ac6fa5146 100644 --- a/slsSupportLib/include/sls/sls_detector_defs.h +++ b/slsSupportLib/include/sls/sls_detector_defs.h @@ -215,7 +215,13 @@ typedef struct { /** type of action performed (for text client) */ - enum { GET_ACTION, PUT_ACTION, READOUT_ACTION, HELP_ACTION, READOUT_ZMQ_ACTION }; + enum { + GET_ACTION, + PUT_ACTION, + READOUT_ACTION, + HELP_ACTION, + READOUT_ZMQ_ACTION + }; /** dimension indexes diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 904367157..b84aebe0e 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -9,5 +9,5 @@ #define APIJUNGFRAU "8.0.0 0x231109" #define APIEIGER "8.0.0 0x231109" #define APILIB "8.0.1 0x240112" -#define APIMOENCH "8.0.2 0x240703" -#define APIMYTHEN3 "8.0.2 0x240715" +#define APIMOENCH "8.0.2 0x240703" +#define APIMYTHEN3 "8.0.2 0x240715"