diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc1 b/serverBin/gotthardDetectorServerv7.0.0.rc1 deleted file mode 120000 index d8b9055a4..000000000 --- a/serverBin/gotthardDetectorServerv7.0.0.rc1 +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv7.0.0.rc2 b/serverBin/gotthardDetectorServerv7.0.0.rc2 new file mode 120000 index 000000000..7a76806a7 --- /dev/null +++ b/serverBin/gotthardDetectorServerv7.0.0.rc2 @@ -0,0 +1 @@ +../slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 \ No newline at end of file diff --git a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 similarity index 72% rename from slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 rename to slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 index 9dbacaa9d..673699daa 100755 Binary files a/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc1 and b/slsDetectorServers/gotthardDetectorServer/bin/gotthardDetectorServerv7.0.0.rc2 differ diff --git a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c index ae6308439..c56930140 100644 --- a/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c @@ -1007,7 +1007,9 @@ int setDelayAfterTrigger(int64_t val) { // validate for tolerance int64_t retval = getDelayAfterTrigger(); val /= (1E-9 * CLK_FREQ); - val -= masterdefaultdelay; + if (master) { + val -= masterdefaultdelay; + } if (val != retval) { return FAIL; } diff --git a/slsSupportLib/include/sls/versionAPI.h b/slsSupportLib/include/sls/versionAPI.h index 03f6659f3..e2dfe18ba 100644 --- a/slsSupportLib/include/sls/versionAPI.h +++ b/slsSupportLib/include/sls/versionAPI.h @@ -5,9 +5,10 @@ #define APILIB "7.0.0.rc1 0x221208" #define APIRECEIVER "7.0.0.rc1 0x221208" #define APICTB "7.0.0.rc1 0x221212" -#define APIGOTTHARD "7.0.0.rc1 0x221212" #define APIGOTTHARD2 "7.0.0.rc1 0x221212" #define APIJUNGFRAU "7.0.0.rc1 0x221212" #define APIMOENCH "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" +