detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 19:30:03 +02:00
Code Issues Actions Packages Releases Activity

updating binaries

Browse Source
This commit is contained in:
maliakal_d 2018-08-22 19:00:21 +02:00
parent 63c130a380
commit 0781344117
22 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverBin/eigerDetectorServer_developer
View File

@ -1 +0,0 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer

1
serverBin/eigerDetectorServerv4.0.0.22.0 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0

1
serverBin/gotthardDetectorServer_developer
View File

@ -1 +0,0 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer

1
serverBin/gotthardDetectorServerv4.0.0.0 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0

1
serverBin/jungfrauDetectorServer_developer
View File

@ -1 +0,0 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer

1
serverBin/jungfrauDetectorServerv4.0.0.0 Symbolic link
View File

@ -0,0 +1 @@
../slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0

6
slsDetectorSoftware/commonFiles/versionAPI.h
View File

@ -1,5 +1,5 @@
/** API versions */ /** API versions */
#define APIRECEIVER 0x180517 #define APIRECEIVER 0x180517
#define APIEIGER 0x180815 #define APIEIGER 0x180820
#define APIJUNGFRAU 0x180628 #define APIJUNGFRAU 0x180820
#define APIGOTTHARD 0x180529 #define APIGOTTHARD 0x180820

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualMaster
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_virtualSlave
View File

Binary file not shown.

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer_developer → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv4.0.0.22.0
View File

Binary file not shown.

10
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 2a28333a96a40b7e48e68eee5be791b087a01b52 Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e
Revision: 347 Revision: 348
Branch: developer Branch: 4.0.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3983 Last Changed Rev: 3986
Last Changed Date: 2018-08-16 18:51:42.000000002 +0200 ./Makefile.virtual Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./Makefile.virtual

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "2a28333a96a40b7e48e68eee5be791b087a01b52" #define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3983 #define GITREV 0x3986
#define GITDATE 0x20180816 #define GITDATE 0x20180820
#define GITBRANCH "developer" #define GITBRANCH "4.0.0-rc"

13
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -657,7 +657,9 @@ enum readOutFlags setReadOutFlags(enum readOutFlags val){
/* parameters - timer */ /* parameters - timer */
int64_t setTimer(enum timerIndex ind, int64_t val){ int64_t setTimer(enum timerIndex ind, int64_t val){
#ifndef VIRTUAL
int64_t subdeadtime = 0; int64_t subdeadtime = 0;
#endif
int64_t subexptime = 0; int64_t subexptime = 0;
switch(ind){ switch(ind){
case FRAME_NUMBER: case FRAME_NUMBER:
@ -723,7 +725,7 @@ int64_t setTimer(enum timerIndex ind, int64_t val){
// get subexptime // get subexptime
subexptime = Feb_Control_GetSubFrameExposureTime(); subexptime = Feb_Control_GetSubFrameExposureTime();
#else #else
int64_t subexptime = eiger_virtual_subexptime*10; subexptime = eiger_virtual_subexptime*10;
#endif #endif
if(val >= 0){ if(val >= 0){
printf(" Setting sub period: %lldns = subexptime(%lld) + subdeadtime(%lld)\n", 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) { int64_t getTimeLeft(enum timerIndex ind) {
#ifdef VIRTUAL
return 0;
#else
switch(ind){ switch(ind){
case MEASURED_PERIOD: return Feb_Control_GetMeasuredPeriod(); case MEASURED_PERIOD: return Feb_Control_GetMeasuredPeriod();
case MEASURED_SUBPERIOD: return Feb_Control_GetSubMeasuredPeriod(); case MEASURED_SUBPERIOD: return Feb_Control_GetSubMeasuredPeriod();
return 0;
default: default:
cprintf(RED,"This timer left index (%d) not defined for Eiger\n",ind); cprintf(RED,"This timer left index (%d) not defined for Eiger\n",ind);
return -1; return -1;
} }
#endif
} }
@ -1612,9 +1619,13 @@ int stopStateMachine(){
} }
int softwareTrigger() { int softwareTrigger() {
#ifdef VIRTUAL
return OK;
#else
if (!Feb_Control_SoftwareTrigger()) if (!Feb_Control_SoftwareTrigger())
return FAIL; return FAIL;
return OK; return OK;
#endif
} }

10
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 711e0d771edb48e77fa23d965f026add268a31ee Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e
Revision: 235 Revision: 236
Branch: 3.3.0-rc Branch: 4.0.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3944 Last Changed Rev: 3986
Last Changed Date: 2018-07-26 13:38:23.000000002 +0200 ./server_defs.h Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./server_funcs.h

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "711e0d771edb48e77fa23d965f026add268a31ee" #define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3944 #define GITREV 0x3986
#define GITDATE 0x20180726 #define GITDATE 0x20180820
#define GITBRANCH "3.3.0-rc" #define GITBRANCH "4.0.0-rc"

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_virtual
View File

Binary file not shown.

BIN
slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServer_developer → slsDetectorSoftware/gotthardDetectorServer/gotthardDetectorServerv4.0.0.0
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_virtual
View File

Binary file not shown.

BIN
slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer → slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServerv4.0.0.0
View File

Binary file not shown.

10
slsDetectorSoftware/jungfrauDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jungfrauDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 830f92dedcd3dd1b4ba259139d709d9a37aadbf1 Repsitory UUID: 63c130a3806b47332b1532ab00f9f344c5839e0e
Revision: 160 Revision: 161
Branch: developer Branch: 4.0.0-rc
Last Changed Author: Dhanya_Thattil Last Changed Author: Dhanya_Thattil
Last Changed Rev: 3982 Last Changed Rev: 3986
Last Changed Date: 2018-08-16 12:21:37.000000002 +0200 ./RegisterDefs.h Last Changed Date: 2018-08-20 11:38:13.000000002 +0200 ./RegisterDefs.h

8
slsDetectorSoftware/jungfrauDetectorServer/gitInfoJungfrau.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "830f92dedcd3dd1b4ba259139d709d9a37aadbf1" #define GITREPUUID "63c130a3806b47332b1532ab00f9f344c5839e0e"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x3982 #define GITREV 0x3986
#define GITDATE 0x20180816 #define GITDATE 0x20180820
#define GITBRANCH "developer" #define GITBRANCH "4.0.0-rc"

6
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2790,7 +2790,9 @@ int set_timer(int file_des) {
#ifdef VERBOSE #ifdef VERBOSE
printf("setting timer %d to %lld ns\n",ind,tns); printf("setting timer %d to %lld ns\n",ind,tns);
#endif #endif
#ifdef EIGERD
int64_t subexptime = 0; int64_t subexptime = 0;
#endif
switch(ind) { switch(ind) {
#ifdef JUNGFRAUD #ifdef JUNGFRAUD
case STORAGE_CELL_NUMBER: case STORAGE_CELL_NUMBER:
@ -5846,7 +5848,7 @@ int check_version(int file_des) {
sprintf(mess,"Client's detector SW API version: (0x%llx). " sprintf(mess,"Client's detector SW API version: (0x%llx). "
"Detector's SW API Version: (0x%llx). " "Detector's SW API Version: (0x%llx). "
"Incompatible, update client!\n", "Incompatible, update client!\n",
client_requiredVersion, det_apiVersion); (long long int)client_requiredVersion, (long long int)det_apiVersion);
cprintf(RED, "Warning: %s", mess); cprintf(RED, "Warning: %s", mess);
} }
@ -5856,7 +5858,7 @@ int check_version(int file_des) {
sprintf(mess,"Detector SW Version: (0x%llx). " sprintf(mess,"Detector SW Version: (0x%llx). "
"Client's detector SW API Version: (0x%llx). " "Client's detector SW API Version: (0x%llx). "
"Incompatible, update detector software!\n", "Incompatible, update detector software!\n",
det_version, client_requiredVersion); (long long int)det_version, (long long int)client_requiredVersion);
cprintf(RED, "Warning: %s", mess); cprintf(RED, "Warning: %s", mess);
} }
} }