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

vtrimbit size and vthreshold common for eiger

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-09-09 17:00:26 +02:00
parent 205fc06200
commit 62464441ee
15 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer
View File

Binary file not shown.

8
slsDetectorSoftware/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/eigerDetectorServer
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 87 Revision: 91
Branch: master Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 278 Last Changed Rev: 280
Last Changed Date: 2014-08-08 14:03:30 +0200 Last Changed Date: 2014-09-09 15:43:18 +0200

8
slsDetectorSoftware/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/eigerDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "8c994ea0d538628b36a9497508960388816749fa" #define SVNREPUUID "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x278 //#define SVNREV 0x280
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya" #define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x278 #define SVNREV 0x280
#define SVNDATE 0x20140808 #define SVNDATE 0x20140909
// //

7
slsDetectorSoftware/eigerDetectorServer/slsDetectorFunctionList.c
View File

@ -259,6 +259,13 @@ int detectorTest( enum digitalTestMode arg){
void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]){ void setDAC(enum detDacIndex ind, int val, int imod, int mV, int retval[]){
if(ind == VTHRESHOLD){
setDAC(VCMP_LL,val,imod,mV,retval);
setDAC(VCMP_LR,val,imod,mV,retval);
setDAC(VCMP_RL,val,imod,mV,retval);
ind = VCMP_RR;
}
char iname[10]; char iname[10];
if(((int)ind>=0)&&((int)ind<NDAC)) if(((int)ind>=0)&&((int)ind<NDAC))

2
slsDetectorSoftware/eigerDetectorServer/slsDetectorServer_defs.h
View File

@ -35,6 +35,6 @@
#define DYNAMIC_RANGE 16 #define DYNAMIC_RANGE 16
enum detDacIndex{SVP,VTR,VRF,VRS,SVN,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,RXB_RB,RXB_LB,VCMP_RR,VCP,VCN,VIS}; enum detDacIndex{SVP,VTR,VRF,VRS,SVN,VTGSTV,VCMP_LL,VCMP_LR,CAL,VCMP_RL,RXB_RB,RXB_LB,VCMP_RR,VCP,VCN,VIS,VTHRESHOLD};
#endif /* SLSDETECTORSERVER_DEFS_H_ */ #endif /* SLSDETECTORSERVER_DEFS_H_ */

8
slsDetectorSoftware/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware Path: slsDetectorsPackage/slsDetectorSoftware
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 848 Revision: 852
Branch: master Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 848 Last Changed Rev: 852
Last Changed Date: 2014-08-08 14:03:30 +0200 Last Changed Date: 2014-09-09 15:43:18 +0200

8
slsDetectorSoftware/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/gotthardDetectorServer
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 172 Revision: 173
Branch: master Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 278 Last Changed Rev: 280
Last Changed Date: 2014-08-08 14:03:30 +0200 Last Changed Date: 2014-09-09 15:43:18 +0200

8
slsDetectorSoftware/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "8c994ea0d538628b36a9497508960388816749fa" #define SVNREPUUID "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x278 //#define SVNREV 0x280
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya" #define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x278 #define SVNREV 0x280
#define SVNDATE 0x20140808 #define SVNDATE 0x20140909
// //

8
slsDetectorSoftware/moenchDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/moenchDetectorServer
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 57 Revision: 58
Branch: master Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 278 Last Changed Rev: 280
Last Changed Date: 2014-08-08 14:03:30 +0200 Last Changed Date: 2014-09-09 15:43:18 +0200

8
slsDetectorSoftware/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/moenchDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "8c994ea0d538628b36a9497508960388816749fa" #define SVNREPUUID "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x278 //#define SVNREV 0x280
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya" #define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x278 #define SVNREV 0x280
#define SVNDATE 0x20140808 #define SVNDATE 0x20140909
// //

8
slsDetectorSoftware/mythenDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/mythenDetectorServer
URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer URL: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer
Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git Repository Root: origin git@gitorious.psi.ch:sls_det_software/sls_detector_software.git
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 89 Revision: 90
Branch: master Branch: master
Last Changed Author: Maliakal_Dhanya Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 278 Last Changed Rev: 280
Last Changed Date: 2014-08-08 14:03:30 +0200 Last Changed Date: 2014-09-09 15:43:18 +0200

8
slsDetectorSoftware/mythenDetectorServer/gitInfoMythen.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer" #define SVNURL "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "8c994ea0d538628b36a9497508960388816749fa" #define SVNREPUUID "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x278 //#define SVNREV 0x280
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Maliakal_Dhanya" #define SVNAUTH "Maliakal_Dhanya"
#define SVNREV 0x278 #define SVNREV 0x280
#define SVNDATE 0x20140808 #define SVNDATE 0x20140909
// //

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURLLIB "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git" #define SVNURLLIB "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "8c994ea0d538628b36a9497508960388816749fa" #define SVNREPUUIDLIB "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x848 //#define SVNREV 0x852
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "Maliakal_Dhanya" #define SVNAUTHLIB "Maliakal_Dhanya"
#define SVNREVLIB 0x848 #define SVNREVLIB 0x852
#define SVNDATELIB 0x20140808 #define SVNDATELIB 0x20140909
// //

8
slsDetectorSoftware/slsDetector/slsDetectorActions.cpp
View File

@ -423,13 +423,7 @@ int slsDetectorActions::executeScan(int level, int istep) {
setThresholdEnergy((int)currentScanVariable[level]); //energy scan setThresholdEnergy((int)currentScanVariable[level]); //energy scan
break; break;
case thresholdScan: case thresholdScan:
if(getDetectorsType() == EIGER){ setDAC((dacs_t)currentScanVariable[level],THRESHOLD,0); // threshold scan
setDAC((dacs_t)currentScanVariable[level],E_Vcmp_ll,0); // threshold scan
setDAC((dacs_t)currentScanVariable[level],E_Vcmp_lr,0); // threshold scan
setDAC((dacs_t)currentScanVariable[level],E_Vcmp_rl,0); // threshold scan
setDAC((dacs_t)currentScanVariable[level],E_Vcmp_rr,0); // threshold scan
}else
setDAC((dacs_t)currentScanVariable[level],THRESHOLD,0); // threshold scan
break; break;
case trimbitsScan: case trimbitsScan:
trimbit=(int)currentScanVariable[level]; trimbit=(int)currentScanVariable[level];

6
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -1122,6 +1122,12 @@ int set_dac(int file_des) {
break; break;
#endif #endif
#ifdef EIGERD #ifdef EIGERD
case TRIMBIT_SIZE:
idac = VTR;
break;
case THRESHOLD:
idac = VTHRESHOLD;
break;
case E_SvP: case E_SvP:
idac = SVP; idac = SVP;
break; break;