diff --git a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c index 203ab4198..9ef94f308 100644 --- a/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c +++ b/slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c @@ -11205,8 +11205,7 @@ int set_collection_mode(int file_des) { } enum collectionMode retval = getElectronCollectionMode() ? ELECTRON : HOLE; - validate(&ret, mess, (int)arg, (int)retval, "set collection mode", - DEC); + validate(&ret, mess, (int)arg, (int)retval, "set collection mode", DEC); LOG(logDEBUG1, ("collection mode retval: %u\n", retval)); } #endif diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard.cpp index 91c6f182e..9eaa5db73 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard.cpp @@ -19,8 +19,7 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back GOTTHARD dacs", - "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmdcall][.dacs]") { // vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp, // ib_test_c diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp index 1bcfbb937..bc810731b 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp @@ -106,8 +106,7 @@ TEST_CASE("timegotthard2", "[.cmdcall]") { } /* dacs */ -TEST_CASE("Setting and reading back GOTTHARD2 dacs", - "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") { // vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds, // vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1, // vref_prech, vref_l_adc, vref_cds, vb_cs, diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp index 9532fdfb6..614404ad1 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp @@ -17,8 +17,7 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back Jungfrau dacs", - "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") { // vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds, // vref_comp Detector det; diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp index ee37b3a67..16295a3e1 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp @@ -19,8 +19,7 @@ using test::PUT; /* dacs */ -TEST_CASE("Setting and reading back MYTHEN3 dacs", - "[.cmdcall][.dacs]") { +TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") { // vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1, // vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh, diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index c7c210986..a28b100ea 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -805,7 +805,8 @@ void Implementation::stopReceiver() { } TLogLevel lev = ((mp[i]) > 0) ? logINFORED : logINFOGREEN; - LOG(lev) << "Summary of Port " << udpPortNum[i] << " (" << eth[i] << ')' << summary; + LOG(lev) << "Summary of Port " << udpPortNum[i] << " (" << eth[i] + << ')' << summary; } // callback diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp index b291e446d..c6a0aea18 100644 --- a/slsReceiverSoftware/src/Listener.cpp +++ b/slsReceiverSoftware/src/Listener.cpp @@ -149,13 +149,15 @@ void Listener::CreateUDPSocket(int &actualSize) { packetSize = generalData->vetoPacketSize; } - std::string ip = (eth.length() ? InterfaceNameToIp(eth).str().c_str() : ""); + std::string ip = + (eth.length() ? InterfaceNameToIp(eth).str().c_str() : ""); udpSocket = nullptr; udpSocket = make_unique( udpPortNumber, packetSize, (ip.length() ? ip.c_str() : nullptr), generalData->udpSocketBufferSize); - LOG(logINFO) << index << ": UDP port opened at port " << udpPortNumber << " (" << (ip.length() ? ip : "any") << ')'; + LOG(logINFO) << index << ": UDP port opened at port " << udpPortNumber + << " (" << (ip.length() ? ip : "any") << ')'; udpSocketAlive = true; diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 05c6f1dc2..e547c73c9 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -10,5 +10,5 @@ #define APIMOENCH "developer 0x240918" #define APIXILINXCTB "developer 0x240918" #define APIEIGER "developer 0x240918" -#define APIMYTHEN3 "developer 0x241001" -#define APIJUNGFRAU "developer 0x241001" +#define APIMYTHEN3 "developer 0x241001" +#define APIJUNGFRAU "developer 0x241001"