diff --git a/python/scripts/generate_enums.py b/python/scripts/generate_enums.py index 96429f7cb..3d20e59b5 100644 --- a/python/scripts/generate_enums.py +++ b/python/scripts/generate_enums.py @@ -30,17 +30,7 @@ def extract_enums(lines): line_iter = iter(lines) enums = {} - inside_defs = False - for line in line_iter: - - # only pick up what is inside slsDetectorDefs - if "class slsDetectorDefs" in line: - inside_defs = True - - if not inside_defs: - continue - #Hack away class enum defs if "class" in line: line = line.replace("class", "") diff --git a/python/src/enums.cpp b/python/src/enums.cpp index 9f2439668..d391fe0f2 100644 --- a/python/src/enums.cpp +++ b/python/src/enums.cpp @@ -30,6 +30,11 @@ void init_enums(py::module &m) { .value("MATTERHORN", slsDetectorDefs::detectorType::MATTERHORN) .export_values(); + py::enum_(Defs, "ReturnCode") + .value("OK", slsDetectorDefs::ReturnCode::OK) + .value("FAIL", slsDetectorDefs::ReturnCode::FAIL) + .export_values(); + py::enum_(Defs, "boolFormat") .value("TrueFalse", slsDetectorDefs::boolFormat::TrueFalse) .value("OnOff", slsDetectorDefs::boolFormat::OnOff) diff --git a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp index b4f7c7e62..4d3c5faef 100644 --- a/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp +++ b/slsDetectorSoftware/tests/Caller/test-Caller-master-attributes.cpp @@ -96,53 +96,6 @@ void read_from_h5_dataset(const H5::DataSet &dataset, const std::string &name, } #endif -/** std::vector */ -void read_from_json(const Document &doc, const std::string &name, - std::vector &retval) { - for (const auto &item : doc[name.c_str()].GetArray()) { - retval.push_back(item.GetString()); - } -} -#ifdef HDF5C -void read_from_h5_dataset(const H5::DataSet &dataset, const std::string &name, - std::vector &retval) { - H5::DataSpace dataspace = dataset.getSpace(); - hsize_t dims[1]; - dataspace.getSimpleExtentDims(dims); - - // read to raw c buffer - std::vector rdata(dims[0]); - auto strType = dataset.getStrType(); - dataset.read(rdata.data(), strType); - - retval.resize(dims[0]); - for (size_t i = 0; i != dims[0]; ++i) { - retval[i] = std::string(rdata[i]); - } - // free HDF5-allocated memory - H5Dvlen_reclaim(strType.getId(), dataspace.getId(), H5P_DEFAULT, - rdata.data()); -} -#endif - -/** std::vector */ -void read_from_json(const Document &doc, const std::string &name, - std::vector &retval) { - for (const auto &item : doc[name.c_str()].GetArray()) { - retval.push_back(item.GetInt()); - } -} -#ifdef HDF5C -void read_from_h5_dataset(const H5::DataSet &dataset, const std::string &name, - std::vector &retval) { - H5::DataSpace dataspace = dataset.getSpace(); - hsize_t dims[1]; - dataspace.getSimpleExtentDims(dims); - retval.resize(dims[0]); - dataset.read(retval.data(), H5::PredType::STD_I32LE); -} -#endif - /** std::vector */ void read_from_json(const Document &doc, const std::string &name, std::vector &retval) { @@ -645,43 +598,6 @@ void test_master_file_num_udp_interfaces(const Detector &det, num_udp_interfaces)); } -void test_master_file_udp_interfaces_type(const Detector &det, - const std::optional &doc) { - auto num_udp_interfaces = det.getNumberofUDPInterfaces().tsquash( - "Inconsistent number of UDP interfaces"); - - if (num_udp_interfaces == 1) - return; - - // expected values - auto det_type = - det.getDetectorType().tsquash("Inconsistent detector types to test"); - std::vector udpPortsType = {ToString(defs::BOTTOM), - ToString(defs::TOP)}; - - if (det_type == defs::EIGER) { - udpPortsType[0] = ToString(defs::LEFT); - udpPortsType[1] = ToString(defs::RIGHT); - } - - REQUIRE_NOTHROW(check_master_file>( - doc, MasterAttributes::N_UDP_PORTS_TYPE.data(), udpPortsType)); -} - -void test_master_file_udp_interfaces_disable( - const Detector &det, const std::optional &doc) { - auto num_udp_interfaces = det.getNumberofUDPInterfaces().tsquash( - "Inconsistent number of UDP interfaces"); - - if (num_udp_interfaces == 1) - return; - - auto disabled_udp_ports = det.getRxDisabledUDPPortIndices(); - - REQUIRE_NOTHROW(check_master_file>( - doc, MasterAttributes::N_UDP_PORTS_DISBLED.data(), disabled_udp_ports)); -} - void test_master_file_read_n_rows(const Detector &det, const std::optional &doc) { auto readnrows = det.getReadNRows().tsquash("Inconsistent number of rows"); @@ -972,8 +888,6 @@ void test_master_file_jungfrau_metadata(const Detector &det, REQUIRE_NOTHROW(test_master_file_exptime(det, doc)); REQUIRE_NOTHROW(test_master_file_period(det, doc)); REQUIRE_NOTHROW(test_master_file_num_udp_interfaces(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_type(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_disable(det, doc)); REQUIRE_NOTHROW(test_master_file_read_n_rows(det, doc)); REQUIRE_NOTHROW(test_master_file_readout_speed(det, doc)); } @@ -991,8 +905,6 @@ void test_master_file_eiger_metadata(const Detector &det, REQUIRE_NOTHROW(test_master_file_sub_exptime(det, doc)); REQUIRE_NOTHROW(test_master_file_sub_period(det, doc)); REQUIRE_NOTHROW(test_master_file_quad(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_type(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_disable(det, doc)); REQUIRE_NOTHROW(test_master_file_read_n_rows(det, doc)); REQUIRE_NOTHROW(test_master_file_rate_corrections(det, doc)); REQUIRE_NOTHROW(test_master_file_readout_speed(det, doc)); @@ -1006,8 +918,6 @@ void test_master_file_moench_metadata(const Detector &det, REQUIRE_NOTHROW(test_master_file_exptime(det, doc)); REQUIRE_NOTHROW(test_master_file_period(det, doc)); REQUIRE_NOTHROW(test_master_file_num_udp_interfaces(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_type(det, doc)); - REQUIRE_NOTHROW(test_master_file_udp_interfaces_disable(det, doc)); REQUIRE_NOTHROW(test_master_file_read_n_rows(det, doc)); REQUIRE_NOTHROW(test_master_file_readout_speed(det, doc)); }