diff --git a/slsDetectorServers/eigerDetectorServer/FebControl.c b/slsDetectorServers/eigerDetectorServer/FebControl.c index d123dd80f..2e53d0ed6 100644 --- a/slsDetectorServers/eigerDetectorServer/FebControl.c +++ b/slsDetectorServers/eigerDetectorServer/FebControl.c @@ -626,8 +626,8 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) { << ((7 - i) * 4); // upper } } // end column loop i - } // end supercolumn loop sc - } // end row loop + } // end supercolumn loop sc + } // end row loop if (Feb_Control_activated) { if (!Feb_Interface_WriteMemoryInLoops(Feb_Control_leftAddress, @@ -644,7 +644,7 @@ int Feb_Control_SetTrimbits(unsigned int *trimbits, int top) { } } // end row_set loop (groups of 16 rows) - } // end l_r loop + } // end l_r loop memcpy(Feb_Control_last_downloaded_trimbits, trimbits, Feb_Control_trimbit_size * sizeof(unsigned int)); diff --git a/slsDetectorServers/slsDetectorServer/src/arm64.c b/slsDetectorServers/slsDetectorServer/src/arm64.c index ae4685911..44a990e9d 100644 --- a/slsDetectorServers/slsDetectorServer/src/arm64.c +++ b/slsDetectorServers/slsDetectorServer/src/arm64.c @@ -11,8 +11,8 @@ #include // mmap /* global variables */ -#define CSP0 (0xB0080000) -#define CSP1 (0xB0050000) // udp +#define CSP0 (0xB0080000) +#define CSP1 (0xB0050000) // udp #define MEM_SIZE_CSP0 (0x10000) #define MEM_SIZE_CSP1 (0x2000) // smaller size for udp @@ -63,7 +63,8 @@ int mapCSP0(void) { *cspbases[i] = malloc(memsize[i]); if (*cspbases[i] == NULL) { LOG(logERROR, - ("Could not allocate virtual memory of size %d for %s.\n", memsize[i], names[i])); + ("Could not allocate virtual memory of size %d for %s.\n", + memsize[i], names[i])); return FAIL; } LOG(logINFO, ("memory allocated for %s\n", names[i])); @@ -83,8 +84,9 @@ int mapCSP0(void) { return FAIL; } #endif - LOG(logINFO, ("%s mapped of size %d from %p to %p,(CSP:0x%x) \n", names[i], memsize[i], - *cspbases[i], *cspbases[i] + memsize[i], csps[i])); + LOG(logINFO, + ("%s mapped of size %d from %p to %p,(CSP:0x%x) \n", names[i], + memsize[i], *cspbases[i], *cspbases[i] + memsize[i], csps[i])); // LOG(logINFO, ("Status Register: %08x\n", bus_r(STATUS_REG))); } else LOG(logINFO, ("Memory %s already mapped before\n", names[i])); diff --git a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h index 58926287c..f69d721c8 100644 --- a/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/xilinx_ctbDetectorServer/slsDetectorServer_defs.h @@ -146,7 +146,7 @@ typedef struct udp_header_struct { uint16_t ip_destip_lsb; // padding uint32_t padding0; - uint32_t padding1; + uint32_t padding1; } udp_header; #define IP_HEADER_SIZE (20) diff --git a/slsDetectorSoftware/generator/Caller.in.h b/slsDetectorSoftware/generator/Caller.in.h index 0344605c6..89b633095 100644 --- a/slsDetectorSoftware/generator/Caller.in.h +++ b/slsDetectorSoftware/generator/Caller.in.h @@ -71,8 +71,9 @@ class Caller { using StringMap = std::map; Detector *ptr; // pointer to the detector that executes the command - 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); + FunctionMap functions{ {"list", &Caller::list}, diff --git a/slsDetectorSoftware/src/CallerSpecial.cpp b/slsDetectorSoftware/src/CallerSpecial.cpp index ec42a0368..0b6599015 100644 --- a/slsDetectorSoftware/src/CallerSpecial.cpp +++ b/slsDetectorSoftware/src/CallerSpecial.cpp @@ -214,7 +214,7 @@ std::string Caller::hostname(int action) { } void Caller::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"; } diff --git a/slsDetectorSoftware/src/CmdApp.cpp b/slsDetectorSoftware/src/CmdApp.cpp index 5f6c98628..facb584a8 100644 --- a/slsDetectorSoftware/src/CmdApp.cpp +++ b/slsDetectorSoftware/src/CmdApp.cpp @@ -42,7 +42,8 @@ int main(int argc, char *argv[]) { sls::CmdParser parser; parser.Parse(argc, argv); - 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/DetectorImpl.cpp b/slsDetectorSoftware/src/DetectorImpl.cpp index 39caeb265..c9e078034 100644 --- a/slsDetectorSoftware/src/DetectorImpl.cpp +++ b/slsDetectorSoftware/src/DetectorImpl.cpp @@ -744,8 +744,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; @@ -763,8 +764,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; @@ -799,7 +800,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; @@ -884,10 +886,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" @@ -1321,7 +1325,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 e56032dd1..96b1f8a43 100644 --- a/slsSupportLib/include/sls/sls_detector_defs.h +++ b/slsSupportLib/include/sls/sls_detector_defs.h @@ -216,7 +216,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 fdc80a2d7..33bda4eb7 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -4,11 +4,11 @@ #define RELEASE "developer" #define APILIB "developer 0x230224" #define APIRECEIVER "developer 0x230224" -#define APICTB "developer 0x240820" -#define APIGOTTHARD "developer 0x240820" +#define APICTB "developer 0x240820" +#define APIGOTTHARD "developer 0x240820" #define APIGOTTHARD2 "developer 0x240820" -#define APIJUNGFRAU "developer 0x240820" -#define APIMYTHEN3 "developer 0x240820" -#define APIMOENCH "developer 0x240820" -#define APIEIGER "developer 0x240820" +#define APIJUNGFRAU "developer 0x240820" +#define APIMYTHEN3 "developer 0x240820" +#define APIMOENCH "developer 0x240820" +#define APIEIGER "developer 0x240820" #define APIXILINXCTB "developer 0x240820"