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

slsDetectorUsers: added setthreshold without trimbits for eiger

Browse Source
This commit is contained in:
maliakal_d 2018-05-23 16:39:52 +02:00
parent c5262458d5
commit a154d0a088
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -518,6 +518,7 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef
virtual int setThresholdEnergy(int e_eV, int imod, detectorSettings isettings=GET_SETTINGS, int tb=1)=0; virtual int setThresholdEnergy(int e_eV, int imod, detectorSettings isettings=GET_SETTINGS, int tb=1)=0;
int setThresholdEnergy(int e_eV){return setThresholdEnergy(e_eV,-1);}; int setThresholdEnergy(int e_eV){return setThresholdEnergy(e_eV,-1);};
int setThresholdEnergy(int e_ev, int tb, int isettings, int id){return setThresholdEnergy(e_ev, id, (detectorSettings)isettings, tb);}
/** /**

4
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -151,6 +151,10 @@ int slsDetectorUsers::setThresholdEnergy(int e_eV){
return myDetector->setThresholdEnergy(e_eV); return myDetector->setThresholdEnergy(e_eV);
} }
int slsDetectorUsers::setThresholdEnergy(int e_ev, int tb, int isettings, int id) {
return myDetector->slsDetectorBase::setThresholdEnergy(e_ev, tb, isettings, id);
}
double slsDetectorUsers::setExposureTime(double t, bool inseconds){ double slsDetectorUsers::setExposureTime(double t, bool inseconds){
int64_t tms = (int64_t)(t * (1E+9)); int64_t tms = (int64_t)(t * (1E+9));
if (t < 0) tms = -1; if (t < 0) tms = -1;

10
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -310,6 +310,16 @@ class slsDetectorUsers
*/ */
int setThresholdEnergy(int e_eV); int setThresholdEnergy(int e_eV);
/**
@short set threshold energy with choice to load trimbits (eiger only)
\param e_ev threshold in ev
\param tb 1 loads trimbits, 0 does not load trimbits
\param isettings settings index (-1 uses current setting)
\param id module index (-1 for all)
\returns current threshold value in ev (-1 failed)
*/
int setThresholdEnergy(int e_ev, int tb, int isettings = -1, int id = -1);
/** /**
@short set/get exposure time value @short set/get exposure time value