detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 22:40: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 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};

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 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
//

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 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
//

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 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
//

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -3899,6 +3899,10 @@ int multiSlsDetector::readConfigurationFile(string const fname){
setNumberOfModules(-1);
getMaxNumberOfModules();
if (getErrorMask())
return FAIL;
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 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
//

13
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -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;
}

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -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
//

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 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
//