detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

added burst_trigger mode for eiger to replace trigger_readout mode

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-07-04 15:47:32 +02:00
parent 9574e09033
commit 35b02c9cf0
7 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.1 → slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServerv2.0.3.11.2
View File

Binary file not shown.

6
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -665,7 +665,7 @@ int setThresholdEnergy(int ev, int imod){
if(ev >= 0) {
enum detDacIndex ind[NGAIN]={VCMP_LL,VCMP_LR,VCMP_RL, VCMP_RR};
char* vcmp={"vcmp_ll","vcmp_lr","vcmp_rl","vcmp_rr"};
const char* vcmp[4]={"vcmp_ll","vcmp_lr","vcmp_rl","vcmp_rr"};
int valid=0;
//calculate thrvalues for dacs
@ -1199,7 +1199,7 @@ enum externalCommunicationMode setTiming( enum externalCommunicationMode arg){
switch((int)arg){
case AUTO_TIMING: ret = 0; break;
case TRIGGER_EXPOSURE: ret = 2; break;
case TRIGGER_READOUT: ret = 1; break;
case BURST_TRIGGER: ret = 1; break;
case GATE_FIX_NUMBER: ret = 3; break;
}
printf(" Setting Triggering Mode: %d\n",(int)ret);
@ -1211,7 +1211,7 @@ enum externalCommunicationMode setTiming( enum externalCommunicationMode arg){
switch((int)ret){
case 0: ret = AUTO_TIMING; break;
case 2: ret = TRIGGER_EXPOSURE; break;
case 1: ret = TRIGGER_READOUT; break;
case 1: ret = BURST_TRIGGER; break;
case 3: ret = GATE_FIX_NUMBER; break;
default:
printf("Unknown trigger mode found %d\n",ret);