detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 17:18:00 +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
Download Patch File Download Diff File Expand all files Collapse all files

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
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

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -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"

13
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -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
}