diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index e72f512da..7d8683fdc 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -404,7 +404,12 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef default: setReadOutFlags(SAFE);break; \ } \ } \ - }; \ + }; + + /** + get readout mode of detector (eiger specific) + \returns 0 for nonparallel, 1 for parallel, 2 for safe + */ int getParallelMode(){ \ int ret = setReadOutFlags(); \ if (ret&NONPARALLEL) return 0; \ @@ -413,11 +418,17 @@ class slsDetectorBase : public virtual slsDetectorDefs, public virtual errorDef return -1; \ } \ + /** + set/ get high voltage + \param val high voltage (>0 sets, 0 unsets, -1 gets) + \returns high voltage + */ + int setHighVoltage(int val){return setDAC(val, HV_NEW, 0, -1);} \ /** set dacs value - \param val value (in V) + \param val value \param index DAC index \param mV 0 in dac units or 1 in mV \param imod module number (if -1 alla modules) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp index ef831e140..95d9369ec 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp @@ -354,3 +354,7 @@ int slsDetectorUsers::stopAcquisition() { int slsDetectorUsers::setReceiverSilentMode(int i) { return myDetector->setReceiverSilentMode(i); } + +int slsDetectorUsers::setHighVoltage(int i) { + return myDetector->setHighVoltage(i); +} diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h index 2823d7cb6..ea8011326 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h @@ -618,6 +618,13 @@ class slsDetectorUsers */ int setReceiverSilentMode(int i); + /** + * set high voltage + * @param i > 0 sets, 0 unsets, (-1 gets) + * @return high voltage + */ + int setHighVoltage(int i); + /************************************************************************ STATIC FUNCTIONS