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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d
2019-06-13 09:37:54 +02:00
parent 5d2567005d 359970dfc2
commit ca9fca88c4
9 changed files with 27 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/include/slsDetectorUsers.h
View File

@ -927,7 +927,7 @@ public:
/**
@short returns external communication mode std::string from index
\param s index for communication mode
\returns auto, trigger, ro_trigger, gating, triggered_gating, unknown when wrong mode
\returns auto, trigger, ro_trigger, gating, triggered_gating, burst_trigger, unknown when wrong mode
*/
static int getTimingMode(std::string s){ \
@ -936,6 +936,7 @@ public:
if (s== "ro_trigger") return 2; \
if (s== "gating") return 3; \
if (s== "triggered_gating") return 4; \
if (s== "burst_trigger") return 5; \
return -1; };

12
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -2825,7 +2825,17 @@ int multiSlsDetector::powerChip(int ival, int detPos) {
return detectors[detPos]->powerChip(ival);
}
// multi
// multi delayed call for safety
if (ival >= 0 && getNumberOfDetectors() > 3) {
std::vector<int> r;
r.reserve(detectors.size());
for (auto &d : detectors) {
r.push_back(d->powerChip(ival));
usleep(1000 * 1000);
}
return sls::minusOneIfDifferent(r);
}
// multi parallel
auto r = parallelCall(&slsDetector::powerChip, ival);
return sls::minusOneIfDifferent(r);
}