Commit 5a624480 authored by Emmanuel Papillon's avatar Emmanuel Papillon Committed by Generic Bliss account for Control Software

add retrigger

add high voltage reading (measured and target)
parent 35fa251a
Pipeline #35660 passed with stages
in 9 minutes and 10 seconds
......@@ -123,6 +123,8 @@ class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGe
void getTemperature(double&);
void getHumidity(double&);
void getHighVoltageState(std::string&);
void getHighVoltageMeasured(double&);
void getHighVoltageTarget(double&);
void resetHighVoltage();
void setCountrateCorrection(bool);
......@@ -133,6 +135,8 @@ class LIBEIGER Camera : public HwMaxImageSizeCallbackGen, public EventCallbackGe
void getAutoSummation(bool&);
void setEfficiencyCorrection(bool);
void getEfficiencyCorrection(bool& value);
void setRetrigger(bool);
void getRetrigger(bool &value);
void setPixelMask(bool);
void getPixelMask(bool&);
void setThresholdEnergy(double);
......
......@@ -141,6 +141,8 @@ namespace eigerapi
enum PARAM_NAME {TEMP,
HUMIDITY,
HVSTATE,
HVMEASURED,
HVTARGET,
DETECTOR_STATUS,
PIXELDEPTH,
X_PIXEL_SIZE,
......@@ -150,14 +152,15 @@ namespace eigerapi
DESCRIPTION,
DETECTOR_NUMBER,
DETECTOR_READOUT_TIME,
DATA_COLLECTION_DATE,
SOFTWARE_VERSION,
DATA_COLLECTION_DATE,
SOFTWARE_VERSION,
EXPOSURE,
FRAME_TIME,
TRIGGER_MODE,
COUNTRATE_CORRECTION,
FLATFIELD_CORRECTION,
EFFICIENCY_CORRECTION,
RETRIGGER,
PIXEL_MASK,
THRESHOLD_ENERGY,
VIRTUAL_PIXEL_CORRECTION,
......
......@@ -108,6 +108,8 @@ ParamIndex ParamDescription[] = {
{Requests::TEMP, {"th0_temp",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS_BOARD}},
{Requests::HUMIDITY, {"th0_humidity",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS_BOARD}},
{Requests::HVSTATE, {"state",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS_HV}},
{Requests::HVMEASURED, {"measured",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS_HV}},
{Requests::HVTARGET, {"target",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS_HV}},
{Requests::DETECTOR_STATUS, {"state",CSTR_SUBSYSTEMDETECTOR,CSTR_EIGERSTATUS}},
{Requests::PIXELDEPTH, {"bit_depth_readout"}},
{Requests::X_PIXEL_SIZE, {"x_pixel_size"}},
......@@ -134,6 +136,7 @@ ParamIndex ParamDescription[] = {
{Requests::NIMAGES, {"nimages"}},
{Requests::NTRIGGER, {"ntrigger"}},
{Requests::AUTO_SUMMATION, {"auto_summation"}},
{Requests::RETRIGGER, {"retrigger"}},
// Filewriter settings
{Requests::FILEWRITER_MODE, {"mode",CSTR_SUBSYSTEMFILEWRITER}},
......
......@@ -82,6 +82,8 @@ namespace Eiger
void getTemperature(double& /Out/);
void getHumidity(double& /Out/);
void getHighVoltageState(std::string& /Out/);
void getHighVoltageMeasured(double& /Out/);
void getHighVoltageTarget(double& /Out/);
void resetHighVoltage();
void setCountrateCorrection(const bool);
......@@ -92,6 +94,8 @@ namespace Eiger
void getAutoSummation(bool& /Out/);
void setEfficiencyCorrection(const bool);
void getEfficiencyCorrection(bool& value /Out/);
void setRetrigger(bool);
void getRetrigger(bool& /Out/);
void setPixelMask(const bool);
void getPixelMask(bool& /Out/);
void setThresholdEnergy(const double);
......
......@@ -868,6 +868,17 @@ void Camera::resetHighVoltage()
DEB_TRACE() << "reset HighVoltage";
}
void Camera::getHighVoltageMeasured(double &hvmeas)
{
DEB_MEMBER_FUNCT();
getParam(Requests::HVMEASURED, hvmeas);
}
void Camera::getHighVoltageTarget(double &hvtarget)
{
DEB_MEMBER_FUNCT();
getParam(Requests::HVTARGET, hvtarget);
}
//-----------------------------------------------------------------------------
/// Count rate correction setter
//-----------------------------------------------------------------------------
......@@ -907,6 +918,26 @@ void Camera::getFlatfieldCorrection(bool& value) ///< [out] true:enabled, false:
getParam(Requests::FLATFIELD_CORRECTION,value);
}
//-----------------------------------------------------------------------------
/// Retrigger mode setter
//-----------------------------------------------------------------------------
void Camera::setRetrigger(bool value) ///< [in] true:enabled, false:disabled
{
DEB_MEMBER_FUNCT();
setParam(Requests::RETRIGGER,value);
}
//-----------------------------------------------------------------------------
/// Retrigger getter
//-----------------------------------------------------------------------------
void Camera::getRetrigger(bool& value) ///< [out] true:enabled, false:disabled
{
DEB_MEMBER_FUNCT();
getParam(Requests::RETRIGGER,value);
}
//----------------------------------------------------------------------------
// Auto Summation setter
//----------------------------------------------------------------------------
......@@ -928,6 +959,8 @@ void Camera::getAutoSummation(bool& value)
getParam(Requests::AUTO_SUMMATION,value);
DEB_RETURN() << DEB_VAR1(value);
}
//-----------------------------------------------------------------------------
/// PixelMask setter
//-----------------------------------------------------------------------------
......
......@@ -81,6 +81,8 @@ class Eiger(PyTango.Device_4Impl):
'OFF':False}
self.__VirtualPixelCorrection = {'ON':True,
'OFF':False}
self.__Retrigger = {'ON':True,
'OFF':False}
self.__PixelMask = {'ON':True,
'OFF':False}
self.__CompressionType = {'NONE': EigerAcq.Camera.NoCompression,
......@@ -252,6 +254,14 @@ class EigerClass(PyTango.DeviceClass):
[[PyTango.DevString,
PyTango.SCALAR,
PyTango.READ]],
'high_voltage_measured':
[[PyTango.DevFloat,
PyTango.SCALAR,
PyTango.READ]],
'high_voltage_target':
[[PyTango.DevFloat,
PyTango.SCALAR,
PyTango.READ]],
'countrate_correction':
[[PyTango.DevString,
PyTango.SCALAR,
......@@ -272,6 +282,10 @@ class EigerClass(PyTango.DeviceClass):
[[PyTango.DevString,
PyTango.SCALAR,
PyTango.READ_WRITE]],
'retrigger':
[[PyTango.DevString,
PyTango.SCALAR,
PyTango.READ_WRITE]],
'pixel_mask':
[[PyTango.DevString,
PyTango.SCALAR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment