From c04ed80b83cf6cae2dafc4ee9954e3016ca9509c Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Fri, 13 Jul 2012 11:21:51 +0000 Subject: [PATCH] changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1 git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@203 951219d9-93cf-4727-9268-0efd64621fa3 --- .../gotthardDetectorServer/server_funcs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c index 04fcb1c3d..4a8410c1d 100755 --- a/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c +++ b/slsDetectorSoftware/gotthardDetectorServer/server_funcs.c @@ -74,6 +74,13 @@ int init_detector( int b) { setPhaseShiftOnce(); setDAQRegister(); setSettings(GET_SETTINGS,-1); + //Initialization + setFrames(1); + setTrains(1); + setExposureTime(1e9); + setPeriod(1e9); + setDelay(1e9); + setGates(1); #endif setTiming(GET_EXTERNAL_COMMUNICATION_MODE); setMaster(GET_MASTER); @@ -2293,8 +2300,7 @@ int set_dynamic_range(int file_des) { retval=setDynamicRange(dr); } - if (dr>=0 && retval!=dr) - ret=FAIL; + //if (dr>=0 && retval!=dr) ret=FAIL; if (ret!=OK) { sprintf(mess,"set dynamic range failed\n"); } else {