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

continuous and storeinram variable

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-07-24 09:21:38 +02:00
parent a8fc34c92b
commit 0d83346943
6 changed files with 120 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -420,9 +420,9 @@ enum readOutFlags {
BACKGROUND_CORRECTIONS=0x1000, /**<background corrections */
TOT_MODE=0x2000,/**<pump-probe mode */
CONTINOUS_RO=0x4000,/**<pump-probe mode */
PARALLEL=0x10,/** <eiger parallel mode */
NONPARALLEL=0x20,/** <eiger serial mode */
SAFE=0x40/** <eiger safe mode */
PARALLEL=0x10000,/** <eiger parallel mode */
NONPARALLEL=0x20000,/** <eiger serial mode */
SAFE=0x40000/** <eiger safe mode */
};
/**
trimming modes

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

72
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -17,6 +17,8 @@
enum detectorSettings thisSettings;
const char* dac_names[16] = {"SvP","Vtr","Vrf","Vrs","SvN","Vtgstv","Vcmp_ll","Vcmp_lr","cal","Vcmp_rl","rxb_rb","rxb_lb","Vcmp_rr","Vcp","Vcn","Vis"};
enum{E_PARALLEL, E_NON_PARALLEL, E_SAFE};
//static const string dacNames[16] = {"Svp","Svn","Vtr","Vrf","Vrs","Vtgstv","Vcmp_ll","Vcmp_lr","Cal","Vcmp_rl","Vcmp_rr","Rxb_rb","Rxb_lb","Vcp","Vcn","Vis"};
sls_detector_module *detectorModules=NULL;
@ -31,6 +33,7 @@ int eiger_iodelay = 0;
int eiger_photonenergy = 0;
int eiger_dynamicrange = 0;
int eiger_readoutmode = 0;
int eiger_storeinmem = 0;
int eiger_readoutspeed = 0;
int eiger_triggermode = 0;
int eiger_extgating = 0;
@ -131,9 +134,9 @@ int initDetector(){
setTimer(FRAME_PERIOD,1E9);
setDynamicRange(16);
setThresholdEnergy(8000,0);
setReadOutFlags(PARALLEL);
setReadOutFlags(NONPARALLEL);
setSpeed(0,1);//clk_devider,half speed
setHighVolage(150,0);
setHighVolage(0,0);
setIODelay(675,0);
setTiming(AUTO_TIMING);
//SetPhotonEnergyCalibrationParameters(-5.8381e-5,1.838515,5.09948e-7,-4.32390e-11,1.32527e-15);
@ -486,15 +489,17 @@ int startReceiver(int d){
int startStateMachine(){
int ret,prev_flag;
int ret = OK,prev_flag;
//get the DAQ toggle bit
prev_flag = Feb_Control_AcquisitionStartedBit();
printf("Going to start acquisition\n");
Feb_Control_StartAcquisition();
printf("requesting images\n");
if(!eiger_storeinmem){
printf("requesting images right after start\n");
ret = startReadOut();
}
//wait for acquisition start
if(ret == OK){
@ -504,6 +509,7 @@ int startStateMachine(){
}
cprintf(GREEN,"***Acquisition started\n");
}
/*while(getRunStatus() == IDLE){printf("waiting for being not idle anymore\n");}*/
return ret;
@ -569,6 +575,15 @@ char *readFrame(int *ret, char *mess){
if(!Feb_Control_WaitForFinishedFlag(5000))
cprintf(RED,"Error: Waiting for finished flag\n");
cprintf(GREEN,"Acquisition finished***\n");
if(eiger_storeinmem){
printf("requesting images after storing in memory\n");
if(startReadOut() == FAIL){
cprintf(RED, "Could not read out images\n");
*ret = (int)FAIL;
return NULL;
}
}
//usleep(0);
usleep(1000000);
printf("*****Done Waiting...\n");
@ -677,26 +692,53 @@ int setDynamicRange(int dr){
enum readOutFlags setReadOutFlags(enum readOutFlags val){
int ret;
enum readOutFlags retval;
if(val!=GET_READOUT_FLAGS){
if(val&0xF0000){
switch(val){
case PARALLEL: val=0; break;
case NONPARALLEL: val=1; break;
case SAFE: val=2; break;
default: val=0; break;
case PARALLEL: val=E_PARALLEL; printf(" Setting Read out Flag: Parallel\n"); break;
case NONPARALLEL: val=E_NON_PARALLEL; printf(" Setting Read out Flag: Non Parallel\n"); break;
case SAFE: val=E_SAFE; printf(" Setting Read out Flag: Safe\n"); break;
default:
cprintf(RED,"Cannot set unknown readout flag. 0x%x\n", val);
return -1;
}
printf(" Setting Read out Flag: %d\n",val);
if(Feb_Control_SetReadoutMode(val))
eiger_readoutmode = val;
else return -1;
}else{
switch(val){
case STORE_IN_RAM: val=1; printf(" Setting Read out Flag: Store in Ram\n"); break;
case CONTINOUS_RO: val=0; printf(" Setting Read out Flag: Continuous Readout\n"); break;
default:
cprintf(RED,"Cannot set unknown readout flag. 0x%x\n", val);
return -1;
}
printf(" Setting store in ram variable: %d\n",val);
eiger_storeinmem = val;
}
switch(eiger_readoutmode){
case 0: ret=PARALLEL; break;
case 1: ret=NONPARALLEL; break;
case 2: ret=SAFE; break;
default:ret=-1; break;
}
return ret;
switch(eiger_readoutmode){
case E_PARALLEL: retval=PARALLEL; break;
case E_NON_PARALLEL: retval=NONPARALLEL; break;
case E_SAFE: retval=SAFE; break;
}
switch(eiger_storeinmem){
case 0: retval|=CONTINOUS_RO; break;
case 1: retval|=STORE_IN_RAM; break;
}
printf("Read out Flag: 0x%x\n",retval);
return retval;
}

38
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4046,7 +4046,8 @@ string slsDetectorCommand::helpSpeed(int narg, char *args[], int action) {
string slsDetectorCommand::cmdAdvanced(int narg, char *args[], int action) {
int retval;
char answer[1000]="";
if (action==HELP_ACTION)
return helpAdvanced(narg, args, action);
@ -4078,24 +4079,27 @@ string slsDetectorCommand::cmdAdvanced(int narg, char *args[], int action) {
myDet->setOnline(ONLINE_FLAG);
switch (myDet->setReadOutFlags(flag)) {
case NORMAL_READOUT:
retval = myDet->setReadOutFlags(flag);
if(retval == NORMAL_READOUT)
return string("none");
case STORE_IN_RAM:
return string("storeinram");
case TOT_MODE:
return string("tot");
case CONTINOUS_RO:
return string("continous");
case PARALLEL:
return string("parallel");
case NONPARALLEL:
return string("nonparallel");
case SAFE:
return string("safe");
default:
if(retval & STORE_IN_RAM)
strcat(answer,"storeinram ");
if(retval & TOT_MODE)
strcat(answer,"tot ");
if(retval & CONTINOUS_RO)
strcat(answer,"continous ");
if(retval & PARALLEL)
strcat(answer,"parallel ");
if(retval & NONPARALLEL)
strcat(answer,"nonparallel ");
if(retval & SAFE)
strcat(answer,"safe ");
if(strlen(answer))
return string(answer);
return string("unknown");
}
} else if (cmd=="extsig") {
externalSignalFlag flag=GET_EXTERNAL_SIGNAL_FLAG;

31
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -2637,9 +2637,19 @@ int set_readout_flags(int file_des) {
ret=FAIL;
}
#if !defined(MYTHEND) && !defined(EIGERD)
sprintf(mess,"Read out flags not implemented for this detector\n");
cprintf(RED, "%s",mess);
ret=FAIL;
#else
#ifdef VERBOSE
printf("setting readout flags to %d\n",arg);
#endif
#ifdef SLS_DETECTOR_FUNCTION_LIST
if (differentClients==1 && lockStatus==1 && arg!=GET_READOUT_FLAGS) {
ret=FAIL;
@ -2648,30 +2658,37 @@ int set_readout_flags(int file_des) {
switch(arg) {
case GET_READOUT_FLAGS:
#ifdef MYTHEND
case STORE_IN_RAM:
case TOT_MODE:
case CONTINOUS_RO:
case NORMAL_READOUT:
retval=setReadOutFlags(arg);
break;
#elif EIGERD
#endif
#if defined(MYTHEND) || defined(EIGERD)
case STORE_IN_RAM:
case CONTINOUS_RO:
#endif
#ifdef EIGERD
case PARALLEL:
case NONPARALLEL:
case SAFE:
#endif
retval=setReadOutFlags(arg);
break;
#endif
default:
sprintf(mess,"Unknown readout flag %d for this detector\n", arg);
cprintf(RED, "%s",mess);
ret=FAIL;
break;
}
}
#endif
#endif
if (ret==OK) {
if (arg!=GET_READOUT_FLAGS && arg!=retval) {
if (retval == -1) {
ret=FAIL;
sprintf(mess,"Could not change readout flag: should be %d but is %d\n", arg, retval);
cprintf(RED, "%s",mess);
}else if (differentClients)
ret=FORCE_UPDATE;
}