mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-21 19:30:03 +02:00
fixed enum
This commit is contained in:
Erik Frojdh
parent
e0d10d0e01
commit
58cadefa61
@ -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>
|
||||||
@ -15,8 +14,7 @@ void init_enums(py::module &m) {
|
|||||||
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)
|
||||||
@ -29,33 +27,23 @@ void init_enums(py::module &m) {
|
|||||||
|
|
||||||
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();
|
||||||
|
|
||||||
@ -70,65 +58,41 @@ void init_enums(py::module &m) {
|
|||||||
.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)
|
|
||||||
.value("NUM_DISCARD_POLICIES",
|
|
||||||
slsDetectorDefs::frameDiscardPolicy::NUM_DISCARD_POLICIES)
|
|
||||||
.export_values();
|
.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",
|
|
||||||
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();
|
.export_values();
|
||||||
|
|
||||||
py::enum_<slsDetectorDefs::numberOf>(Defs, "numberOf")
|
py::enum_<slsDetectorDefs::numberOf>(Defs, "numberOf")
|
||||||
@ -148,79 +112,53 @@ void init_enums(py::module &m) {
|
|||||||
.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",
|
|
||||||
slsDetectorDefs::externalSignalFlag::MASTER_SLAVE_SYNCHRONIZATION)
|
|
||||||
.export_values();
|
.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)
|
|
||||||
.value("CLIENT_RECEIVER_API_VERSION",
|
|
||||||
slsDetectorDefs::idMode::CLIENT_RECEIVER_API_VERSION)
|
|
||||||
.export_values();
|
.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)
|
||||||
@ -317,14 +250,11 @@ 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")
|
||||||
@ -335,18 +265,15 @@ 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")
|
||||||
@ -377,11 +304,12 @@ void init_enums(py::module &m) {
|
|||||||
.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();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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 :
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user