detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

formatting

Browse Source
This commit is contained in:
maliakal_d 2024-10-01 14:44:59 +02:00
parent fd010b9aa5
commit e59de85a33
8 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -11205,8 +11205,7 @@ int set_collection_mode(int file_des) {
} }
enum collectionMode retval = enum collectionMode retval =
getElectronCollectionMode() ? ELECTRON : HOLE; getElectronCollectionMode() ? ELECTRON : HOLE;
validate(&ret, mess, (int)arg, (int)retval, "set collection mode", validate(&ret, mess, (int)arg, (int)retval, "set collection mode", DEC);
DEC);
LOG(logDEBUG1, ("collection mode retval: %u\n", retval)); LOG(logDEBUG1, ("collection mode retval: %u\n", retval));
} }
#endif #endif

3
slsDetectorSoftware/tests/Caller/test-Caller-gotthard.cpp
View File

@ -19,8 +19,7 @@ using test::PUT;
/* dacs */ /* dacs */
TEST_CASE("Setting and reading back GOTTHARD dacs", TEST_CASE("Setting and reading back GOTTHARD dacs", "[.cmdcall][.dacs]") {
"[.cmdcall][.dacs]") {
// vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp, // vref_ds, vcascn_pb, vcascp_pb, vout_cm, vcasc_out, vin_cm, vref_comp,
// ib_test_c // ib_test_c

3
slsDetectorSoftware/tests/Caller/test-Caller-gotthard2.cpp
View File

@ -106,8 +106,7 @@ TEST_CASE("timegotthard2", "[.cmdcall]") {
} }
/* dacs */ /* dacs */
TEST_CASE("Setting and reading back GOTTHARD2 dacs", TEST_CASE("Setting and reading back GOTTHARD2 dacs", "[.cmdcall][.dacs]") {
"[.cmdcall][.dacs]") {
// vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds, // vref_h_adc, vb_comp_fe, vb_comp_adc, vcom_cds,
// vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1, // vref_restore, vb_opa_1st, vref_comp_fe, vcom_adc1,
// vref_prech, vref_l_adc, vref_cds, vb_cs, // vref_prech, vref_l_adc, vref_cds, vb_cs,

3
slsDetectorSoftware/tests/Caller/test-Caller-jungfrau.cpp
View File

@ -17,8 +17,7 @@ using test::PUT;
/* dacs */ /* dacs */
TEST_CASE("Setting and reading back Jungfrau dacs", TEST_CASE("Setting and reading back Jungfrau dacs", "[.cmdcall][.dacs]") {
"[.cmdcall][.dacs]") {
// vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds, // vb_comp, vdd_prot, vin_com, vref_prech, vb_pixbuf, vb_ds, vref_ds,
// vref_comp // vref_comp
Detector det; Detector det;

3
slsDetectorSoftware/tests/Caller/test-Caller-mythen3.cpp
View File

@ -19,8 +19,7 @@ using test::PUT;
/* dacs */ /* dacs */
TEST_CASE("Setting and reading back MYTHEN3 dacs", TEST_CASE("Setting and reading back MYTHEN3 dacs", "[.cmdcall][.dacs]") {
"[.cmdcall][.dacs]") {
// vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1, // vcassh, vth2, vshaper, vshaperneg, vipre_out, vth3, vth1,
// vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh, // vicin, vcas, vpreamp, vpl, vipre, viinsh, vph, vtrim, vdcsh,

3
slsReceiverSoftware/src/Implementation.cpp
View File

@ -805,7 +805,8 @@ void Implementation::stopReceiver() {
} }
TLogLevel lev = ((mp[i]) > 0) ? logINFORED : logINFOGREEN; 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 // callback

6
slsReceiverSoftware/src/Listener.cpp
View File

@ -149,13 +149,15 @@ void Listener::CreateUDPSocket(int &actualSize) {
packetSize = generalData->vetoPacketSize; 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 = nullptr;
udpSocket = make_unique<UdpRxSocket>( udpSocket = make_unique<UdpRxSocket>(
udpPortNumber, packetSize, (ip.length() ? ip.c_str() : nullptr), udpPortNumber, packetSize, (ip.length() ? ip.c_str() : nullptr),
generalData->udpSocketBufferSize); 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; udpSocketAlive = true;

4
slsSupportLib/include/sls/versionAPI.h
View File

@ -10,5 +10,5 @@
#define APIMOENCH "developer 0x240918" #define APIMOENCH "developer 0x240918"
#define APIXILINXCTB "developer 0x240918" #define APIXILINXCTB "developer 0x240918"
#define APIEIGER "developer 0x240918" #define APIEIGER "developer 0x240918"
#define APIMYTHEN3 "developer 0x241001" #define APIMYTHEN3 "developer 0x241001"
#define APIJUNGFRAU "developer 0x241001" #define APIJUNGFRAU "developer 0x241001"