triggeralgs versioning

dunetrigger/CMakeLists.txt

@@ -1,7 +1,6 @@
 # basic source code CMakeLists.txt
 
 add_subdirectory(channelmaps)
-add_subdirectory(triggeralgs)
 add_subdirectory(TriggerSim)
 add_subdirectory(TriggerAna)
 

dunetrigger/TriggerAna/CMakeLists.txt

@@ -21,7 +21,8 @@ art_make(BASENAME_ONLY MODULE_LIBRARIES
   cetlib::cetlib
   cetlib_except::cetlib_except
   ROOT::Tree
-  triggeralgs_module
+  triggeralgs_v4_module
+  triggeralgs_v5_module
 )
 
 

dunetrigger/TriggerAna/TriggerAnaTree_module.cc → dunetrigger/TriggerAna/TriggerAnaTreeV4_module.cc

@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////
-// Class:       TriggerAnaTree
+// Class:       TriggerAnaTreeV4
 // Plugin Type: analyzer (Unknown Unknown)
-// File:        TriggerAnaTree_module.cc
+// File:        TriggerAnaTreeV4_module.cc
 //
 // Generated at Fri Aug 30 14:50:19 2024 by jierans using cetskelgen
 // from cetlib version 3.18.02.
@@ -37,26 +37,26 @@ using dunedaq::trgdataformats::TriggerCandidateData;
 using dunedaq::trgdataformats::TriggerPrimitive;
 
 namespace dunetrigger{
-  class TriggerAnaTree;
+  class TriggerAnaTreeV4;
 }
 
-class dunetrigger::TriggerAnaTree : public art::EDAnalyzer {
+class dunetrigger::TriggerAnaTreeV4 : public art::EDAnalyzer {
 public:
   typedef struct ChannelInfo {
     unsigned int rop_id;
     int view;
     unsigned int tpcset_id;
   } matching_info;
 
-  explicit TriggerAnaTree(fhicl::ParameterSet const &p);
+  explicit TriggerAnaTreeV4(fhicl::ParameterSet const &p);
   // The compiler-generated destructor is fine for non-base
   // classes without bare pointers or other resource use.
 
   // Plugins should not be copied or assigned.
-  TriggerAnaTree(TriggerAnaTree const &) = delete;
-  TriggerAnaTree(TriggerAnaTree &&) = delete;
-  TriggerAnaTree &operator=(TriggerAnaTree const &) = delete;
-  TriggerAnaTree &operator=(TriggerAnaTree &&) = delete;
+  TriggerAnaTreeV4(TriggerAnaTreeV4 const &) = delete;
+  TriggerAnaTreeV4(TriggerAnaTreeV4 &&) = delete;
+  TriggerAnaTreeV4 &operator=(TriggerAnaTreeV4 const &) = delete;
+  TriggerAnaTreeV4 &operator=(TriggerAnaTreeV4 &&) = delete;
 
   // Required functions.
   void beginJob() override;
@@ -115,7 +115,7 @@ class dunetrigger::TriggerAnaTree : public art::EDAnalyzer {
   int ide_trkId, ide_origTrkId;
 };
 
-dunetrigger::TriggerAnaTree::TriggerAnaTree(fhicl::ParameterSet const &p)
+dunetrigger::TriggerAnaTreeV4::TriggerAnaTreeV4(fhicl::ParameterSet const &p)
     : EDAnalyzer{p}, dump_tp(p.get<bool>("dump_tp")),
       dump_ta(p.get<bool>("dump_ta")), dump_tc(p.get<bool>("dump_tc")),
       dump_mctruths(p.get<bool>("dump_mctruths", true)),
@@ -126,7 +126,7 @@ dunetrigger::TriggerAnaTree::TriggerAnaTree(fhicl::ParameterSet const &p)
 // More initializers here.
 {}
 
-void dunetrigger::TriggerAnaTree::beginJob() {
+void dunetrigger::TriggerAnaTreeV4::beginJob() {
   if (dump_mctruths) {
     mctruth_tree = tfs->make<TTree>("mctruths", "mctruths");
     mctruth_tree->Branch("Event", &fEventID, "Event/i");
@@ -181,7 +181,7 @@ void dunetrigger::TriggerAnaTree::beginJob() {
   }
 }
 
-void dunetrigger::TriggerAnaTree::analyze(art::Event const &e) {
+void dunetrigger::TriggerAnaTreeV4::analyze(art::Event const &e) {
   fRun = e.run();
   fSubRun = e.subRun();
   fEventID = e.id().event();
@@ -359,7 +359,7 @@ void dunetrigger::TriggerAnaTree::analyze(art::Event const &e) {
   }
 }
 
-void dunetrigger::TriggerAnaTree::make_tp_tree_if_needed(std::string tag, bool assn) {
+void dunetrigger::TriggerAnaTreeV4::make_tp_tree_if_needed(std::string tag, bool assn) {
   std::string map_tag = "tp/" + tag;
   if (!tree_map.count(map_tag)) {
     art::TFileDirectory tp_dir =
@@ -395,7 +395,7 @@ void dunetrigger::TriggerAnaTree::make_tp_tree_if_needed(std::string tag, bool a
   }
 }
 
-void dunetrigger::TriggerAnaTree::make_ta_tree_if_needed(std::string tag, bool assn) {
+void dunetrigger::TriggerAnaTreeV4::make_ta_tree_if_needed(std::string tag, bool assn) {
   std::string map_tag = "ta/" + tag;
   if (!tree_map.count(map_tag)) {
     art::TFileDirectory ta_dir =
@@ -430,7 +430,7 @@ void dunetrigger::TriggerAnaTree::make_ta_tree_if_needed(std::string tag, bool a
   }
 }
 
-void dunetrigger::TriggerAnaTree::make_tc_tree_if_needed(std::string tag) {
+void dunetrigger::TriggerAnaTreeV4::make_tc_tree_if_needed(std::string tag) {
   std::string map_tag = "tc/" + tag;
   if (!tree_map.count(map_tag)) {
     art::TFileDirectory tc_dir =
@@ -456,7 +456,7 @@ void dunetrigger::TriggerAnaTree::make_tc_tree_if_needed(std::string tag) {
   }
 }
 
-dunetrigger::TriggerAnaTree::ChannelInfo dunetrigger::TriggerAnaTree::get_channel_info_for_channel(geo::WireReadoutGeom const *geom, int channel) {
+dunetrigger::TriggerAnaTreeV4::ChannelInfo dunetrigger::TriggerAnaTreeV4::get_channel_info_for_channel(geo::WireReadoutGeom const *geom, int channel) {
   readout::ROPID rop = geom->ChannelToROP(channel);
   ChannelInfo result;
   result.rop_id = rop.ROP;
@@ -465,4 +465,4 @@ dunetrigger::TriggerAnaTree::ChannelInfo dunetrigger::TriggerAnaTree::get_channe
   return result;
 }
 
-DEFINE_ART_MODULE(dunetrigger::TriggerAnaTree)
+DEFINE_ART_MODULE(dunetrigger::TriggerAnaTreeV4)