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

Merge pull request #207 from slsdetectorgroup/m3counter

Browse Source 
M3counter
This commit is contained in:
Dhanya Thattil 2020-10-20 12:06:51 +02:00 committed by GitHub
commit 0460d7e531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

6
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -886,8 +886,10 @@ void setCounterMask(uint32_t arg) {
updatePacketizing(); updatePacketizing();
LOG(logINFO, ("\tUpdating Exptime and Gate Delay\n")); LOG(logINFO, ("\tUpdating Exptime and Gate Delay\n"));
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
setExpTime(i, exptimeReg[i]); uint64_t ns = exptimeReg[i] / (1E-9 * getFrequency(SYSTEM_C0));
setGateDelay(i, gateDelayReg[i]); setExpTime(i, ns);
ns = gateDelayReg[i] / (1E-9 * getFrequency(SYSTEM_C0));
setGateDelay(i, ns);
} }
} }

2
slsSupportLib/include/versionAPI.h
View File

@ -8,5 +8,5 @@
#define APIGOTTHARD 0x201016 #define APIGOTTHARD 0x201016
#define APIGOTTHARD2 0x201016 #define APIGOTTHARD2 0x201016
#define APIJUNGFRAU 0x201016 #define APIJUNGFRAU 0x201016
#define APIMYTHEN3 0x201016
#define APIMOENCH 0x201013 #define APIMOENCH 0x201013
#define APIMYTHEN3 0x201020