Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch/fddaq v4.4.x #27

Merged
merged 6 commits into from
May 17, 2024
Merged

Patch/fddaq v4.4.x #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4c8120
fix the TriggerCandidate python binding
wesketchum May 10, 2024
310007f
Corrected python enum names.
aeoranday Mar 4, 2024
cbc162e
Merge pull request #24 from DUNE-DAQ/wketchum_fixTriggerCandidatePyth…
alessandrothea May 13, 2024
7def7b3
Merge pull request #25 from DUNE-DAQ/aeoranday/pybind-enum-naming
aeoranday May 14, 2024
a44775a
WRK: version v1.2.2
wesketchum May 16, 2024
0e98302
Merge pull request #26 from DUNE-DAQ/wketchum_versionBump
wesketchum May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.12)
project(trgdataformats VERSION 1.2.1)
project(trgdataformats VERSION 1.2.2)

find_package(daq-cmake REQUIRED)

Expand Down
39 changes: 19 additions & 20 deletions pybindsrc/trigger_activity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,8 @@ register_trigger_activity(py::module& m)
{


py::enum_<TriggerActivityData::Type>(m, "TriggerActivityData::Type")
.value("kUnknown", TriggerActivityData::Type::kUnknown)
.value("kTPC", TriggerActivityData::Type::kTPC)
.value("kPDS", TriggerActivityData::Type::kPDS)
.export_values();

py::enum_<TriggerActivityData::Algorithm>(m, "TriggerActivityData::Algorithm")
.value("kUnknown", TriggerActivityData::Algorithm::kUnknown)
.value("kSupernova", TriggerActivityData::Algorithm::kSupernova)
.value("kPrescale", TriggerActivityData::Algorithm::kPrescale)
.value("kADCSimpleWindow", TriggerActivityData::Algorithm::kADCSimpleWindow)
.value("kHorizontalMuon", TriggerActivityData::Algorithm::kHorizontalMuon)
.value("kMichelElectron", TriggerActivityData::Algorithm::kMichelElectron)
.value("kDBSCAN", TriggerActivityData::Algorithm::kDBSCAN)
.value("kBundle", TriggerActivityData::Algorithm::kBundle)
.value("kChannelDistance", TriggerActivityData::Algorithm::kChannelDistance)
.value("kChannelAdjacency", TriggerActivityData::Algorithm::kChannelAdjacency)
.export_values();

py::class_<TriggerActivityData>(m, "TriggerActivityData", py::buffer_protocol())
py::class_<TriggerActivityData> trigger_activity_data(m, "TriggerActivityData", py::buffer_protocol());
trigger_activity_data
.def(py::init())
.def(py::init([](py::capsule capsule) {
auto tp = *static_cast<TriggerActivityData*>(capsule.get_pointer());
Expand Down Expand Up @@ -89,6 +71,23 @@ register_trigger_activity(py::module& m)
;


py::enum_<TriggerActivityData::Type>(trigger_activity_data, "Type")
.value("kUnknown", TriggerActivityData::Type::kUnknown)
.value("kTPC", TriggerActivityData::Type::kTPC)
.value("kPDS", TriggerActivityData::Type::kPDS);

py::enum_<TriggerActivityData::Algorithm>(trigger_activity_data, "Algorithm")
.value("kUnknown", TriggerActivityData::Algorithm::kUnknown)
.value("kSupernova", TriggerActivityData::Algorithm::kSupernova)
.value("kPrescale", TriggerActivityData::Algorithm::kPrescale)
.value("kADCSimpleWindow", TriggerActivityData::Algorithm::kADCSimpleWindow)
.value("kHorizontalMuon", TriggerActivityData::Algorithm::kHorizontalMuon)
.value("kMichelElectron", TriggerActivityData::Algorithm::kMichelElectron)
.value("kDBSCAN", TriggerActivityData::Algorithm::kDBSCAN)
.value("kBundle", TriggerActivityData::Algorithm::kBundle)
.value("kChannelDistance", TriggerActivityData::Algorithm::kChannelDistance)
.value("kChannelAdjacency", TriggerActivityData::Algorithm::kChannelAdjacency);

py::class_<TriggerActivity>(m, "TriggerActivityOverlay", py::buffer_protocol())
.def(py::init())
.def(py::init([](py::capsule capsule) {
Expand Down
62 changes: 32 additions & 30 deletions pybindsrc/trigger_candidate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,29 @@ register_trigger_candidate(py::module& m)

m.def("string_to_fragment_type_value", &trgdataformats::string_to_fragment_type_value);

py::enum_<TriggerCandidateData::Type>(m, "TriggerCandidateData::Type")
py::class_<TriggerCandidateData> trigger_candidate_data(m, "TriggerCandidateData", py::buffer_protocol());
trigger_candidate_data
.def(py::init())
.def(py::init([](py::capsule capsule) {
auto tp = *static_cast<TriggerCandidateData*>(capsule.get_pointer());
return tp;
} ))
.def(py::init([](py::bytes bytes){
py::buffer_info info(py::buffer(bytes).request());
auto tp = *static_cast<TriggerCandidateData*>(info.ptr);
return tp;
}))
.def_property_readonly("version", [](TriggerCandidateData& self) -> uint16_t {return self.version;})
.def_property_readonly("time_start", [](TriggerCandidateData& self) -> uint64_t {return self.time_start;})
.def_property_readonly("time_end", [](TriggerCandidateData& self) -> uint64_t {return self.time_end;})
.def_property_readonly("time_candidate", [](TriggerCandidateData& self) -> uint64_t {return self.time_candidate;})
.def_property_readonly("detid", [](TriggerCandidateData& self) -> uint16_t {return self.detid;})
.def_property_readonly("type", [](TriggerCandidateData& self) -> TriggerCandidateData::Type {return self.type;})
.def_property_readonly("algorithm", [](TriggerCandidateData& self) -> TriggerCandidateData::Algorithm {return self.algorithm;})
.def_static("sizeof", [](){ return sizeof(TriggerCandidateData); })
;

py::enum_<TriggerCandidateData::Type>(trigger_candidate_data, "Type")
.value("kUnknown", TriggerCandidateData::Type::kUnknown)
.value("kTiming", TriggerCandidateData::Type::kTiming)
.value("kTPCLowE", TriggerCandidateData::Type::kTPCLowE)
Expand Down Expand Up @@ -71,10 +93,9 @@ register_trigger_candidate(py::module& m)
.value("kCIBFakeTrigger", TriggerCandidateData::Type::kCIBFakeTrigger)
.value("kCIBLaserTriggerP1", TriggerCandidateData::Type::kCIBLaserTriggerP1)
.value("kCIBLaserTriggerP2", TriggerCandidateData::Type::kCIBLaserTriggerP2)
.value("kCIBLaserTriggerP3", TriggerCandidateData::Type::kCIBLaserTriggerP3)
.export_values();
.value("kCIBLaserTriggerP3", TriggerCandidateData::Type::kCIBLaserTriggerP3);

py::enum_<TriggerCandidateData::Algorithm>(m, "TriggerCandidateData::Algorithm")
py::enum_<TriggerCandidateData::Algorithm>(trigger_candidate_data, "Algorithm")
.value("kUnknown", TriggerCandidateData::Algorithm::kUnknown)
.value("kSupernova", TriggerCandidateData::Algorithm::kSupernova)
.value("kHSIEventToTriggerCandidate", TriggerCandidateData::Algorithm::kHSIEventToTriggerCandidate)
Expand All @@ -86,44 +107,25 @@ register_trigger_candidate(py::module& m)
.value("kDBSCAN", TriggerCandidateData::Algorithm::kDBSCAN)
.value("kChannelDistance", TriggerCandidateData::Algorithm::kChannelDistance)
.value("kBundle", TriggerCandidateData::Algorithm::kBundle)
.value("kChannelAdjacency", TriggerCandidateData::Algorithm::kChannelAdjacency)
.export_values();

py::class_<TriggerCandidateData>(m, "TriggerCandidateData", py::buffer_protocol())
.def(py::init())
.def(py::init([](py::capsule capsule) {
auto tp = *static_cast<TriggerCandidateData*>(capsule.get_pointer());
return tp;
} ))
.def(py::init([](py::bytes bytes){
py::buffer_info info(py::buffer(bytes).request());
auto tp = *static_cast<TriggerCandidateData*>(info.ptr);
return tp;
}))
.def_property_readonly("version", [](TriggerCandidateData& self) -> uint16_t {return self.version;})
.def_property_readonly("time_start", [](TriggerCandidateData& self) -> uint64_t {return self.time_start;})
.def_property_readonly("time_end", [](TriggerCandidateData& self) -> uint64_t {return self.time_end;})
.def_property_readonly("time_candidate", [](TriggerCandidateData& self) -> uint64_t {return self.time_candidate;})
.def_property_readonly("detid", [](TriggerCandidateData& self) -> uint16_t {return self.detid;})
.def_property_readonly("type", [](TriggerCandidateData& self) -> TriggerCandidateData::Type {return self.type;})
.def_property_readonly("algorithm", [](TriggerCandidateData& self) -> TriggerCandidateData::Algorithm {return self.algorithm;})
.def_static("sizeof", [](){ return sizeof(TriggerCandidateData); })
;

.value("kChannelAdjacency", TriggerCandidateData::Algorithm::kChannelAdjacency);

py::class_<TriggerCandidate>(m, "TriggerCandidateOverlay", py::buffer_protocol())
.def(py::init())
.def(py::init([](py::capsule capsule) {
auto tp = *static_cast<TriggerCandidate*>(capsule.get_pointer());
return tp;
} ))
.def_property_readonly("data", [](TriggerCandidate& self) -> TriggerCandidateData& {return self.data;})
.def("__len__", [](TriggerCandidate& self){ return self.n_inputs; })
.def("sizeof", [](TriggerCandidate& self){ return sizeof(TriggerCandidate)+self.n_inputs*sizeof(TriggerPrimitive); })
.def("sizeof", [](TriggerCandidate& self){ return sizeof(TriggerCandidate)+self.n_inputs*sizeof(TriggerActivityData); })
;


py::class_<TriggerCandidateHolder>(m, "TriggerCandidate", py::buffer_protocol())
.def(py::init([](py::capsule capsule) {
auto tc_ptr = static_cast<TriggerCandidate*>(capsule.get_pointer());
TriggerCandidateHolder tch(tc_ptr, sizeof(TriggerCandidate)+tc_ptr->n_inputs*sizeof(TriggerActivityData));
return tch;
}))
.def(py::init([](py::bytes bytes){
py::buffer_info info(py::buffer(bytes).request());

Expand Down
27 changes: 13 additions & 14 deletions pybindsrc/trigger_primitive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,8 @@ register_trigger_primitive(py::module& m)
{


py::enum_<TriggerPrimitive::Type>(m, "TriggerPrimitive::Type")
.value("kUnknown", TriggerPrimitive::Type::kUnknown)
.value("kTPC", TriggerPrimitive::Type::kTPC)
.value("kPDS", TriggerPrimitive::Type::kPDS)
.export_values();

py::enum_<TriggerPrimitive::Algorithm>(m, "TriggerPrimitive::Algorithm")
.value("kUnknown", TriggerPrimitive::Algorithm::kUnknown)
.value("kSimpleThreshold", TriggerPrimitive::Algorithm::kSimpleThreshold)
.value("kAbsRunningSum", TriggerPrimitive::Algorithm::kAbsRunningSum)
.value("kRunningSum", TriggerPrimitive::Algorithm::kRunningSum)
.export_values();

py::class_<TriggerPrimitive>(m, "TriggerPrimitive", py::buffer_protocol())
py::class_<TriggerPrimitive> trigger_primitive(m, "TriggerPrimitive", py::buffer_protocol());
trigger_primitive
.def(py::init())
.def(py::init([](py::capsule capsule) {
auto tp = *static_cast<TriggerPrimitive*>(capsule.get_pointer());
Expand All @@ -53,6 +41,17 @@ register_trigger_primitive(py::module& m)
.def_static("sizeof", [](){ return sizeof(TriggerPrimitive); })
;

py::enum_<TriggerPrimitive::Type>(trigger_primitive, "Type")
.value("kUnknown", TriggerPrimitive::Type::kUnknown)
.value("kTPC", TriggerPrimitive::Type::kTPC)
.value("kPDS", TriggerPrimitive::Type::kPDS);

py::enum_<TriggerPrimitive::Algorithm>(trigger_primitive, "Algorithm")
.value("kUnknown", TriggerPrimitive::Algorithm::kUnknown)
.value("kSimpleThreshold", TriggerPrimitive::Algorithm::kSimpleThreshold)
.value("kAbsRunningSum", TriggerPrimitive::Algorithm::kAbsRunningSum)
.value("kRunningSum", TriggerPrimitive::Algorithm::kRunningSum);

}

} // namespace dunedaq::trgdataformats::python
Loading