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

formatting

Browse Source
This commit is contained in:
maliakal_d 2023-11-07 14:52:14 +01:00
parent 397e846509
commit 01e4bcb47e
12 changed files with 81 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -804,8 +804,8 @@ void qTabMeasurement::GetNextFrameNumber() {
spinNextFrameNumber->setValue(retval); spinNextFrameNumber->setValue(retval);
} }
CATCH_HANDLE("Could not get starting frame number.", CATCH_HANDLE("Could not get starting frame number.",
"qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber, "qTabMeasurement::GetNextFrameNumber", spinNextFrameNumber,
&QSpinBox::setValue, -1) &QSpinBox::setValue, -1)
connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this, connect(spinNextFrameNumber, SIGNAL(valueChanged(int)), this,
SLOT(SetNextFrameNumber(int))); SLOT(SetNextFrameNumber(int)));
} }

8
slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c
View File

@ -2928,7 +2928,8 @@ int softwareTrigger(int block) {
usleep(100); usleep(100);
#ifndef VIRTUAL #ifndef VIRTUAL
// block till frame sent out & back to wait for trigger (or not busy anymore) // block till frame sent out & back to wait for trigger (or not busy
// anymore)
if (block) { if (block) {
uint32_t retval = bus_r(STATUS_REG); uint32_t retval = bus_r(STATUS_REG);
while ((retval & RUN_BUSY_MSK) && !(retval & WAITING_FOR_TRIGGER_MSK)) { while ((retval & RUN_BUSY_MSK) && !(retval & WAITING_FOR_TRIGGER_MSK)) {
@ -2971,11 +2972,10 @@ enum runStatus getRunStatus() {
LOG(logINFOBLUE, ("Status: ERROR\n")); LOG(logINFOBLUE, ("Status: ERROR\n"));
s = ERROR; s = ERROR;
} }
// running // running
else if (retval & RUN_BUSY_MSK) { else if (retval & RUN_BUSY_MSK) {
if ((retval & if ((retval & WAITING_FOR_TRIGGER_MSK) ||
WAITING_FOR_TRIGGER_MSK) ||
(retval & WAITING_FOR_START_FRAME_MSK)) { (retval & WAITING_FOR_START_FRAME_MSK)) {
LOG(logINFOBLUE, ("Status: WAITING\n")); LOG(logINFOBLUE, ("Status: WAITING\n"));
s = WAITING; s = WAITING;

2
slsDetectorServers/slsDetectorServer/src/blackfin.c
View File

@ -88,7 +88,7 @@ u_int32_t writeRegister(u_int32_t offset, u_int32_t data) {
// if electron mode bit touched // if electron mode bit touched
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
int electronCollectionModeChange = 0; int electronCollectionModeChange = 0;
if ((offset << MEM_MAP_SHIFT) == DAQ_REG) { if ((offset << MEM_MAP_SHIFT) == DAQ_REG) {
if ((readRegister(offset) ^ data) & DAQ_ELCTRN_CLLCTN_MDE_MSK) { if ((readRegister(offset) ^ data) & DAQ_ELCTRN_CLLCTN_MDE_MSK) {
electronCollectionModeChange = 1; electronCollectionModeChange = 1;
} }

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

@ -1950,59 +1950,57 @@ int acquire(int blocking, int file_des) {
#ifdef EIGERD #ifdef EIGERD
// check for hardware mac and hardware ip // check for hardware mac and hardware ip
if (udpDetails[0].srcmac != getDetectorMAC()) { if (udpDetails[0].srcmac != getDetectorMAC()) {
ret = FAIL; ret = FAIL;
uint64_t sourcemac = getDetectorMAC(); uint64_t sourcemac = getDetectorMAC();
char src_mac[MAC_ADDRESS_SIZE]; char src_mac[MAC_ADDRESS_SIZE];
getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac); getMacAddressinString(src_mac, MAC_ADDRESS_SIZE, sourcemac);
sprintf( sprintf(mess,
mess,
"Invalid udp source mac address for this detector. Must be " "Invalid udp source mac address for this detector. Must be "
"same as hardware detector mac address %s\n", "same as hardware detector mac address %s\n",
src_mac); src_mac);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else if (!enableTenGigabitEthernet(GET_FLAG) && } else if (!enableTenGigabitEthernet(GET_FLAG) &&
(udpDetails[0].srcip != getDetectorIP())) { (udpDetails[0].srcip != getDetectorIP())) {
ret = FAIL; ret = FAIL;
uint32_t sourceip = getDetectorIP(); uint32_t sourceip = getDetectorIP();
char src_ip[INET_ADDRSTRLEN]; char src_ip[INET_ADDRSTRLEN];
getIpAddressinString(src_ip, sourceip); getIpAddressinString(src_ip, sourceip);
sprintf( sprintf(mess,
mess,
"Invalid udp source ip address for this detector. Must be " "Invalid udp source ip address for this detector. Must be "
"same as hardware detector ip address %s in 1G readout " "same as hardware detector ip address %s in 1G readout "
"mode \n", "mode \n",
src_ip); src_ip);
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else } else
#endif #endif
if (configured == FAIL) { if (configured == FAIL) {
ret = FAIL;
strcpy(mess, "Could not start acquisition because ");
strcat(mess, configureMessage);
LOG(logERROR, (mess));
} else if (sharedMemory_getScanStatus() == RUNNING) {
ret = FAIL;
strcpy(mess, "Could not start acquisition because a scan is "
"already running!\n");
LOG(logERROR, (mess));
} else {
memset(scanErrMessage, 0, MAX_STR_LENGTH);
sharedMemory_setScanStop(0);
sharedMemory_setScanStatus(IDLE); // if it was error
if (pthread_create(&pthread_tid, NULL, &start_state_machine,
&blocking)) {
ret = FAIL; ret = FAIL;
strcpy(mess, "Could not start acquisition because "); strcpy(mess, "Could not start acquisition thread!\n");
strcat(mess, configureMessage);
LOG(logERROR, (mess));
} else if (sharedMemory_getScanStatus() == RUNNING) {
ret = FAIL;
strcpy(mess, "Could not start acquisition because a scan is "
"already running!\n");
LOG(logERROR, (mess)); LOG(logERROR, (mess));
} else { } else {
memset(scanErrMessage, 0, MAX_STR_LENGTH); // wait for blocking always (scan or not)
sharedMemory_setScanStop(0); // non blocking-no scan also wait (for error message)
sharedMemory_setScanStatus(IDLE); // if it was error // non blcoking-scan dont wait (there is scanErrorMessage)
if (pthread_create(&pthread_tid, NULL, &start_state_machine, if (blocking || !scan) {
&blocking)) { pthread_join(pthread_tid, NULL);
ret = FAIL;
strcpy(mess, "Could not start acquisition thread!\n");
LOG(logERROR, (mess));
} else {
// wait for blocking always (scan or not)
// non blocking-no scan also wait (for error message)
// non blcoking-scan dont wait (there is scanErrorMessage)
if (blocking || !scan) {
pthread_join(pthread_tid, NULL);
}
} }
} }
}
} }
return Server_SendResult(file_des, INT32, NULL, 0); return Server_SendResult(file_des, INT32, NULL, 0);
} }

3
slsDetectorSoftware/src/Detector.cpp
View File

@ -886,7 +886,8 @@ void Detector::stopDetector(Positions pos) {
// idle before stopping will return running (after async start script) when // idle before stopping will return running (after async start script) when
// getting status after, which will then be stopped again. // getting status after, which will then be stopped again.
while (!status.contains_only(defs::runStatus::IDLE, defs::runStatus::STOPPED)){ while (!status.contains_only(defs::runStatus::IDLE,
defs::runStatus::STOPPED)) {
if (status.any(defs::runStatus::ERROR)) { if (status.any(defs::runStatus::ERROR)) {
throw RuntimeError("Could not stop detector. At least one module " throw RuntimeError("Could not stop detector. At least one module "
"returned error status."); "returned error status.");

8
slsDetectorSoftware/src/DetectorImpl.cpp
View File

@ -1229,17 +1229,17 @@ int DetectorImpl::acquire() {
// handle jf sync issue (master idle, slaves stopped) // handle jf sync issue (master idle, slaves stopped)
if (statusList.contains_only(IDLE, STOPPED)) { if (statusList.contains_only(IDLE, STOPPED)) {
status = STOPPED; status = STOPPED;
} } else
else
status = statusList.squash(RUNNING); status = statusList.squash(RUNNING);
} }
// progress // progress
auto a = Parallel(&Module::getReceiverProgress, {}); auto a = Parallel(&Module::getReceiverProgress, {});
double progress = (*std::max_element(a.begin(), a.end())); double progress = (*std::max_element(a.begin(), a.end()));
// callback // callback
acquisition_finished(progress, static_cast<int>(status), acqFinished_p); acquisition_finished(progress, static_cast<int>(status),
acqFinished_p);
} }
clock_gettime(CLOCK_REALTIME, &end); clock_gettime(CLOCK_REALTIME, &end);

4
slsDetectorSoftware/src/DetectorImpl.h
View File

@ -84,9 +84,7 @@ class DetectorImpl : public virtual slsDetectorDefs {
*/ */
virtual ~DetectorImpl(); virtual ~DetectorImpl();
template <class CT> struct NonDeduced { template <class CT> struct NonDeduced { using type = CT; };
using type = CT;
};
template <typename RT, typename... CT> template <typename RT, typename... CT>
Result<RT> Parallel(RT (Module::*somefunc)(CT...), Result<RT> Parallel(RT (Module::*somefunc)(CT...),
std::vector<int> positions, std::vector<int> positions,

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

@ -692,7 +692,8 @@ TEST_CASE("confadc", "[.cmd]") {
const int ndet = det.size(); const int ndet = det.size();
const int nchip = 10; const int nchip = 10;
const int nadc = 32; const int nadc = 32;
std::vector<std::vector<std::vector<int>>> prev_val(ndet, std::vector<std::vector<int>>(nchip, std::vector<int>(nadc))); std::vector<std::vector<std::vector<int>>> prev_val(
ndet, std::vector<std::vector<int>>(nchip, std::vector<int>(nadc)));
for (int i = 0; i != ndet; ++i) { for (int i = 0; i != ndet; ++i) {
for (int j = 0; j != nchip; ++j) { for (int j = 0; j != nchip; ++j) {
for (int k = 0; k != nadc; ++k) { for (int k = 0; k != nadc; ++k) {

12
slsDetectorSoftware/tests/test-CmdProxy-moench.cpp
View File

@ -19,17 +19,18 @@ using test::PUT;
/* dacs */ /* dacs */
TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") { TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") {
// vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds, ibias_sfp // vbp_colbuf, vipre, vin_cm, vb_sda, vcasc_sfp, vout_cm, vipre_cds,
// ibias_sfp
Detector det; Detector det;
CmdProxy proxy(&det); CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash(); auto det_type = det.getDetectorType().squash();
if (det_type == defs::MOENCH) { if (det_type == defs::MOENCH) {
SECTION("vbp_colbuf") { test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300); } SECTION("vbp_colbuf") {
test_dac(defs::VBP_COLBUF, "vbp_colbuf", 1300);
}
SECTION("vipre") { test_dac(defs::VIPRE, "vipre", 1000); } SECTION("vipre") { test_dac(defs::VIPRE, "vipre", 1000); }
SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1400); } SECTION("vin_cm") { test_dac(defs::VIN_CM, "vin_cm", 1400); }
SECTION("vb_sda") { SECTION("vb_sda") { test_dac(defs::VB_SDA, "vb_sda", 680); }
test_dac(defs::VB_SDA, "vb_sda", 680);
}
SECTION("vcasc_sfp") { test_dac(defs::VCASC_SFP, "vcasc_sfp", 1428); } SECTION("vcasc_sfp") { test_dac(defs::VCASC_SFP, "vcasc_sfp", 1428); }
SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1200); } SECTION("vout_cm") { test_dac(defs::VOUT_CM, "vout_cm", 1200); }
SECTION("vipre_cds") { test_dac(defs::VIPRE_CDS, "vipre_cds", 800); } SECTION("vipre_cds") { test_dac(defs::VIPRE_CDS, "vipre_cds", 800); }
@ -105,5 +106,4 @@ TEST_CASE("Setting and reading back moench dacs", "[.cmd][.dacs]") {
} }
} }
} // namespace sls } // namespace sls

18
slsDetectorSoftware/tests/test-Result.cpp
View File

@ -196,24 +196,24 @@ TEST_CASE("String conversions") {
"[{one: 1}, {one: 1, three: 3, two: 2}, {one: 1}]"); "[{one: 1}, {one: 1, three: 3, two: 2}, {one: 1}]");
} }
TEST_CASE("Any element is equal"){ TEST_CASE("Any element is equal") {
Result<int> r{1,2,3,4,5}; Result<int> r{1, 2, 3, 4, 5};
REQUIRE(r.any(3)); REQUIRE(r.any(3));
REQUIRE_FALSE(r.any(9)); REQUIRE_FALSE(r.any(9));
} }
TEST_CASE("Result contains only the specified elements"){ TEST_CASE("Result contains only the specified elements") {
Result<int> r{1,1,1}; Result<int> r{1, 1, 1};
REQUIRE(r.contains_only(1)); REQUIRE(r.contains_only(1));
REQUIRE(r.contains_only(1,1)); REQUIRE(r.contains_only(1, 1));
} }
TEST_CASE("Only with multiple values"){ TEST_CASE("Only with multiple values") {
Result<int> r{1,1,2,1,2,1,1}; Result<int> r{1, 1, 2, 1, 2, 1, 1};
REQUIRE_FALSE(r.contains_only(1)); REQUIRE_FALSE(r.contains_only(1));
REQUIRE_FALSE(r.contains_only(2)); REQUIRE_FALSE(r.contains_only(2));
REQUIRE(r.contains_only(1,2)); REQUIRE(r.contains_only(1, 2));
REQUIRE(r.contains_only(2,1)); REQUIRE(r.contains_only(2, 1));
} }
} // namespace sls } // namespace sls

13
slsSupportLib/include/sls/TypeTraits.h
View File

@ -103,14 +103,13 @@ template <typename T> struct is_vector : public std::false_type {};
template <typename T> template <typename T>
struct is_vector<std::vector<T>> : public std::true_type {}; struct is_vector<std::vector<T>> : public std::true_type {};
template <class...> struct Conjunction : std::true_type {};
template <class B1> struct Conjunction<B1> : B1 {};
template<class...> struct Conjunction : std::true_type {}; template <class B1, class... Bn>
template<class B1> struct Conjunction<B1> : B1 {};
template<class B1, class... Bn>
struct Conjunction<B1, Bn...> struct Conjunction<B1, Bn...>
: std::conditional<bool(B1::value), Conjunction<Bn...>, B1>::type {}; : std::conditional<bool(B1::value), Conjunction<Bn...>, B1>::type {};
template<typename T, typename... Ts> template <typename T, typename... Ts>
using AllSame = typename std::enable_if<Conjunction<std::is_same<T, Ts>...>::value>::type; using AllSame =
typename std::enable_if<Conjunction<std::is_same<T, Ts>...>::value>::type;
} // namespace sls } // namespace sls

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

@ -4,10 +4,10 @@
#define RELEASE "developer" #define RELEASE "developer"
#define APILIB "developer 0x230224" #define APILIB "developer 0x230224"
#define APIRECEIVER "developer 0x230224" #define APIRECEIVER "developer 0x230224"
#define APICTB "developer 0x231102" #define APICTB "developer 0x231102"
#define APIGOTTHARD "developer 0x231102" #define APIGOTTHARD "developer 0x231102"
#define APIGOTTHARD2 "developer 0x231102" #define APIGOTTHARD2 "developer 0x231102"
#define APIJUNGFRAU "developer 0x231102" #define APIJUNGFRAU "developer 0x231102"
#define APIMYTHEN3 "developer 0x231102" #define APIMYTHEN3 "developer 0x231102"
#define APIMOENCH "developer 0x231102" #define APIMOENCH "developer 0x231102"
#define APIEIGER "developer 0x231102" #define APIEIGER "developer 0x231102"