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

Fix gotthard delay (#606)

Browse Source 
* fix for set delay for gotthard1 (verification adds master delay even if its not master)

* binaries in

* binaries name
This commit is contained in:
Dhanya Thattil 2023-01-17 09:16:43 +01:00 committed by GitHub
parent 3cc4d25eb9
commit 713639d001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverBin/gotthardDetectorServerv7.0.0.rc1
View File

@ -1 +0,0 @@
../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1

1
serverBin/gotthardDetectorServerv7.0.0.rc2 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2

BIN
slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 → slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2
View File

Binary file not shown.

2
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -1007,7 +1007,9 @@ int setDelayAfterTrigger(int64_t val) {
// validate for tolerance // validate for tolerance
int64_t retval = getDelayAfterTrigger(); int64_t retval = getDelayAfterTrigger();
val /= (1E-9 * CLK_FREQ); val /= (1E-9 * CLK_FREQ);
if (master) {
val -= masterdefaultdelay; val -= masterdefaultdelay;
}
if (val != retval) { if (val != retval) {
return FAIL; return FAIL;
} }

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

@ -5,9 +5,10 @@
#define APILIB "7.0.0.rc1 0x221208" #define APILIB "7.0.0.rc1 0x221208"
#define APIRECEIVER "7.0.0.rc1 0x221208" #define APIRECEIVER "7.0.0.rc1 0x221208"
#define APICTB "7.0.0.rc1 0x221212" #define APICTB "7.0.0.rc1 0x221212"
#define APIGOTTHARD "7.0.0.rc1 0x221212"
#define APIGOTTHARD2 "7.0.0.rc1 0x221212" #define APIGOTTHARD2 "7.0.0.rc1 0x221212"
#define APIJUNGFRAU "7.0.0.rc1 0x221212" #define APIJUNGFRAU "7.0.0.rc1 0x221212"
#define APIMOENCH "7.0.0.rc1 0x221212" #define APIMOENCH "7.0.0.rc1 0x221212"
#define APIEIGER "7.0.0.rc1 0x221212" #define APIEIGER "7.0.0.rc1 0x221212"
#define APIGOTTHARD "7.0.0.rc2 0x221220"
#define APIMYTHEN3 "7.0.0.rc2 0x230116" #define APIMYTHEN3 "7.0.0.rc2 0x230116"