vtrimbit size and vthreshold common for eiger

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

View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/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
Repsitory UUID: 8c994ea0d538628b36a9497508960388816749fa
Revision: 87
Repsitory UUID: c31619c88e5690230fcd389dc18f9139295c442c
Revision: 91
Branch: master
Last Changed Author: Maliakal_Dhanya
Last Changed Rev: 278
Last Changed Date: 2014-08-08 14:03:30 +0200
Last Changed Rev: 280
Last Changed Date: 2014-09-09 15:43:18 +0200

View File

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

View File

@ -259,6 +259,13 @@ int detectorTest( enum digitalTestMode arg){
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];
if(((int)ind>=0)&&((int)ind<NDAC))

View File

@ -35,6 +35,6 @@
#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_ */