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

g2 fix: cont trigger frames in rxr should be 1

Browse Source
This commit is contained in:
maliakal_d
2020-09-24 17:16:46 +02:00
parent c862f1df81
commit 99642dad69
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c
View File

@ -2631,7 +2631,13 @@ void *start_timer(void *arg) {
}
int repeatPeriodNs = getBurstPeriod();
int numFrames = getNumFrames();
// continuous trigger mode, #frames = 1
int64_t periodNs = getPeriod();
if (getTiming() == TRIGGER_EXPOSURE && (burstMode == CONTINUOUS_INTERNAL ||
burstMode == CONTINUOUS_EXTERNAL)) {
numFrames = 1;
periodNs = 0;
}
int64_t expUs = getExpTime() / 1000;
int imagesize = NCHAN * NCHIP * 2;
int datasize = imagesize;
@ -2832,15 +2838,7 @@ void readFrame(int *ret, char *mess) {
#endif
*ret = (int)OK;
// frames left to give status
int64_t retval = getNumFramesLeft() + 1;
if (retval > 0) {
LOG(logERROR, ("No data and run stopped: %lld frames left\n",
(long long int)retval));
} else {
LOG(logINFOGREEN, ("Acquisition successfully finished\n"));
}
LOG(logINFOGREEN, ("Acquisition successfully finished\n"));
}
u_int32_t runBusy() {