detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 18:17:59 +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

8
slsDetectorSoftware/slsDetector/gitInfoLib.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURLLIB "git@gitorious.psi.ch:sls_det_software/sls_detector_software.git"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "8c994ea0d538628b36a9497508960388816749fa"
//#define SVNREV 0x848
#define SVNREPUUIDLIB "c31619c88e5690230fcd389dc18f9139295c442c"
//#define SVNREV 0x852
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "Maliakal_Dhanya"
#define SVNREVLIB 0x848
#define SVNDATELIB 0x20140808
#define SVNREVLIB 0x852
#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
break;
case thresholdScan:
if(getDetectorsType() == EIGER){
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
setDAC((dacs_t)currentScanVariable[level],THRESHOLD,0); // threshold scan
break;
case trimbitsScan:
trimbit=(int)currentScanVariable[level];