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

fixed moench settings problem

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@628 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-06-25 11:30:29 +00:00
parent 802095ebc6
commit e8e2c7b3e4
10 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

3
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -25,7 +25,8 @@
#define NCHANS NCHAN*NCHIP*NMAXMOD #define NCHANS NCHAN*NCHIP*NMAXMOD
#define NDACS NDAC*NMAXMOD #define NDACS NDAC*NMAXMOD
#define DYNAMIC_RANGE 16
#define DYNAMIC_RANGE 32
#ifdef EIGERD #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}; enum detDacIndex{SVP,SVN,VTR,VRF,VRS,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,VCMP_RR,RXB_RB,RXB_LB,VCP,VCN,VIS};

6
slsDetectorSoftware/eigerDetectorServer/svnInfoEiger.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x621 //#define SVNREV 0x625
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x621 #define SVNREV 0x625
#define SVNDATE 0x20130620 #define SVNDATE 0x20130621
// //

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x617 //#define SVNREV 0x627
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x617 #define SVNREV 0x627
#define SVNDATE 0x20130619 #define SVNDATE 0x20130621
// //

6
slsDetectorSoftware/moenchDetectorServer/svnInfoMoench.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x617 //#define SVNREV 0x627
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x617 #define SVNREV 0x627
#define SVNDATE 0x20130619 #define SVNDATE 0x20130621
// //

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3899,6 +3899,10 @@ int multiSlsDetector::readConfigurationFile(string const fname){
setNumberOfModules(-1); setNumberOfModules(-1);
getMaxNumberOfModules(); getMaxNumberOfModules();
if (getErrorMask())
return FAIL;
return OK; return OK;

6
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x617 //#define SVNREV 0x627
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x617 #define SVNREV 0x627
#define SVNDATE 0x20130619 #define SVNDATE 0x20130621
// //

13
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2818,31 +2818,36 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
case HIGHGAIN: case HIGHGAIN:
if ( (thisDetector->myDetectorType == MYTHEN) || if ( (thisDetector->myDetectorType == MYTHEN) ||
(thisDetector->myDetectorType == GOTTHARD) || (thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == MOENCH) ||
(thisDetector->myDetectorType == EIGER)) { (thisDetector->myDetectorType == EIGER)) {
ssettings="/highgain"; ssettings="/highgain";
thisDetector->currentSettings=HIGHGAIN; thisDetector->currentSettings=HIGHGAIN;
} }
break; break;
case DYNAMICGAIN: case DYNAMICGAIN:
if (thisDetector->myDetectorType == GOTTHARD){ if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == MOENCH)) {
ssettings="/dynamicgain"; ssettings="/dynamicgain";
thisDetector->currentSettings=DYNAMICGAIN; thisDetector->currentSettings=DYNAMICGAIN;
} }
break; break;
case LOWGAIN: case LOWGAIN:
if (thisDetector->myDetectorType == GOTTHARD){ if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == MOENCH)) {
ssettings="/lowgain"; ssettings="/lowgain";
thisDetector->currentSettings=LOWGAIN; thisDetector->currentSettings=LOWGAIN;
} }
break; break;
case MEDIUMGAIN: case MEDIUMGAIN:
if (thisDetector->myDetectorType == GOTTHARD){ if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == MOENCH)) {
ssettings="/mediumgain"; ssettings="/mediumgain";
thisDetector->currentSettings=MEDIUMGAIN; thisDetector->currentSettings=MEDIUMGAIN;
} }
break; break;
case VERYHIGHGAIN: case VERYHIGHGAIN:
if (thisDetector->myDetectorType == GOTTHARD){ if ((thisDetector->myDetectorType == GOTTHARD) ||
(thisDetector->myDetectorType == MOENCH)) {
ssettings="/veryhighgain"; ssettings="/veryhighgain";
thisDetector->currentSettings=VERYHIGHGAIN; thisDetector->currentSettings=VERYHIGHGAIN;
} }

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x621 //#define SVNREV 0x627
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x621 #define SVNREVLIB 0x627
#define SVNDATELIB 0x20130620 #define SVNDATELIB 0x20130621
// //

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x617 //#define SVNREV 0x627
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x617 #define SVNREV 0x627
#define SVNDATE 0x20130619 #define SVNDATE 0x20130621
// //