From e8e2c7b3e48cc7c2149b7f38a9ea1099615e919f Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Tue, 25 Jun 2013 11:30:29 +0000 Subject: [PATCH] fixed moench settings problem git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3 --- .../bin/eigerDetectorServer | Bin 64693 -> 64693 bytes .../slsDetectorServer_defs.h | 3 ++- .../eigerDetectorServer/svnInfoEiger.h | 6 +++--- .../gotthardDetectorServer/svnInfoGotthard.h | 6 +++--- .../moenchDetectorServer/svnInfoMoench.h | 6 +++--- .../multiSlsDetector/multiSlsDetector.cpp | 4 ++++ .../mythenDetectorServer/svnInfoMythen.h | 6 +++--- .../slsDetector/slsDetector.cpp | 13 +++++++++---- slsDetectorSoftware/slsDetector/svnInfoLib.h | 6 +++--- .../slsReceiver/svnInfoReceiver.h | 6 +++--- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index a0e5f2ab8a8481a97d0a90ea2ccb349b6c4992f4..3c78f0873b59f017a41e9f6324b6d140f0720760 100755 GIT binary patch delta 16 Ycmdn`lX>e;<_+x^85K5nT-4PD07|3>@Bjb+ delta 16 Ycmdn`lX>e;<_+x^83i_XT-4PD07^s$-~a#s diff --git a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h index 97891d70c..4c21a74e7 100644 --- a/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h @@ -25,7 +25,8 @@ #define NCHANS NCHAN*NCHIP*NMAXMOD #define NDACS NDAC*NMAXMOD -#define DYNAMIC_RANGE 16 + +#define DYNAMIC_RANGE 32 #ifdef EIGERD enum detDacIndex{SVP,SVN,VTR,VRF,VRS,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,VCMP_RR,RXB_RB,RXB_LB,VCP,VCN,VIS}; diff --git a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h index 944f9f1e0..d3db146db 100644 --- a/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h +++ b/slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x621 +//#define SVNREV 0x625 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x621 -#define SVNDATE 0x20130620 +#define SVNREV 0x625 +#define SVNDATE 0x20130621 // diff --git a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h index 21ce86f51..2aa20f898 100644 --- a/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h +++ b/slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x617 +//#define SVNREV 0x627 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x617 -#define SVNDATE 0x20130619 +#define SVNREV 0x627 +#define SVNDATE 0x20130621 // diff --git a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h index ef359072b..cc568239e 100644 --- a/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h +++ b/slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x617 +//#define SVNREV 0x627 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x617 -#define SVNDATE 0x20130619 +#define SVNREV 0x627 +#define SVNDATE 0x20130621 // diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 9da873a12..2e84b3193 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -3899,6 +3899,10 @@ int multiSlsDetector::readConfigurationFile(string const fname){ setNumberOfModules(-1); getMaxNumberOfModules(); + + if (getErrorMask()) + return FAIL; + return OK; diff --git a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h index 891a4d1c1..f4aec44ab 100644 --- a/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h +++ b/slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x617 +//#define SVNREV 0x627 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x617 -#define SVNDATE 0x20130619 +#define SVNREV 0x627 +#define SVNDATE 0x20130621 // diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index a6044f184..29e36785d 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -2818,31 +2818,36 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise case HIGHGAIN: if ( (thisDetector->myDetectorType == MYTHEN) || (thisDetector->myDetectorType == GOTTHARD) || + (thisDetector->myDetectorType == MOENCH) || (thisDetector->myDetectorType == EIGER)) { ssettings="/highgain"; thisDetector->currentSettings=HIGHGAIN; } break; case DYNAMICGAIN: - if (thisDetector->myDetectorType == GOTTHARD){ + if ((thisDetector->myDetectorType == GOTTHARD) || + (thisDetector->myDetectorType == MOENCH)) { ssettings="/dynamicgain"; thisDetector->currentSettings=DYNAMICGAIN; } break; case LOWGAIN: - if (thisDetector->myDetectorType == GOTTHARD){ + if ((thisDetector->myDetectorType == GOTTHARD) || + (thisDetector->myDetectorType == MOENCH)) { ssettings="/lowgain"; thisDetector->currentSettings=LOWGAIN; } break; case MEDIUMGAIN: - if (thisDetector->myDetectorType == GOTTHARD){ + if ((thisDetector->myDetectorType == GOTTHARD) || + (thisDetector->myDetectorType == MOENCH)) { ssettings="/mediumgain"; thisDetector->currentSettings=MEDIUMGAIN; } break; case VERYHIGHGAIN: - if (thisDetector->myDetectorType == GOTTHARD){ + if ((thisDetector->myDetectorType == GOTTHARD) || + (thisDetector->myDetectorType == MOENCH)) { ssettings="/veryhighgain"; thisDetector->currentSettings=VERYHIGHGAIN; } diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h index 2d745bc41..c0eb953a7 100644 --- a/slsDetectorSoftware/slsDetector/svnInfoLib.h +++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h @@ -2,10 +2,10 @@ #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" //#define SVNREPPATH "" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x621 +//#define SVNREV 0x627 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTHLIB "l_maliakal_d" -#define SVNREVLIB 0x621 -#define SVNDATELIB 0x20130620 +#define SVNREVLIB 0x627 +#define SVNDATELIB 0x20130621 // diff --git a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h index 4526d94e3..836712bc6 100644 --- a/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h +++ b/slsDetectorSoftware/slsReceiver/svnInfoReceiver.h @@ -2,10 +2,10 @@ #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" //#define SVNREPPATH "" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" -//#define SVNREV 0x617 +//#define SVNREV 0x627 //#define SVNKIND "" //#define SVNSCHED "" #define SVNAUTH "l_maliakal_d" -#define SVNREV 0x617 -#define SVNDATE 0x20130619 +#define SVNREV 0x627 +#define SVNDATE 0x20130621 //