From 2417f9cd7b2d63a0a2bab12ad200076ac9c45b51 Mon Sep 17 00:00:00 2001 From: Erik Frojdh Date: Wed, 6 Nov 2019 10:26:21 +0100 Subject: [PATCH] enums --- python/src/enums.cpp | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 8ebc56004..f5e142ea4 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -101,17 +101,6 @@ void init_enums(py::module &m) { slsDetectorDefs::networkParameter::RECEIVER_REAL_UDP_SCKT_BUF_SIZE) .export_values(); - py::enum_(Defs, "numberOf") - .value("MAXMODX", slsDetectorDefs::numberOf::MAXMODX) - .value("MAXMODY", slsDetectorDefs::numberOf::MAXMODY) - .value("NMODX", slsDetectorDefs::numberOf::NMODX) - .value("NMODY", slsDetectorDefs::numberOf::NMODY) - .value("NCHANSX", slsDetectorDefs::numberOf::NCHANSX) - .value("NCHANSY", slsDetectorDefs::numberOf::NCHANSY) - .value("NCHIPSX", slsDetectorDefs::numberOf::NCHIPSX) - .value("NCHIPSY", slsDetectorDefs::numberOf::NCHIPSY) - .export_values(); - py::enum_(Defs, "dimension") .value("X", slsDetectorDefs::dimension::X) .value("Y", slsDetectorDefs::dimension::Y) @@ -308,19 +297,11 @@ void init_enums(py::module &m) { slsDetectorDefs::detectorSettings::UNINITIALIZED) .export_values(); - py::enum_(Defs, "speedVariable") - .value("CLOCK_DIVIDER", slsDetectorDefs::speedVariable::CLOCK_DIVIDER) - .value("ADC_CLOCK", slsDetectorDefs::speedVariable::ADC_CLOCK) - .value("ADC_PHASE", slsDetectorDefs::speedVariable::ADC_PHASE) - .value("ADC_PIPELINE", slsDetectorDefs::speedVariable::ADC_PIPELINE) - .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_DBIT_PHASE_SHIFT", - slsDetectorDefs::speedVariable::MAX_DBIT_PHASE_SHIFT) - .value("SYNC_CLOCK", slsDetectorDefs::speedVariable::SYNC_CLOCK) + py::enum_(Defs, "clockIndex") + .value("ADC_CLOCK", slsDetectorDefs::clockIndex::ADC_CLOCK) + .value("DBIT_CLOCK", slsDetectorDefs::clockIndex::DBIT_CLOCK) + .value("RUN_CLOCK", slsDetectorDefs::clockIndex::RUN_CLOCK) + .value("SYNC_CLOCK", slsDetectorDefs::clockIndex::SYNC_CLOCK) .export_values(); py::enum_(Defs, "readoutMode")