new enums

python/scripts/generate_enums.py

@@ -1,4 +1,5 @@
 import re
+import subprocess
 
 def comment_remover(text):
     def replacer(match):
@@ -61,3 +62,7 @@ warning = '/* WARINING This file is auto generated any edits might be overwritte
 with open('../src/enums.cpp', 'w') as f:
     f.write(warning)
     f.write(text)
+
+
+# clang-format ../src/enums.cpp -i
+subprocess.run(['clang-format', '../src/enums.cpp', '-i'])

python/src/enums.cpp

@@ -1,4 +1,5 @@
-/* WARINING This file is auto generated any edits might be overwritten without warning */
+/* WARINING This file is auto generated any edits might be overwritten without
+ * warning */
 
 #include <pybind11/chrono.h>
 #include <pybind11/operators.h>
@@ -16,7 +17,8 @@ void init_enums(py::module &m) {
     xy.def_readwrite("y", &slsDetectorDefs::xy::y);
 
     py::enum_<slsDetectorDefs::detectorType>(Defs, "detectorType")
-	.value("GET_DETECTOR_TYPE", slsDetectorDefs::detectorType::GET_DETECTOR_TYPE)
+        .value("GET_DETECTOR_TYPE",
+               slsDetectorDefs::detectorType::GET_DETECTOR_TYPE)
         .value("GENERIC", slsDetectorDefs::detectorType::GENERIC)
         .value("EIGER", slsDetectorDefs::detectorType::EIGER)
         .value("GOTTHARD", slsDetectorDefs::detectorType::GOTTHARD)
@@ -27,28 +29,6 @@ py::enum_<slsDetectorDefs::detectorType>(Defs, "detectorType")
         .value("GOTTHARD2", slsDetectorDefs::detectorType::GOTTHARD2)
         .export_values();
 
-py::enum_<slsDetectorDefs::timerIndex>(Defs, "timerIndex")
-	.value("FRAME_NUMBER", slsDetectorDefs::timerIndex::FRAME_NUMBER)
-	.value("ACQUISITION_TIME", slsDetectorDefs::timerIndex::ACQUISITION_TIME)
-	.value("FRAME_PERIOD", slsDetectorDefs::timerIndex::FRAME_PERIOD)
-	.value("DELAY_AFTER_TRIGGER", slsDetectorDefs::timerIndex::DELAY_AFTER_TRIGGER)
-	.value("TRIGGER_NUMBER", slsDetectorDefs::timerIndex::TRIGGER_NUMBER)
-	.value("ACTUAL_TIME", slsDetectorDefs::timerIndex::ACTUAL_TIME)
-	.value("MEASUREMENT_TIME", slsDetectorDefs::timerIndex::MEASUREMENT_TIME)
-	.value("PROGRESS", slsDetectorDefs::timerIndex::PROGRESS)
-	.value("FRAMES_FROM_START", slsDetectorDefs::timerIndex::FRAMES_FROM_START)
-	.value("FRAMES_FROM_START_PG", slsDetectorDefs::timerIndex::FRAMES_FROM_START_PG)
-	.value("ANALOG_SAMPLES", slsDetectorDefs::timerIndex::ANALOG_SAMPLES)
-	.value("DIGITAL_SAMPLES", slsDetectorDefs::timerIndex::DIGITAL_SAMPLES)
-	.value("SUBFRAME_ACQUISITION_TIME", slsDetectorDefs::timerIndex::SUBFRAME_ACQUISITION_TIME)
-	.value("STORAGE_CELL_NUMBER", slsDetectorDefs::timerIndex::STORAGE_CELL_NUMBER)
-	.value("SUBFRAME_DEADTIME", slsDetectorDefs::timerIndex::SUBFRAME_DEADTIME)
-	.value("MEASURED_PERIOD", slsDetectorDefs::timerIndex::MEASURED_PERIOD)
-	.value("MEASURED_SUBPERIOD", slsDetectorDefs::timerIndex::MEASURED_SUBPERIOD)
-	.value("STORAGE_CELL_DELAY", slsDetectorDefs::timerIndex::STORAGE_CELL_DELAY)
-	.value("MAX_TIMERS", slsDetectorDefs::timerIndex::MAX_TIMERS)
-.export_values();
-
     py::enum_<slsDetectorDefs::runStatus>(Defs, "runStatus")
         .value("IDLE", slsDetectorDefs::runStatus::IDLE)
         .value("ERROR", slsDetectorDefs::runStatus::ERROR)
@@ -60,41 +40,65 @@ py::enum_<slsDetectorDefs::runStatus>(Defs, "runStatus")
         .export_values();
 
     py::enum_<slsDetectorDefs::frameDiscardPolicy>(Defs, "frameDiscardPolicy")
-	.value("GET_FRAME_DISCARD_POLICY", slsDetectorDefs::frameDiscardPolicy::GET_FRAME_DISCARD_POLICY)
+        .value("GET_FRAME_DISCARD_POLICY",
+               slsDetectorDefs::frameDiscardPolicy::GET_FRAME_DISCARD_POLICY)
         .value("NO_DISCARD", slsDetectorDefs::frameDiscardPolicy::NO_DISCARD)
-	.value("DISCARD_EMPTY_FRAMES", slsDetectorDefs::frameDiscardPolicy::DISCARD_EMPTY_FRAMES)
+        .value("DISCARD_EMPTY_FRAMES",
-	.value("DISCARD_PARTIAL_FRAMES", slsDetectorDefs::frameDiscardPolicy::DISCARD_PARTIAL_FRAMES)
+               slsDetectorDefs::frameDiscardPolicy::DISCARD_EMPTY_FRAMES)
-	.value("NUM_DISCARD_POLICIES", slsDetectorDefs::frameDiscardPolicy::NUM_DISCARD_POLICIES)
+        .value("DISCARD_PARTIAL_FRAMES",
+               slsDetectorDefs::frameDiscardPolicy::DISCARD_PARTIAL_FRAMES)
+        .value("NUM_DISCARD_POLICIES",
+               slsDetectorDefs::frameDiscardPolicy::NUM_DISCARD_POLICIES)
         .export_values();
 
     py::enum_<slsDetectorDefs::fileFormat>(Defs, "fileFormat")
         .value("GET_FILE_FORMAT", slsDetectorDefs::fileFormat::GET_FILE_FORMAT)
         .value("BINARY", slsDetectorDefs::fileFormat::BINARY)
         .value("HDF5", slsDetectorDefs::fileFormat::HDF5)
-	.value("NUM_FILE_FORMATS", slsDetectorDefs::fileFormat::NUM_FILE_FORMATS)
+        .value("NUM_FILE_FORMATS",
+               slsDetectorDefs::fileFormat::NUM_FILE_FORMATS)
         .export_values();
 
     py::enum_<slsDetectorDefs::networkParameter>(Defs, "networkParameter")
         .value("DETECTOR_MAC", slsDetectorDefs::networkParameter::DETECTOR_MAC)
         .value("DETECTOR_IP", slsDetectorDefs::networkParameter::DETECTOR_IP)
-	.value("RECEIVER_HOSTNAME", slsDetectorDefs::networkParameter::RECEIVER_HOSTNAME)
+        .value("RECEIVER_HOSTNAME",
-	.value("RECEIVER_UDP_IP", slsDetectorDefs::networkParameter::RECEIVER_UDP_IP)
+               slsDetectorDefs::networkParameter::RECEIVER_HOSTNAME)
-	.value("RECEIVER_UDP_PORT", slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT)
+        .value("RECEIVER_UDP_IP",
-	.value("RECEIVER_UDP_MAC", slsDetectorDefs::networkParameter::RECEIVER_UDP_MAC)
+               slsDetectorDefs::networkParameter::RECEIVER_UDP_IP)
-	.value("RECEIVER_UDP_PORT2", slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT2)
+        .value("RECEIVER_UDP_PORT",
-	.value("DETECTOR_TXN_DELAY_LEFT", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_LEFT)
+               slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT)
-	.value("DETECTOR_TXN_DELAY_RIGHT", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_RIGHT)
+        .value("RECEIVER_UDP_MAC",
-	.value("DETECTOR_TXN_DELAY_FRAME", slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_FRAME)
+               slsDetectorDefs::networkParameter::RECEIVER_UDP_MAC)
-	.value("FLOW_CONTROL_10G", slsDetectorDefs::networkParameter::FLOW_CONTROL_10G)
+        .value("RECEIVER_UDP_PORT2",
-	.value("FLOW_CONTROL_WR_PTR", slsDetectorDefs::networkParameter::FLOW_CONTROL_WR_PTR)
+               slsDetectorDefs::networkParameter::RECEIVER_UDP_PORT2)
-	.value("FLOW_CONTROL_RD_PTR", slsDetectorDefs::networkParameter::FLOW_CONTROL_RD_PTR)
+        .value("DETECTOR_TXN_DELAY_LEFT",
-	.value("RECEIVER_STREAMING_PORT", slsDetectorDefs::networkParameter::RECEIVER_STREAMING_PORT)
+               slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_LEFT)
-	.value("CLIENT_STREAMING_PORT", slsDetectorDefs::networkParameter::CLIENT_STREAMING_PORT)
+        .value("DETECTOR_TXN_DELAY_RIGHT",
-	.value("RECEIVER_STREAMING_SRC_IP", slsDetectorDefs::networkParameter::RECEIVER_STREAMING_SRC_IP)
+               slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_RIGHT)
-	.value("CLIENT_STREAMING_SRC_IP", slsDetectorDefs::networkParameter::CLIENT_STREAMING_SRC_IP)
+        .value("DETECTOR_TXN_DELAY_FRAME",
-	.value("ADDITIONAL_JSON_HEADER", slsDetectorDefs::networkParameter::ADDITIONAL_JSON_HEADER)
+               slsDetectorDefs::networkParameter::DETECTOR_TXN_DELAY_FRAME)
-	.value("RECEIVER_UDP_SCKT_BUF_SIZE", slsDetectorDefs::networkParameter::RECEIVER_UDP_SCKT_BUF_SIZE)
+        .value("FLOW_CONTROL_10G",
-	.value("RECEIVER_REAL_UDP_SCKT_BUF_SIZE", slsDetectorDefs::networkParameter::RECEIVER_REAL_UDP_SCKT_BUF_SIZE)
+               slsDetectorDefs::networkParameter::FLOW_CONTROL_10G)
+        .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();
 
     py::enum_<slsDetectorDefs::numberOf>(Defs, "numberOf")
@@ -114,65 +118,85 @@ py::enum_<slsDetectorDefs::dimension>(Defs, "dimension")
         .export_values();
 
     py::enum_<slsDetectorDefs::externalSignalFlag>(Defs, "externalSignalFlag")
-	.value("GET_EXTERNAL_SIGNAL_FLAG", slsDetectorDefs::externalSignalFlag::GET_EXTERNAL_SIGNAL_FLAG)
+        .value("GET_EXTERNAL_SIGNAL_FLAG",
+               slsDetectorDefs::externalSignalFlag::GET_EXTERNAL_SIGNAL_FLAG)
         .value("SIGNAL_OFF", slsDetectorDefs::externalSignalFlag::SIGNAL_OFF)
-	.value("GATE_IN_ACTIVE_HIGH", slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_HIGH)
+        .value("GATE_IN_ACTIVE_HIGH",
-	.value("GATE_IN_ACTIVE_LOW", slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_LOW)
+               slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_HIGH)
-	.value("TRIGGER_IN_RISING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_IN_RISING_EDGE)
+        .value("GATE_IN_ACTIVE_LOW",
-	.value("TRIGGER_IN_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_IN_FALLING_EDGE)
+               slsDetectorDefs::externalSignalFlag::GATE_IN_ACTIVE_LOW)
-	.value("RO_TRIGGER_IN_RISING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_RISING_EDGE)
+        .value("TRIGGER_IN_RISING_EDGE",
-	.value("RO_TRIGGER_IN_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_FALLING_EDGE)
+               slsDetectorDefs::externalSignalFlag::TRIGGER_IN_RISING_EDGE)
-	.value("GATE_OUT_ACTIVE_HIGH", slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_HIGH)
+        .value("TRIGGER_IN_FALLING_EDGE",
-	.value("GATE_OUT_ACTIVE_LOW", slsDetectorDefs::externalSignalFlag::GATE_OUT_ACTIVE_LOW)
+               slsDetectorDefs::externalSignalFlag::TRIGGER_IN_FALLING_EDGE)
-	.value("TRIGGER_OUT_RISING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_RISING_EDGE)
+        .value("RO_TRIGGER_IN_RISING_EDGE",
-	.value("TRIGGER_OUT_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::TRIGGER_OUT_FALLING_EDGE)
+               slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_RISING_EDGE)
-	.value("RO_TRIGGER_OUT_RISING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_RISING_EDGE)
+        .value("RO_TRIGGER_IN_FALLING_EDGE",
-	.value("RO_TRIGGER_OUT_FALLING_EDGE", slsDetectorDefs::externalSignalFlag::RO_TRIGGER_OUT_FALLING_EDGE)
+               slsDetectorDefs::externalSignalFlag::RO_TRIGGER_IN_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_HIGH", slsDetectorDefs::externalSignalFlag::OUTPUT_HIGH)
-	.value("MASTER_SLAVE_SYNCHRONIZATION", slsDetectorDefs::externalSignalFlag::MASTER_SLAVE_SYNCHRONIZATION)
+        .value(
+            "MASTER_SLAVE_SYNCHRONIZATION",
+            slsDetectorDefs::externalSignalFlag::MASTER_SLAVE_SYNCHRONIZATION)
         .export_values();
 
     py::enum_<slsDetectorDefs::timingMode>(Defs, "timingMode")
         .value("GET_TIMING_MODE", slsDetectorDefs::timingMode::GET_TIMING_MODE)
         .value("AUTO_TIMING", slsDetectorDefs::timingMode::AUTO_TIMING)
-	.value("TRIGGER_EXPOSURE", slsDetectorDefs::timingMode::TRIGGER_EXPOSURE)
+        .value("TRIGGER_EXPOSURE",
+               slsDetectorDefs::timingMode::TRIGGER_EXPOSURE)
         .value("GATED", slsDetectorDefs::timingMode::GATED)
         .value("BURST_TRIGGER", slsDetectorDefs::timingMode::BURST_TRIGGER)
         .export_values();
 
     py::enum_<slsDetectorDefs::idMode>(Defs, "idMode")
-	.value("DETECTOR_SERIAL_NUMBER", slsDetectorDefs::idMode::DETECTOR_SERIAL_NUMBER)
+        .value("DETECTOR_SERIAL_NUMBER",
-	.value("DETECTOR_FIRMWARE_VERSION", slsDetectorDefs::idMode::DETECTOR_FIRMWARE_VERSION)
+               slsDetectorDefs::idMode::DETECTOR_SERIAL_NUMBER)
-	.value("DETECTOR_SOFTWARE_VERSION", slsDetectorDefs::idMode::DETECTOR_SOFTWARE_VERSION)
+        .value("DETECTOR_FIRMWARE_VERSION",
-	.value("THIS_SOFTWARE_VERSION", slsDetectorDefs::idMode::THIS_SOFTWARE_VERSION)
+               slsDetectorDefs::idMode::DETECTOR_FIRMWARE_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("SOFTWARE_FIRMWARE_API_VERSION", slsDetectorDefs::idMode::SOFTWARE_FIRMWARE_API_VERSION)
+        .value("SOFTWARE_FIRMWARE_API_VERSION",
-	.value("CLIENT_SOFTWARE_API_VERSION", slsDetectorDefs::idMode::CLIENT_SOFTWARE_API_VERSION)
+               slsDetectorDefs::idMode::SOFTWARE_FIRMWARE_API_VERSION)
-	.value("CLIENT_RECEIVER_API_VERSION", slsDetectorDefs::idMode::CLIENT_RECEIVER_API_VERSION)
+        .value("CLIENT_SOFTWARE_API_VERSION",
+               slsDetectorDefs::idMode::CLIENT_SOFTWARE_API_VERSION)
+        .value("CLIENT_RECEIVER_API_VERSION",
+               slsDetectorDefs::idMode::CLIENT_RECEIVER_API_VERSION)
         .export_values();
 
     py::enum_<slsDetectorDefs::digitalTestMode>(Defs, "digitalTestMode")
-	.value("DETECTOR_FIRMWARE_TEST", slsDetectorDefs::digitalTestMode::DETECTOR_FIRMWARE_TEST)
+        .value("DETECTOR_FIRMWARE_TEST",
-	.value("DETECTOR_BUS_TEST", slsDetectorDefs::digitalTestMode::DETECTOR_BUS_TEST)
+               slsDetectorDefs::digitalTestMode::DETECTOR_FIRMWARE_TEST)
+        .value("DETECTOR_BUS_TEST",
+               slsDetectorDefs::digitalTestMode::DETECTOR_BUS_TEST)
         .value("IMAGE_TEST", slsDetectorDefs::digitalTestMode::IMAGE_TEST)
         .export_values();
 
     py::enum_<slsDetectorDefs::dacIndex>(Defs, "dacIndex")
         .value("THRESHOLD", slsDetectorDefs::dacIndex::THRESHOLD)
-	.value("CALIBRATION_PULSE", slsDetectorDefs::dacIndex::CALIBRATION_PULSE)
+        .value("CALIBRATION_PULSE",
+               slsDetectorDefs::dacIndex::CALIBRATION_PULSE)
         .value("TRIMBIT_SIZE", slsDetectorDefs::dacIndex::TRIMBIT_SIZE)
         .value("PREAMP", slsDetectorDefs::dacIndex::PREAMP)
         .value("SHAPER1", slsDetectorDefs::dacIndex::SHAPER1)
         .value("SHAPER2", slsDetectorDefs::dacIndex::SHAPER2)
         .value("TEMPERATURE_ADC", slsDetectorDefs::dacIndex::TEMPERATURE_ADC)
         .value("TEMPERATURE_FPGA", slsDetectorDefs::dacIndex::TEMPERATURE_FPGA)
-	.value("HUMIDITY", slsDetectorDefs::dacIndex::HUMIDITY)
-	.value("DETECTOR_BIAS", slsDetectorDefs::dacIndex::DETECTOR_BIAS)
-	.value("VA_POT", slsDetectorDefs::dacIndex::VA_POT)
-	.value("VDD_POT", slsDetectorDefs::dacIndex::VDD_POT)
-	.value("VSH_POT", slsDetectorDefs::dacIndex::VSH_POT)
-	.value("VIO_POT", slsDetectorDefs::dacIndex::VIO_POT)
         .value("VREF_DS", slsDetectorDefs::dacIndex::VREF_DS)
         .value("VCASCN_PB", slsDetectorDefs::dacIndex::VCASCN_PB)
         .value("VCASCP_PB", slsDetectorDefs::dacIndex::VCASCP_PB)
@@ -200,13 +224,16 @@ py::enum_<slsDetectorDefs::dacIndex>(Defs, "dacIndex")
         .value("IO_DELAY", slsDetectorDefs::dacIndex::IO_DELAY)
         .value("ADC_VPP", slsDetectorDefs::dacIndex::ADC_VPP)
         .value("HIGH_VOLTAGE", slsDetectorDefs::dacIndex::HIGH_VOLTAGE)
-	.value("TEMPERATURE_FPGAEXT", slsDetectorDefs::dacIndex::TEMPERATURE_FPGAEXT)
+        .value("TEMPERATURE_FPGAEXT",
+               slsDetectorDefs::dacIndex::TEMPERATURE_FPGAEXT)
         .value("TEMPERATURE_10GE", slsDetectorDefs::dacIndex::TEMPERATURE_10GE)
         .value("TEMPERATURE_DCDC", slsDetectorDefs::dacIndex::TEMPERATURE_DCDC)
         .value("TEMPERATURE_SODL", slsDetectorDefs::dacIndex::TEMPERATURE_SODL)
         .value("TEMPERATURE_SODR", slsDetectorDefs::dacIndex::TEMPERATURE_SODR)
-	.value("TEMPERATURE_FPGA2", slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2)
+        .value("TEMPERATURE_FPGA2",
-	.value("TEMPERATURE_FPGA3", slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3)
+               slsDetectorDefs::dacIndex::TEMPERATURE_FPGA2)
+        .value("TEMPERATURE_FPGA3",
+               slsDetectorDefs::dacIndex::TEMPERATURE_FPGA3)
         .value("VIPRE", slsDetectorDefs::dacIndex::VIPRE)
         .value("VIINSH", slsDetectorDefs::dacIndex::VIINSH)
         .value("VDCSH", slsDetectorDefs::dacIndex::VDCSH)
@@ -231,6 +258,11 @@ py::enum_<slsDetectorDefs::dacIndex>(Defs, "dacIndex")
         .value("VB_CS", slsDetectorDefs::dacIndex::VB_CS)
         .value("VB_OPA_FD", slsDetectorDefs::dacIndex::VB_OPA_FD)
         .value("VCOM_ADC2", slsDetectorDefs::dacIndex::VCOM_ADC2)
+        .value("VB_DS", slsDetectorDefs::dacIndex::VB_DS)
+        .value("VB_COMP", slsDetectorDefs::dacIndex::VB_COMP)
+        .value("VB_PIXBUF", slsDetectorDefs::dacIndex::VB_PIXBUF)
+        .value("VIN_COM", slsDetectorDefs::dacIndex::VIN_COM)
+        .value("VDD_PROT", slsDetectorDefs::dacIndex::VDD_PROT)
         .value("V_POWER_A", slsDetectorDefs::dacIndex::V_POWER_A)
         .value("V_POWER_B", slsDetectorDefs::dacIndex::V_POWER_B)
         .value("V_POWER_C", slsDetectorDefs::dacIndex::V_POWER_C)
@@ -266,11 +298,14 @@ py::enum_<slsDetectorDefs::detectorSettings>(Defs, "detectorSettings")
         .value("DYNAMICHG0", slsDetectorDefs::detectorSettings::DYNAMICHG0)
         .value("FIXGAIN1", slsDetectorDefs::detectorSettings::FIXGAIN1)
         .value("FIXGAIN2", slsDetectorDefs::detectorSettings::FIXGAIN2)
-	.value("FORCESWITCHG1", slsDetectorDefs::detectorSettings::FORCESWITCHG1)
+        .value("FORCESWITCHG1",
-	.value("FORCESWITCHG2", slsDetectorDefs::detectorSettings::FORCESWITCHG2)
+               slsDetectorDefs::detectorSettings::FORCESWITCHG1)
+        .value("FORCESWITCHG2",
+               slsDetectorDefs::detectorSettings::FORCESWITCHG2)
         .value("VERYLOWGAIN", slsDetectorDefs::detectorSettings::VERYLOWGAIN)
         .value("UNDEFINED", slsDetectorDefs::detectorSettings::UNDEFINED)
-	.value("UNINITIALIZED", slsDetectorDefs::detectorSettings::UNINITIALIZED)
+        .value("UNINITIALIZED",
+               slsDetectorDefs::detectorSettings::UNINITIALIZED)
         .export_values();
 
     py::enum_<slsDetectorDefs::speedVariable>(Defs, "speedVariable")
@@ -281,15 +316,18 @@ py::enum_<slsDetectorDefs::speedVariable>(Defs, "speedVariable")
         .value("DBIT_CLOCK", slsDetectorDefs::speedVariable::DBIT_CLOCK)
         .value("DBIT_PHASE", slsDetectorDefs::speedVariable::DBIT_PHASE)
         .value("DBIT_PIPELINE", slsDetectorDefs::speedVariable::DBIT_PIPELINE)
-	.value("MAX_ADC_PHASE_SHIFT", slsDetectorDefs::speedVariable::MAX_ADC_PHASE_SHIFT)
+        .value("MAX_ADC_PHASE_SHIFT",
-	.value("MAX_DBIT_PHASE_SHIFT", slsDetectorDefs::speedVariable::MAX_DBIT_PHASE_SHIFT)
+               slsDetectorDefs::speedVariable::MAX_ADC_PHASE_SHIFT)
+        .value("MAX_DBIT_PHASE_SHIFT",
+               slsDetectorDefs::speedVariable::MAX_DBIT_PHASE_SHIFT)
         .value("SYNC_CLOCK", slsDetectorDefs::speedVariable::SYNC_CLOCK)
         .export_values();
 
     py::enum_<slsDetectorDefs::readoutMode>(Defs, "readoutMode")
         .value("ANALOG_ONLY", slsDetectorDefs::readoutMode::ANALOG_ONLY)
         .value("DIGITAL_ONLY", slsDetectorDefs::readoutMode::DIGITAL_ONLY)
-	.value("ANALOG_AND_DIGITAL", slsDetectorDefs::readoutMode::ANALOG_AND_DIGITAL)
+        .value("ANALOG_AND_DIGITAL",
+               slsDetectorDefs::readoutMode::ANALOG_AND_DIGITAL)
         .export_values();
 
     py::enum_<slsDetectorDefs::speedLevel>(Defs, "speedLevel")
@@ -320,12 +358,11 @@ py::enum_<slsDetectorDefs::frameModeType>(Defs, "frameModeType")
         .export_values();
 
     py::enum_<slsDetectorDefs::detectorModeType>(Defs, "detectorModeType")
-	.value("GET_DETECTOR_MODE", slsDetectorDefs::detectorModeType::GET_DETECTOR_MODE)
+        .value("GET_DETECTOR_MODE",
+               slsDetectorDefs::detectorModeType::GET_DETECTOR_MODE)
         .value("COUNTING", slsDetectorDefs::detectorModeType::COUNTING)
-	.value("INTERPOLATING", slsDetectorDefs::detectorModeType::INTERPOLATING)
+        .value("INTERPOLATING",
+               slsDetectorDefs::detectorModeType::INTERPOLATING)
         .value("ANALOG", slsDetectorDefs::detectorModeType::ANALOG)
         .export_values();
-
-
-
 }