diff --git a/serverBin/eigerDetectorServer_developer b/serverBin/eigerDetectorServer_developer deleted file mode 120000 index cdf68b803..000000000 --- a/serverBin/eigerDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer \ No newline at end of file diff --git a/serverBin/eigerDetectorServerv4.0.0.22.0 b/serverBin/eigerDetectorServerv4.0.0.22.0 new file mode 120000 index 000000000..7e15d70e8 --- /dev/null +++ b/serverBin/eigerDetectorServerv4.0.0.22.0 @@ -0,0 +1 @@ +../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0 \ No newline at end of file diff --git a/serverBin/gotthardDetectorServer_developer b/serverBin/gotthardDetectorServer_developer deleted file mode 120000 index e79cc3f57..000000000 --- a/serverBin/gotthardDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer \ No newline at end of file diff --git a/serverBin/gotthardDetectorServerv4.0.0.0 b/serverBin/gotthardDetectorServerv4.0.0.0 new file mode 120000 index 000000000..50e12c935 --- /dev/null +++ b/serverBin/gotthardDetectorServerv4.0.0.0 @@ -0,0 +1 @@ +../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0 \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServer_developer b/serverBin/jungfrauDetectorServer_developer deleted file mode 120000 index 447282d24..000000000 --- a/serverBin/jungfrauDetectorServer_developer +++ /dev/null @@ -1 +0,0 @@ -../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer \ No newline at end of file diff --git a/serverBin/jungfrauDetectorServerv4.0.0.0 b/serverBin/jungfrauDetectorServerv4.0.0.0 new file mode 120000 index 000000000..cfdfe7458 --- /dev/null +++ b/serverBin/jungfrauDetectorServerv4.0.0.0 @@ -0,0 +1 @@ +../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0 \ No newline at end of file diff --git a/slsDetectorSoftware/commonFiles/versionAPI.h b/slsDetectorSoftware/commonFiles/versionAPI.h index 14db9b736..df2795078 100644 --- a/slsDetectorSoftware/commonFiles/versionAPI.h +++ b/slsDetectorSoftware/commonFiles/versionAPI.h @@ -1,5 +1,5 @@ /** API versions */ #define APIRECEIVER 0x180517 -#define APIEIGER 0x180815 -#define APIJUNGFRAU 0x180628 -#define APIGOTTHARD 0x180529 +#define APIEIGER 0x180820 +#define APIJUNGFRAU 0x180820 +#define APIGOTTHARD 0x180820 diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster index 6edbadf71..8530be551 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave index 3145f01d0..18d5d623a 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave differ diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0 similarity index 58% rename from slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer rename to slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0 index db6e3a382..e70f9077b 100755 Binary files a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer and b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0 differ diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt index 3905c140d..2203f76da 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 2a28333a96a40b7e48e68eee5be791b087a01b52 -Revision: 347 -Branch: developer +Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e +Revision: 348 +Branch: 4.0.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3983 -Last Changed Date: 2018-08-16 18:51:42.000000002 +0200 ./Makefile.virtual +Last Changed Rev: 3986 +Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./Makefile.virtual diff --git a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h index 1d8a37c63..7a917f824 100644 --- a/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "2a28333a96a40b7e48e68eee5be791b087a01b52" +#define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3983 -#define GITDATE 0x20180816 -#define GITBRANCH "developer" +#define GITREV 0x3986 +#define GITDATE 0x20180820 +#define GITBRANCH "4.0.0-rc" diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c index cb070d631..ddfd53164 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c @@ -657,7 +657,9 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val){ /* parameters - timer */ int64_t setTimer(enum timerIndex ind, int64_t val){ +#ifndef VIRTUAL int64_t subdeadtime = 0; +#endif int64_t subexptime = 0; switch(ind){ case FRAME_NUMBER: @@ -723,7 +725,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val){ // get subexptime subexptime = Feb_Control_GetSubFrameExposureTime(); #else - int64_t subexptime = eiger_virtual_subexptime*10; + subexptime = eiger_virtual_subexptime*10; #endif if(val >= 0){ printf(" Setting sub period: %lldns = subexptime(%lld) + subdeadtime(%lld)\n", @@ -787,13 +789,18 @@ int64_t setTimer(enum timerIndex ind, int64_t val){ int64_t getTimeLeft(enum timerIndex ind) { +#ifdef VIRTUAL + return 0; +#else switch(ind){ case MEASURED_PERIOD: return Feb_Control_GetMeasuredPeriod(); case MEASURED_SUBPERIOD: return Feb_Control_GetSubMeasuredPeriod(); + return 0; default: cprintf(RED,"This timer left index (%d) not defined for Eiger\n",ind); return -1; } +#endif } @@ -1612,9 +1619,13 @@ int stopStateMachine(){ } int softwareTrigger() { +#ifdef VIRTUAL + return OK; +#else if (!Feb_Control_SoftwareTrigger()) return FAIL; return OK; +#endif } diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt index 221f5726a..2f5bf5ec9 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 711e0d771edb48e77fa23d965f026add268a31ee -Revision: 235 -Branch: 3.3.0-rc +Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e +Revision: 236 +Branch: 4.0.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3944 -Last Changed Date: 2018-07-26 13:38:23.000000002 +0200 ./server_defs.h +Last Changed Rev: 3986 +Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./server_funcs.h diff --git a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h index 51379f12f..7a917f824 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "711e0d771edb48e77fa23d965f026add268a31ee" +#define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3944 -#define GITDATE 0x20180726 -#define GITBRANCH "3.3.0-rc" +#define GITREV 0x3986 +#define GITDATE 0x20180820 +#define GITBRANCH "4.0.0-rc" diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual index 2dcd81447..05e41e470 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual differ diff --git a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0 similarity index 59% rename from slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer rename to slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0 index 6d3c38ff5..6d9ea118f 100755 Binary files a/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer and b/slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0 differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual index 2a6a8c8c5..5d6f88363 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0 similarity index 59% rename from slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer rename to slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0 index 6cbb68b6c..2bd730b81 100755 Binary files a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer and b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0 differ diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt index f5dc3a835..58572721c 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt @@ -1,9 +1,9 @@ Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git -Repsitory UUID: 830f92dedcd3dd1b4ba259139d709d9a37aadbf1 -Revision: 160 -Branch: developer +Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e +Revision: 161 +Branch: 4.0.0-rc Last Changed Author: Dhanya_Thattil -Last Changed Rev: 3982 -Last Changed Date: 2018-08-16 12:21:37.000000002 +0200 ./RegisterDefs.h +Last Changed Rev: 3986 +Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./RegisterDefs.h diff --git a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h index b89db54f1..7a917f824 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h +++ b/slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h @@ -1,6 +1,6 @@ #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" -#define GITREPUUID "830f92dedcd3dd1b4ba259139d709d9a37aadbf1" +#define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e" #define GITAUTH "Dhanya_Thattil" -#define GITREV 0x3982 -#define GITDATE 0x20180816 -#define GITBRANCH "developer" +#define GITREV 0x3986 +#define GITDATE 0x20180820 +#define GITBRANCH "4.0.0-rc" diff --git a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c index 2557212ba..8cd09f2b1 100755 --- a/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c +++ b/slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c @@ -2790,7 +2790,9 @@ int set_timer(int file_des) { #ifdef VERBOSE printf("setting timer %d to %lld ns\n",ind,tns); #endif +#ifdef EIGERD int64_t subexptime = 0; +#endif switch(ind) { #ifdef JUNGFRAUD case STORAGE_CELL_NUMBER: @@ -5846,7 +5848,7 @@ int check_version(int file_des) { sprintf(mess,"Client's detector SW API version: (0x%llx). " "Detector's SW API Version: (0x%llx). " "Incompatible, update client!\n", - client_requiredVersion, det_apiVersion); + (long long int)client_requiredVersion, (long long int)det_apiVersion); cprintf(RED, "Warning: %s", mess); } @@ -5856,7 +5858,7 @@ int check_version(int file_des) { sprintf(mess,"Detector SW Version: (0x%llx). " "Client's detector SW API Version: (0x%llx). " "Incompatible, update detector software!\n", - det_version, client_requiredVersion); + (long long int)det_version, (long long int)client_requiredVersion); cprintf(RED, "Warning: %s", mess); } }