fixed enum

This commit is contained in:
Erik Frojdh 2019-10-07 14:30:16 +02:00
parent e0d10d0e01
commit 58cadefa61
2 changed files with 280 additions and 353 deletions

View File

@ -1,5 +1,4 @@
/* WARINING This file is auto generated any edits might be overwritten without /* WARINING This file is auto generated any edits might be overwritten without warning */
* warning */
#include <pybind11/chrono.h> #include <pybind11/chrono.h>
#include <pybind11/operators.h> #include <pybind11/operators.h>
@ -14,9 +13,8 @@ void init_enums(py::module &m) {
xy.def_readwrite("x", &slsDetectorDefs::xy::x); xy.def_readwrite("x", &slsDetectorDefs::xy::x);
xy.def_readwrite("y", &slsDetectorDefs::xy::y); xy.def_readwrite("y", &slsDetectorDefs::xy::y);
py::enum_<slsDetectorDefs::detectorType>(Defs, "detectorType") py::enum_<slsDetectorDefs::detectorType>(Defs, "detectorType")
.value("GET_DETECTOR_TYPE", .value("GET_DETECTOR_TYPE", slsDetectorDefs::detectorType::GET_DETECTOR_TYPE)
slsDetectorDefs::detectorType::GET_DETECTOR_TYPE)
.value("GENERIC", slsDetectorDefs::detectorType::GENERIC) .value("GENERIC", slsDetectorDefs::detectorType::GENERIC)
.value("EIGER", slsDetectorDefs::detectorType::EIGER) .value("EIGER", slsDetectorDefs::detectorType::EIGER)
.value("GOTTHARD", slsDetectorDefs::detectorType::GOTTHARD) .value("GOTTHARD", slsDetectorDefs::detectorType::GOTTHARD)
@ -25,41 +23,31 @@ void init_enums(py::module &m) {
.value("MOENCH", slsDetectorDefs::detectorType::MOENCH) .value("MOENCH", slsDetectorDefs::detectorType::MOENCH)
.value("MYTHEN3", slsDetectorDefs::detectorType::MYTHEN3) .value("MYTHEN3", slsDetectorDefs::detectorType::MYTHEN3)
.value("GOTTHARD2", slsDetectorDefs::detectorType::GOTTHARD2) .value("GOTTHARD2", slsDetectorDefs::detectorType::GOTTHARD2)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::timerIndex>(Defs, "timerIndex") py::enum_<slsDetectorDefs::timerIndex>(Defs, "timerIndex")
.value("FRAME_NUMBER", slsDetectorDefs::timerIndex::FRAME_NUMBER) .value("FRAME_NUMBER", slsDetectorDefs::timerIndex::FRAME_NUMBER)
.value("ACQUISITION_TIME", .value("ACQUISITION_TIME", slsDetectorDefs::timerIndex::ACQUISITION_TIME)
slsDetectorDefs::timerIndex::ACQUISITION_TIME)
.value("FRAME_PERIOD", slsDetectorDefs::timerIndex::FRAME_PERIOD) .value("FRAME_PERIOD", slsDetectorDefs::timerIndex::FRAME_PERIOD)
.value("DELAY_AFTER_TRIGGER", .value("DELAY_AFTER_TRIGGER", slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER)
slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER)
.value("CYCLES_NUMBER", slsDetectorDefs::timerIndex::CYCLES_NUMBER) .value("CYCLES_NUMBER", slsDetectorDefs::timerIndex::CYCLES_NUMBER)
.value("ACTUAL_TIME", slsDetectorDefs::timerIndex::ACTUAL_TIME) .value("ACTUAL_TIME", slsDetectorDefs::timerIndex::ACTUAL_TIME)
.value("MEASUREMENT_TIME", .value("MEASUREMENT_TIME", slsDetectorDefs::timerIndex::MEASUREMENT_TIME)
slsDetectorDefs::timerIndex::MEASUREMENT_TIME)
.value("PROGRESS", slsDetectorDefs::timerIndex::PROGRESS) .value("PROGRESS", slsDetectorDefs::timerIndex::PROGRESS)
.value("FRAMES_FROM_START", .value("FRAMES_FROM_START", slsDetectorDefs::timerIndex::FRAMES_FROM_START)
slsDetectorDefs::timerIndex::FRAMES_FROM_START) .value("FRAMES_FROM_START_PG", slsDetectorDefs::timerIndex::FRAMES_FROM_START_PG)
.value("FRAMES_FROM_START_PG",
slsDetectorDefs::timerIndex::FRAMES_FROM_START_PG)
.value("ANALOG_SAMPLES", slsDetectorDefs::timerIndex::ANALOG_SAMPLES) .value("ANALOG_SAMPLES", slsDetectorDefs::timerIndex::ANALOG_SAMPLES)
.value("DIGITAL_SAMPLES", slsDetectorDefs::timerIndex::DIGITAL_SAMPLES) .value("DIGITAL_SAMPLES", slsDetectorDefs::timerIndex::DIGITAL_SAMPLES)
.value("SUBFRAME_ACQUISITION_TIME", .value("SUBFRAME_ACQUISITION_TIME", slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME)
slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME) .value("STORAGE_CELL_NUMBER", slsDetectorDefs::timerIndex::STORAGE_CELL_NUMBER)
.value("STORAGE_CELL_NUMBER", .value("SUBFRAME_DEADTIME", slsDetectorDefs::timerIndex::SUBFRAME_DEADTIME)
slsDetectorDefs::timerIndex::STORAGE_CELL_NUMBER)
.value("SUBFRAME_DEADTIME",
slsDetectorDefs::timerIndex::SUBFRAME_DEADTIME)
.value("MEASURED_PERIOD", slsDetectorDefs::timerIndex::MEASURED_PERIOD) .value("MEASURED_PERIOD", slsDetectorDefs::timerIndex::MEASURED_PERIOD)
.value("MEASURED_SUBPERIOD", .value("MEASURED_SUBPERIOD", slsDetectorDefs::timerIndex::MEASURED_SUBPERIOD)
slsDetectorDefs::timerIndex::MEASURED_SUBPERIOD) .value("STORAGE_CELL_DELAY", slsDetectorDefs::timerIndex::STORAGE_CELL_DELAY)
.value("STORAGE_CELL_DELAY",
slsDetectorDefs::timerIndex::STORAGE_CELL_DELAY)
.value("MAX_TIMERS", slsDetectorDefs::timerIndex::MAX_TIMERS) .value("MAX_TIMERS", slsDetectorDefs::timerIndex::MAX_TIMERS)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::runStatus>(Defs, "runStatus") py::enum_<slsDetectorDefs::runStatus>(Defs, "runStatus")
.value("IDLE", slsDetectorDefs::runStatus::IDLE) .value("IDLE", slsDetectorDefs::runStatus::IDLE)
.value("ERROR", slsDetectorDefs::runStatus::ERROR) .value("ERROR", slsDetectorDefs::runStatus::ERROR)
.value("WAITING", slsDetectorDefs::runStatus::WAITING) .value("WAITING", slsDetectorDefs::runStatus::WAITING)
@ -67,71 +55,47 @@ void init_enums(py::module &m) {
.value("TRANSMITTING", slsDetectorDefs::runStatus::TRANSMITTING) .value("TRANSMITTING", slsDetectorDefs::runStatus::TRANSMITTING)
.value("RUNNING", slsDetectorDefs::runStatus::RUNNING) .value("RUNNING", slsDetectorDefs::runStatus::RUNNING)
.value("STOPPED", slsDetectorDefs::runStatus::STOPPED) .value("STOPPED", slsDetectorDefs::runStatus::STOPPED)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::frameDiscardPolicy>(Defs, "frameDiscardPolicy") py::enum_<slsDetectorDefs::frameDiscardPolicy>(Defs, "frameDiscardPolicy")
.value("GET_FRAME_DISCARD_POLICY", .value("GET_FRAME_DISCARD_POLICY", slsDetectorDefs::frameDiscardPolicy::GET_FRAME_DISCARD_POLICY)
slsDetectorDefs::frameDiscardPolicy::GET_FRAME_DISCARD_POLICY)
.value("NO_DISCARD", slsDetectorDefs::frameDiscardPolicy::NO_DISCARD) .value("NO_DISCARD", slsDetectorDefs::frameDiscardPolicy::NO_DISCARD)
.value("DISCARD_EMPTY_FRAMES", .value("DISCARD_EMPTY_FRAMES", slsDetectorDefs::frameDiscardPolicy::DISCARD_EMPTY_FRAMES)
slsDetectorDefs::frameDiscardPolicy::DISCARD_EMPTY_FRAMES) .value("DISCARD_PARTIAL_FRAMES", slsDetectorDefs::frameDiscardPolicy::DISCARD_PARTIAL_FRAMES)
.value("DISCARD_PARTIAL_FRAMES", .value("NUM_DISCARD_POLICIES", slsDetectorDefs::frameDiscardPolicy::NUM_DISCARD_POLICIES)
slsDetectorDefs::frameDiscardPolicy::DISCARD_PARTIAL_FRAMES) .export_values();
.value("NUM_DISCARD_POLICIES",
slsDetectorDefs::frameDiscardPolicy::NUM_DISCARD_POLICIES)
.export_values();
py::enum_<slsDetectorDefs::fileFormat>(Defs, "fileFormat") py::enum_<slsDetectorDefs::fileFormat>(Defs, "fileFormat")
.value("GET_FILE_FORMAT", slsDetectorDefs::fileFormat::GET_FILE_FORMAT) .value("GET_FILE_FORMAT", slsDetectorDefs::fileFormat::GET_FILE_FORMAT)
.value("BINARY", slsDetectorDefs::fileFormat::BINARY) .value("BINARY", slsDetectorDefs::fileFormat::BINARY)
.value("HDF5", slsDetectorDefs::fileFormat::HDF5) .value("HDF5", slsDetectorDefs::fileFormat::HDF5)
.value("NUM_FILE_FORMATS", .value("NUM_FILE_FORMATS", slsDetectorDefs::fileFormat::NUM_FILE_FORMATS)
slsDetectorDefs::fileFormat::NUM_FILE_FORMATS) .export_values();
.export_values();
py::enum_<slsDetectorDefs::networkParameter>(Defs, "networkParameter") py::enum_<slsDetectorDefs::networkParameter>(Defs, "networkParameter")
.value("DETECTOR_MAC", slsDetectorDefs::networkParameter::DETECTOR_MAC) .value("DETECTOR_MAC", slsDetectorDefs::networkParameter::DETECTOR_MAC)
.value("DETECTOR_IP", slsDetectorDefs::networkParameter::DETECTOR_IP) .value("DETECTOR_IP", slsDetectorDefs::networkParameter::DETECTOR_IP)
.value("RECEIVER_HOSTNAME", .value("RECEIVER_HOSTNAME", slsDetectorDefs::networkParameter::RECEIVER_HOSTNAME)
slsDetectorDefs::networkParameter::RECEIVER_HOSTNAME) .value("RECEIVER_UDP_IP", slsDetectorDefs::networkParameter::RECEIVER_UDP_IP)
.value("RECEIVER_UDP_IP", .value("RECEIVER_UDP_PORT", slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT)
slsDetectorDefs::networkParameter::RECEIVER_UDP_IP) .value("RECEIVER_UDP_MAC", slsDetectorDefs::networkParameter::RECEIVER_UDP_MAC)
.value("RECEIVER_UDP_PORT", .value("RECEIVER_UDP_PORT2", slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT2)
slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT) .value("DETECTOR_TXN_DELAY_LEFT", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_LEFT)
.value("RECEIVER_UDP_MAC", .value("DETECTOR_TXN_DELAY_RIGHT", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_RIGHT)
slsDetectorDefs::networkParameter::RECEIVER_UDP_MAC) .value("DETECTOR_TXN_DELAY_FRAME", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_FRAME)
.value("RECEIVER_UDP_PORT2", .value("FLOW_CONTROL_10G", slsDetectorDefs::networkParameter::FLOW_CONTROL_10G)
slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT2) .value("FLOW_CONTROL_WR_PTR", slsDetectorDefs::networkParameter::FLOW_CONTROL_WR_PTR)
.value("DETECTOR_TXN_DELAY_LEFT", .value("FLOW_CONTROL_RD_PTR", slsDetectorDefs::networkParameter::FLOW_CONTROL_RD_PTR)
slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_LEFT) .value("RECEIVER_STREAMING_PORT", slsDetectorDefs::networkParameter::RECEIVER_STREAMING_PORT)
.value("DETECTOR_TXN_DELAY_RIGHT", .value("CLIENT_STREAMING_PORT", slsDetectorDefs::networkParameter::CLIENT_STREAMING_PORT)
slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_RIGHT) .value("RECEIVER_STREAMING_SRC_IP", slsDetectorDefs::networkParameter::RECEIVER_STREAMING_SRC_IP)
.value("DETECTOR_TXN_DELAY_FRAME", .value("CLIENT_STREAMING_SRC_IP", slsDetectorDefs::networkParameter::CLIENT_STREAMING_SRC_IP)
slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_FRAME) .value("ADDITIONAL_JSON_HEADER", slsDetectorDefs::networkParameter::ADDITIONAL_JSON_HEADER)
.value("FLOW_CONTROL_10G", .value("RECEIVER_UDP_SCKT_BUF_SIZE", slsDetectorDefs::networkParameter::RECEIVER_UDP_SCKT_BUF_SIZE)
slsDetectorDefs::networkParameter::FLOW_CONTROL_10G) .value("RECEIVER_REAL_UDP_SCKT_BUF_SIZE", slsDetectorDefs::networkParameter::RECEIVER_REAL_UDP_SCKT_BUF_SIZE)
.value("FLOW_CONTROL_WR_PTR", .export_values();
slsDetectorDefs::networkParameter::FLOW_CONTROL_WR_PTR)
.value("FLOW_CONTROL_RD_PTR",
slsDetectorDefs::networkParameter::FLOW_CONTROL_RD_PTR)
.value("RECEIVER_STREAMING_PORT",
slsDetectorDefs::networkParameter::RECEIVER_STREAMING_PORT)
.value("CLIENT_STREAMING_PORT",
slsDetectorDefs::networkParameter::CLIENT_STREAMING_PORT)
.value("RECEIVER_STREAMING_SRC_IP",
slsDetectorDefs::networkParameter::RECEIVER_STREAMING_SRC_IP)
.value("CLIENT_STREAMING_SRC_IP",
slsDetectorDefs::networkParameter::CLIENT_STREAMING_SRC_IP)
.value("ADDITIONAL_JSON_HEADER",
slsDetectorDefs::networkParameter::ADDITIONAL_JSON_HEADER)
.value("RECEIVER_UDP_SCKT_BUF_SIZE",
slsDetectorDefs::networkParameter::RECEIVER_UDP_SCKT_BUF_SIZE)
.value(
"RECEIVER_REAL_UDP_SCKT_BUF_SIZE",
slsDetectorDefs::networkParameter::RECEIVER_REAL_UDP_SCKT_BUF_SIZE)
.export_values();
py::enum_<slsDetectorDefs::numberOf>(Defs, "numberOf") py::enum_<slsDetectorDefs::numberOf>(Defs, "numberOf")
.value("MAXMODX", slsDetectorDefs::numberOf::MAXMODX) .value("MAXMODX", slsDetectorDefs::numberOf::MAXMODX)
.value("MAXMODY", slsDetectorDefs::numberOf::MAXMODY) .value("MAXMODY", slsDetectorDefs::numberOf::MAXMODY)
.value("NMODX", slsDetectorDefs::numberOf::NMODX) .value("NMODX", slsDetectorDefs::numberOf::NMODX)
@ -140,87 +104,61 @@ void init_enums(py::module &m) {
.value("NCHANSY", slsDetectorDefs::numberOf::NCHANSY) .value("NCHANSY", slsDetectorDefs::numberOf::NCHANSY)
.value("NCHIPSX", slsDetectorDefs::numberOf::NCHIPSX) .value("NCHIPSX", slsDetectorDefs::numberOf::NCHIPSX)
.value("NCHIPSY", slsDetectorDefs::numberOf::NCHIPSY) .value("NCHIPSY", slsDetectorDefs::numberOf::NCHIPSY)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::dimension>(Defs, "dimension") py::enum_<slsDetectorDefs::dimension>(Defs, "dimension")
.value("X", slsDetectorDefs::dimension::X) .value("X", slsDetectorDefs::dimension::X)
.value("Y", slsDetectorDefs::dimension::Y) .value("Y", slsDetectorDefs::dimension::Y)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::externalSignalFlag>(Defs, "externalSignalFlag") py::enum_<slsDetectorDefs::externalSignalFlag>(Defs, "externalSignalFlag")
.value("GET_EXTERNAL_SIGNAL_FLAG", .value("GET_EXTERNAL_SIGNAL_FLAG", slsDetectorDefs::externalSignalFlag::GET_EXTERNAL_SIGNAL_FLAG)
slsDetectorDefs::externalSignalFlag::GET_EXTERNAL_SIGNAL_FLAG)
.value("SIGNAL_OFF", slsDetectorDefs::externalSignalFlag::SIGNAL_OFF) .value("SIGNAL_OFF", slsDetectorDefs::externalSignalFlag::SIGNAL_OFF)
.value("GATE_IN_ACTIVE_HIGH", .value("GATE_IN_ACTIVE_HIGH", slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_HIGH)
slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_HIGH) .value("GATE_IN_ACTIVE_LOW", slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_LOW)
.value("GATE_IN_ACTIVE_LOW", .value("TRIGGER_IN_RISING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_IN_RISING_EDGE)
slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_LOW) .value("TRIGGER_IN_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_IN_FALLING_EDGE)
.value("TRIGGER_IN_RISING_EDGE", .value("RO_TRIGGER_IN_RISING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_RISING_EDGE)
slsDetectorDefs::externalSignalFlag::TRIGGER_IN_RISING_EDGE) .value("RO_TRIGGER_IN_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_FALLING_EDGE)
.value("TRIGGER_IN_FALLING_EDGE", .value("GATE_OUT_ACTIVE_HIGH", slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_HIGH)
slsDetectorDefs::externalSignalFlag::TRIGGER_IN_FALLING_EDGE) .value("GATE_OUT_ACTIVE_LOW", slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_LOW)
.value("RO_TRIGGER_IN_RISING_EDGE", .value("TRIGGER_OUT_RISING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_RISING_EDGE)
slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_RISING_EDGE) .value("TRIGGER_OUT_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_FALLING_EDGE)
.value("RO_TRIGGER_IN_FALLING_EDGE", .value("RO_TRIGGER_OUT_RISING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_RISING_EDGE)
slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_FALLING_EDGE) .value("RO_TRIGGER_OUT_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_FALLING_EDGE)
.value("GATE_OUT_ACTIVE_HIGH",
slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_HIGH)
.value("GATE_OUT_ACTIVE_LOW",
slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_LOW)
.value("TRIGGER_OUT_RISING_EDGE",
slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_RISING_EDGE)
.value("TRIGGER_OUT_FALLING_EDGE",
slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_FALLING_EDGE)
.value("RO_TRIGGER_OUT_RISING_EDGE",
slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_RISING_EDGE)
.value("RO_TRIGGER_OUT_FALLING_EDGE",
slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_FALLING_EDGE)
.value("OUTPUT_LOW", slsDetectorDefs::externalSignalFlag::OUTPUT_LOW) .value("OUTPUT_LOW", slsDetectorDefs::externalSignalFlag::OUTPUT_LOW)
.value("OUTPUT_HIGH", slsDetectorDefs::externalSignalFlag::OUTPUT_HIGH) .value("OUTPUT_HIGH", slsDetectorDefs::externalSignalFlag::OUTPUT_HIGH)
.value( .value("MASTER_SLAVE_SYNCHRONIZATION", slsDetectorDefs::externalSignalFlag::MASTER_SLAVE_SYNCHRONIZATION)
"MASTER_SLAVE_SYNCHRONIZATION", .export_values();
slsDetectorDefs::externalSignalFlag::MASTER_SLAVE_SYNCHRONIZATION)
.export_values();
py::enum_<slsDetectorDefs::timingMode>(Defs, "timingMode") py::enum_<slsDetectorDefs::timingMode>(Defs, "timingMode")
.value("GET_TIMING_MODE", slsDetectorDefs::timingMode::GET_TIMING_MODE) .value("GET_TIMING_MODE", slsDetectorDefs::timingMode::GET_TIMING_MODE)
.value("AUTO_TIMING", slsDetectorDefs::timingMode::AUTO_TIMING) .value("AUTO_TIMING", slsDetectorDefs::timingMode::AUTO_TIMING)
.value("TRIGGER_EXPOSURE", .value("TRIGGER_EXPOSURE", slsDetectorDefs::timingMode::TRIGGER_EXPOSURE)
slsDetectorDefs::timingMode::TRIGGER_EXPOSURE)
.value("GATED", slsDetectorDefs::timingMode::GATED) .value("GATED", slsDetectorDefs::timingMode::GATED)
.value("BURST_TRIGGER", slsDetectorDefs::timingMode::BURST_TRIGGER) .value("BURST_TRIGGER", slsDetectorDefs::timingMode::BURST_TRIGGER)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::idMode>(Defs, "idMode") py::enum_<slsDetectorDefs::idMode>(Defs, "idMode")
.value("DETECTOR_SERIAL_NUMBER", .value("DETECTOR_SERIAL_NUMBER", slsDetectorDefs::idMode::DETECTOR_SERIAL_NUMBER)
slsDetectorDefs::idMode::DETECTOR_SERIAL_NUMBER) .value("DETECTOR_FIRMWARE_VERSION", slsDetectorDefs::idMode::DETECTOR_FIRMWARE_VERSION)
.value("DETECTOR_FIRMWARE_VERSION", .value("DETECTOR_SOFTWARE_VERSION", slsDetectorDefs::idMode::DETECTOR_SOFTWARE_VERSION)
slsDetectorDefs::idMode::DETECTOR_FIRMWARE_VERSION) .value("THIS_SOFTWARE_VERSION", slsDetectorDefs::idMode::THIS_SOFTWARE_VERSION)
.value("DETECTOR_SOFTWARE_VERSION",
slsDetectorDefs::idMode::DETECTOR_SOFTWARE_VERSION)
.value("THIS_SOFTWARE_VERSION",
slsDetectorDefs::idMode::THIS_SOFTWARE_VERSION)
.value("RECEIVER_VERSION", slsDetectorDefs::idMode::RECEIVER_VERSION) .value("RECEIVER_VERSION", slsDetectorDefs::idMode::RECEIVER_VERSION)
.value("SOFTWARE_FIRMWARE_API_VERSION", .value("SOFTWARE_FIRMWARE_API_VERSION", slsDetectorDefs::idMode::SOFTWARE_FIRMWARE_API_VERSION)
slsDetectorDefs::idMode::SOFTWARE_FIRMWARE_API_VERSION) .value("CLIENT_SOFTWARE_API_VERSION", slsDetectorDefs::idMode::CLIENT_SOFTWARE_API_VERSION)
.value("CLIENT_SOFTWARE_API_VERSION", .value("CLIENT_RECEIVER_API_VERSION", slsDetectorDefs::idMode::CLIENT_RECEIVER_API_VERSION)
slsDetectorDefs::idMode::CLIENT_SOFTWARE_API_VERSION) .export_values();
.value("CLIENT_RECEIVER_API_VERSION",
slsDetectorDefs::idMode::CLIENT_RECEIVER_API_VERSION)
.export_values();
py::enum_<slsDetectorDefs::digitalTestMode>(Defs, "digitalTestMode") py::enum_<slsDetectorDefs::digitalTestMode>(Defs, "digitalTestMode")
.value("DETECTOR_FIRMWARE_TEST", .value("DETECTOR_FIRMWARE_TEST", slsDetectorDefs::digitalTestMode::DETECTOR_FIRMWARE_TEST)
slsDetectorDefs::digitalTestMode::DETECTOR_FIRMWARE_TEST) .value("DETECTOR_BUS_TEST", slsDetectorDefs::digitalTestMode::DETECTOR_BUS_TEST)
.value("DETECTOR_BUS_TEST",
slsDetectorDefs::digitalTestMode::DETECTOR_BUS_TEST)
.value("IMAGE_TEST", slsDetectorDefs::digitalTestMode::IMAGE_TEST) .value("IMAGE_TEST", slsDetectorDefs::digitalTestMode::IMAGE_TEST)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::dacIndex>(Defs, "dacIndex") py::enum_<slsDetectorDefs::dacIndex>(Defs, "dacIndex")
.value("THRESHOLD", slsDetectorDefs::dacIndex::THRESHOLD) .value("THRESHOLD", slsDetectorDefs::dacIndex::THRESHOLD)
.value("CALIBRATION_PULSE", .value("CALIBRATION_PULSE", slsDetectorDefs::dacIndex::CALIBRATION_PULSE)
slsDetectorDefs::dacIndex::CALIBRATION_PULSE)
.value("TRIMBIT_SIZE", slsDetectorDefs::dacIndex::TRIMBIT_SIZE) .value("TRIMBIT_SIZE", slsDetectorDefs::dacIndex::TRIMBIT_SIZE)
.value("PREAMP", slsDetectorDefs::dacIndex::PREAMP) .value("PREAMP", slsDetectorDefs::dacIndex::PREAMP)
.value("SHAPER1", slsDetectorDefs::dacIndex::SHAPER1) .value("SHAPER1", slsDetectorDefs::dacIndex::SHAPER1)
@ -260,18 +198,14 @@ void init_enums(py::module &m) {
.value("IO_DELAY", slsDetectorDefs::dacIndex::IO_DELAY) .value("IO_DELAY", slsDetectorDefs::dacIndex::IO_DELAY)
.value("ADC_VPP", slsDetectorDefs::dacIndex::ADC_VPP) .value("ADC_VPP", slsDetectorDefs::dacIndex::ADC_VPP)
.value("HIGH_VOLTAGE", slsDetectorDefs::dacIndex::HIGH_VOLTAGE) .value("HIGH_VOLTAGE", slsDetectorDefs::dacIndex::HIGH_VOLTAGE)
.value("TEMPERATURE_FPGAEXT", .value("TEMPERATURE_FPGAEXT", slsDetectorDefs::dacIndex::TEMPERATURE_FPGAEXT)
slsDetectorDefs::dacIndex::TEMPERATURE_FPGAEXT)
.value("TEMPERATURE_10GE", slsDetectorDefs::dacIndex::TEMPERATURE_10GE) .value("TEMPERATURE_10GE", slsDetectorDefs::dacIndex::TEMPERATURE_10GE)
.value("TEMPERATURE_DCDC", slsDetectorDefs::dacIndex::TEMPERATURE_DCDC) .value("TEMPERATURE_DCDC", slsDetectorDefs::dacIndex::TEMPERATURE_DCDC)
.value("TEMPERATURE_SODL", slsDetectorDefs::dacIndex::TEMPERATURE_SODL) .value("TEMPERATURE_SODL", slsDetectorDefs::dacIndex::TEMPERATURE_SODL)
.value("TEMPERATURE_SODR", slsDetectorDefs::dacIndex::TEMPERATURE_SODR) .value("TEMPERATURE_SODR", slsDetectorDefs::dacIndex::TEMPERATURE_SODR)
.value("TEMPERATURE_FPGA2", .value("TEMPERATURE_FPGA2", slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2)
slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2) .value("TEMPERATURE_FPGA3", slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3)
.value("TEMPERATURE_FPGA3",
slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3)
.value("M_vIpre", slsDetectorDefs::dacIndex::M_vIpre) .value("M_vIpre", slsDetectorDefs::dacIndex::M_vIpre)
.value("M_vIbias", slsDetectorDefs::dacIndex::M_vIbias)
.value("M_vIinSh", slsDetectorDefs::dacIndex::M_vIinSh) .value("M_vIinSh", slsDetectorDefs::dacIndex::M_vIinSh)
.value("M_VdcSh", slsDetectorDefs::dacIndex::M_VdcSh) .value("M_VdcSh", slsDetectorDefs::dacIndex::M_VdcSh)
.value("M_Vth2", slsDetectorDefs::dacIndex::M_Vth2) .value("M_Vth2", slsDetectorDefs::dacIndex::M_Vth2)
@ -279,7 +213,6 @@ void init_enums(py::module &m) {
.value("M_Vth3", slsDetectorDefs::dacIndex::M_Vth3) .value("M_Vth3", slsDetectorDefs::dacIndex::M_Vth3)
.value("M_casSh", slsDetectorDefs::dacIndex::M_casSh) .value("M_casSh", slsDetectorDefs::dacIndex::M_casSh)
.value("M_cas", slsDetectorDefs::dacIndex::M_cas) .value("M_cas", slsDetectorDefs::dacIndex::M_cas)
.value("M_vIbiasSh", slsDetectorDefs::dacIndex::M_vIbiasSh)
.value("M_vIcin", slsDetectorDefs::dacIndex::M_vIcin) .value("M_vIcin", slsDetectorDefs::dacIndex::M_vIcin)
.value("M_vIpreOut", slsDetectorDefs::dacIndex::M_vIpreOut) .value("M_vIpreOut", slsDetectorDefs::dacIndex::M_vIpreOut)
.value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A) .value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A)
@ -303,9 +236,9 @@ void init_enums(py::module &m) {
.value("SLOW_ADC6", slsDetectorDefs::dacIndex::SLOW_ADC6) .value("SLOW_ADC6", slsDetectorDefs::dacIndex::SLOW_ADC6)
.value("SLOW_ADC7", slsDetectorDefs::dacIndex::SLOW_ADC7) .value("SLOW_ADC7", slsDetectorDefs::dacIndex::SLOW_ADC7)
.value("SLOW_ADC_TEMP", slsDetectorDefs::dacIndex::SLOW_ADC_TEMP) .value("SLOW_ADC_TEMP", slsDetectorDefs::dacIndex::SLOW_ADC_TEMP)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::detectorSettings>(Defs, "detectorSettings") py::enum_<slsDetectorDefs::detectorSettings>(Defs, "detectorSettings")
.value("GET_SETTINGS", slsDetectorDefs::detectorSettings::GET_SETTINGS) .value("GET_SETTINGS", slsDetectorDefs::detectorSettings::GET_SETTINGS)
.value("STANDARD", slsDetectorDefs::detectorSettings::STANDARD) .value("STANDARD", slsDetectorDefs::detectorSettings::STANDARD)
.value("FAST", slsDetectorDefs::detectorSettings::FAST) .value("FAST", slsDetectorDefs::detectorSettings::FAST)
@ -317,17 +250,14 @@ void init_enums(py::module &m) {
.value("DYNAMICHG0", slsDetectorDefs::detectorSettings::DYNAMICHG0) .value("DYNAMICHG0", slsDetectorDefs::detectorSettings::DYNAMICHG0)
.value("FIXGAIN1", slsDetectorDefs::detectorSettings::FIXGAIN1) .value("FIXGAIN1", slsDetectorDefs::detectorSettings::FIXGAIN1)
.value("FIXGAIN2", slsDetectorDefs::detectorSettings::FIXGAIN2) .value("FIXGAIN2", slsDetectorDefs::detectorSettings::FIXGAIN2)
.value("FORCESWITCHG1", .value("FORCESWITCHG1", slsDetectorDefs::detectorSettings::FORCESWITCHG1)
slsDetectorDefs::detectorSettings::FORCESWITCHG1) .value("FORCESWITCHG2", slsDetectorDefs::detectorSettings::FORCESWITCHG2)
.value("FORCESWITCHG2",
slsDetectorDefs::detectorSettings::FORCESWITCHG2)
.value("VERYLOWGAIN", slsDetectorDefs::detectorSettings::VERYLOWGAIN) .value("VERYLOWGAIN", slsDetectorDefs::detectorSettings::VERYLOWGAIN)
.value("UNDEFINED", slsDetectorDefs::detectorSettings::UNDEFINED) .value("UNDEFINED", slsDetectorDefs::detectorSettings::UNDEFINED)
.value("UNINITIALIZED", .value("UNINITIALIZED", slsDetectorDefs::detectorSettings::UNINITIALIZED)
slsDetectorDefs::detectorSettings::UNINITIALIZED) .export_values();
.export_values();
py::enum_<slsDetectorDefs::speedVariable>(Defs, "speedVariable") py::enum_<slsDetectorDefs::speedVariable>(Defs, "speedVariable")
.value("CLOCK_DIVIDER", slsDetectorDefs::speedVariable::CLOCK_DIVIDER) .value("CLOCK_DIVIDER", slsDetectorDefs::speedVariable::CLOCK_DIVIDER)
.value("ADC_CLOCK", slsDetectorDefs::speedVariable::ADC_CLOCK) .value("ADC_CLOCK", slsDetectorDefs::speedVariable::ADC_CLOCK)
.value("ADC_PHASE", slsDetectorDefs::speedVariable::ADC_PHASE) .value("ADC_PHASE", slsDetectorDefs::speedVariable::ADC_PHASE)
@ -335,53 +265,51 @@ void init_enums(py::module &m) {
.value("DBIT_CLOCK", slsDetectorDefs::speedVariable::DBIT_CLOCK) .value("DBIT_CLOCK", slsDetectorDefs::speedVariable::DBIT_CLOCK)
.value("DBIT_PHASE", slsDetectorDefs::speedVariable::DBIT_PHASE) .value("DBIT_PHASE", slsDetectorDefs::speedVariable::DBIT_PHASE)
.value("DBIT_PIPELINE", slsDetectorDefs::speedVariable::DBIT_PIPELINE) .value("DBIT_PIPELINE", slsDetectorDefs::speedVariable::DBIT_PIPELINE)
.value("MAX_ADC_PHASE_SHIFT", .value("MAX_ADC_PHASE_SHIFT", slsDetectorDefs::speedVariable::MAX_ADC_PHASE_SHIFT)
slsDetectorDefs::speedVariable::MAX_ADC_PHASE_SHIFT) .value("MAX_DBIT_PHASE_SHIFT", slsDetectorDefs::speedVariable::MAX_DBIT_PHASE_SHIFT)
.value("MAX_DBIT_PHASE_SHIFT",
slsDetectorDefs::speedVariable::MAX_DBIT_PHASE_SHIFT)
.value("SYNC_CLOCK", slsDetectorDefs::speedVariable::SYNC_CLOCK) .value("SYNC_CLOCK", slsDetectorDefs::speedVariable::SYNC_CLOCK)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::readoutMode>(Defs, "readoutMode") py::enum_<slsDetectorDefs::readoutMode>(Defs, "readoutMode")
.value("ANALOG_ONLY", slsDetectorDefs::readoutMode::ANALOG_ONLY) .value("ANALOG_ONLY", slsDetectorDefs::readoutMode::ANALOG_ONLY)
.value("DIGITAL_ONLY", slsDetectorDefs::readoutMode::DIGITAL_ONLY) .value("DIGITAL_ONLY", slsDetectorDefs::readoutMode::DIGITAL_ONLY)
.value("ANALOG_AND_DIGITAL", .value("ANALOG_AND_DIGITAL", slsDetectorDefs::readoutMode::ANALOG_AND_DIGITAL)
slsDetectorDefs::readoutMode::ANALOG_AND_DIGITAL) .export_values();
.export_values();
py::enum_<slsDetectorDefs::speedLevel>(Defs, "speedLevel") py::enum_<slsDetectorDefs::speedLevel>(Defs, "speedLevel")
.value("FULL_SPEED", slsDetectorDefs::speedLevel::FULL_SPEED) .value("FULL_SPEED", slsDetectorDefs::speedLevel::FULL_SPEED)
.value("HALF_SPEED", slsDetectorDefs::speedLevel::HALF_SPEED) .value("HALF_SPEED", slsDetectorDefs::speedLevel::HALF_SPEED)
.value("QUARTER_SPEED", slsDetectorDefs::speedLevel::QUARTER_SPEED) .value("QUARTER_SPEED", slsDetectorDefs::speedLevel::QUARTER_SPEED)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::portType>(Defs, "portType") py::enum_<slsDetectorDefs::portType>(Defs, "portType")
.value("CONTROL_PORT", slsDetectorDefs::portType::CONTROL_PORT) .value("CONTROL_PORT", slsDetectorDefs::portType::CONTROL_PORT)
.value("STOP_PORT", slsDetectorDefs::portType::STOP_PORT) .value("STOP_PORT", slsDetectorDefs::portType::STOP_PORT)
.value("DATA_PORT", slsDetectorDefs::portType::DATA_PORT) .value("DATA_PORT", slsDetectorDefs::portType::DATA_PORT)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::masterFlags>(Defs, "masterFlags") py::enum_<slsDetectorDefs::masterFlags>(Defs, "masterFlags")
.value("GET_MASTER", slsDetectorDefs::masterFlags::GET_MASTER) .value("GET_MASTER", slsDetectorDefs::masterFlags::GET_MASTER)
.value("NO_MASTER", slsDetectorDefs::masterFlags::NO_MASTER) .value("NO_MASTER", slsDetectorDefs::masterFlags::NO_MASTER)
.value("IS_MASTER", slsDetectorDefs::masterFlags::IS_MASTER) .value("IS_MASTER", slsDetectorDefs::masterFlags::IS_MASTER)
.value("IS_SLAVE", slsDetectorDefs::masterFlags::IS_SLAVE) .value("IS_SLAVE", slsDetectorDefs::masterFlags::IS_SLAVE)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::frameModeType>(Defs, "frameModeType") py::enum_<slsDetectorDefs::frameModeType>(Defs, "frameModeType")
.value("GET_FRAME_MODE", slsDetectorDefs::frameModeType::GET_FRAME_MODE) .value("GET_FRAME_MODE", slsDetectorDefs::frameModeType::GET_FRAME_MODE)
.value("PEDESTAL", slsDetectorDefs::frameModeType::PEDESTAL) .value("PEDESTAL", slsDetectorDefs::frameModeType::PEDESTAL)
.value("NEW_PEDESTAL", slsDetectorDefs::frameModeType::NEW_PEDESTAL) .value("NEW_PEDESTAL", slsDetectorDefs::frameModeType::NEW_PEDESTAL)
.value("FLATFIELD", slsDetectorDefs::frameModeType::FLATFIELD) .value("FLATFIELD", slsDetectorDefs::frameModeType::FLATFIELD)
.value("NEW_FLATFIELD", slsDetectorDefs::frameModeType::NEW_FLATFIELD) .value("NEW_FLATFIELD", slsDetectorDefs::frameModeType::NEW_FLATFIELD)
.export_values(); .export_values();
py::enum_<slsDetectorDefs::detectorModeType>(Defs, "detectorModeType") py::enum_<slsDetectorDefs::detectorModeType>(Defs, "detectorModeType")
.value("GET_DETECTOR_MODE", .value("GET_DETECTOR_MODE", slsDetectorDefs::detectorModeType::GET_DETECTOR_MODE)
slsDetectorDefs::detectorModeType::GET_DETECTOR_MODE)
.value("COUNTING", slsDetectorDefs::detectorModeType::COUNTING) .value("COUNTING", slsDetectorDefs::detectorModeType::COUNTING)
.value("INTERPOLATING", .value("INTERPOLATING", slsDetectorDefs::detectorModeType::INTERPOLATING)
slsDetectorDefs::detectorModeType::INTERPOLATING)
.value("ANALOG", slsDetectorDefs::detectorModeType::ANALOG) .value("ANALOG", slsDetectorDefs::detectorModeType::ANALOG)
.export_values(); .export_values();
} }

View File

@ -1943,7 +1943,6 @@ std::string slsDetectorCommand::executeLine(int narg, const char * const args[],
if (action == READOUT_ACTION) if (action == READOUT_ACTION)
return cmdAcquire(narg, args, action, detPos); return cmdAcquire(narg, args, action, detPos);
xxx
size_t s = std::string(args[0]).find(':'); size_t s = std::string(args[0]).find(':');
std::string key = std::string(args[0]).substr(0, s); // truncate at : std::string key = std::string(args[0]).substr(0, s); // truncate at :