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

changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@203 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2012-07-13 11:21:51 +00:00
parent 13fa3520a6
commit c04ed80b83
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/gotthardDetectorServer/server_funcs.c
View File

@ -74,6 +74,13 @@ int init_detector( int b) {
setPhaseShiftOnce(); setPhaseShiftOnce();
setDAQRegister(); setDAQRegister();
setSettings(GET_SETTINGS,-1); setSettings(GET_SETTINGS,-1);
//Initialization
setFrames(1);
setTrains(1);
setExposureTime(1e9);
setPeriod(1e9);
setDelay(1e9);
setGates(1);
#endif #endif
setTiming(GET_EXTERNAL_COMMUNICATION_MODE); setTiming(GET_EXTERNAL_COMMUNICATION_MODE);
setMaster(GET_MASTER); setMaster(GET_MASTER);
@ -2293,8 +2300,7 @@ int set_dynamic_range(int file_des) {
retval=setDynamicRange(dr); retval=setDynamicRange(dr);
} }
if (dr>=0 && retval!=dr) //if (dr>=0 && retval!=dr) ret=FAIL;
ret=FAIL;
if (ret!=OK) { if (ret!=OK) {
sprintf(mess,"set dynamic range failed\n"); sprintf(mess,"set dynamic range failed\n");
} else { } else {