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

gotthard server: configmac should also set cycles for sending dummy frame

Browse Source
This commit is contained in:
maliakal_d
2019-01-30 18:24:25 +01:00
parent 12f8166d25
commit 2f11681d3f
6 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/gotthardDetectorServer/firmware_funcs.c
View File

@ -1442,14 +1442,17 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
* when switching back and forth between roi and no roi
*/
// remember old parameters
uint64_t oldtiming = setTiming(-1);
int oldtiming = setTiming(-1);
uint64_t oldframes = setFrames(-1);
uint64_t oldcycles = setTrains(-1);
uint64_t oldPeriod = setPeriod(-1);
uint64_t oldExptime = setExposureTime(-1);
// set to basic parameters
printf("Setting basic parameters\n");
setTiming(AUTO_TIMING);
setFrames(1);
setTrains(1);
setPeriod(1e6);
setExposureTime(1e5);
@ -1458,8 +1461,16 @@ int configureMAC(int ipad,long long int macad,long long int detectormacad, int d
waitForAcquisitionFinish();
// set to previous parameters
printf("Setting previous parameters: "
"Timing: %d, "
"frames: %lld, "
"cycles: %lld, "
"period: %lld ns, "
"exptime:%lld ns\n",
oldtiming, oldframes, oldcycles, oldPeriod, oldExptime);
setTiming(oldtiming);
setFrames(oldframes);
setTrains(oldcycles);
setPeriod(oldPeriod);
setExposureTime(oldExptime);