Merge pull request #322 from michaelmackenzie/MinorEdits

AndrewEdmonds11 · web-flow · commit 32e637545eaa · 2025-12-09T06:35:19.000-08:00
Minor edits: Add a rooutil namespace and reduce some code duplication
diff --git a/rooutil/examples/CompareTrkQualTrainings.C b/rooutil/examples/CompareTrkQualTrainings.C
@@ -11,6 +11,8 @@
 #include "TLine.h"
 #include "TLatex.h"
 
+using namespace rooutil;
+
 void CompareTrkQualTrainings(std::string filename) {
 
   bool save_plots = false;
diff --git a/rooutil/examples/CreateNtuple.C b/rooutil/examples/CreateNtuple.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void CreateNtuple(std::string filename) {
 
   // Set up RooUtil
diff --git a/rooutil/examples/CreateTrackNtuple.C b/rooutil/examples/CreateTrackNtuple.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void CreateTrackNtuple(std::string filename) {
 
   // Create the TTree
diff --git a/rooutil/examples/PlotCRVPEs.C b/rooutil/examples/PlotCRVPEs.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotCRVPEs(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotCRVPEsVsMCEDep.C b/rooutil/examples/PlotCRVPEsVsMCEDep.C
@@ -8,6 +8,7 @@
 
 #include "TH2F.h"
 
+using namespace rooutil;
 void PlotCRVPEsVsMCEDep(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotCRVTotalPEs.C b/rooutil/examples/PlotCRVTotalPEs.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotCRVTotalPEs(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotCaloClusterEnergy.C b/rooutil/examples/PlotCaloClusterEnergy.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotCaloClusterEnergy(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceFitPars.C b/rooutil/examples/PlotEntranceFitPars.C
@@ -11,6 +11,7 @@
 #include "TEllipse.h"
 #include "TGaxis.h"
 
+using namespace rooutil;
 void PlotEntranceFitPars(std::string filename) {
 
   double xmin = -800;
diff --git a/rooutil/examples/PlotEntranceMomentum.C b/rooutil/examples/PlotEntranceMomentum.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotEntranceMomentum(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceMomentumCRVCut.C b/rooutil/examples/PlotEntranceMomentumCRVCut.C
@@ -9,6 +9,7 @@
 #include "TH1F.h"
 #include "TCanvas.h"
 
+using namespace rooutil;
 void PlotEntranceMomentumCRVCut(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceMomentumResolution.C b/rooutil/examples/PlotEntranceMomentumResolution.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotEntranceMomentumResolution(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceMomentumResolution_TrkQualCut.C b/rooutil/examples/PlotEntranceMomentumResolution_TrkQualCut.C
@@ -9,6 +9,7 @@
 #include "TH1F.h"
 #include "TCanvas.h"
 
+using namespace rooutil;
 void PlotEntranceMomentumResolution_TrkQualCut(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceMomentumTriggeredEvents.C b/rooutil/examples/PlotEntranceMomentumTriggeredEvents.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotEntranceMomentumTriggeredEvents(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEntranceMomentum_UpstreamDownstream.C b/rooutil/examples/PlotEntranceMomentum_UpstreamDownstream.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotEntranceMomentum_UpstreamDownstream(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotEoverP_TrkPIDCut.C b/rooutil/examples/PlotEoverP_TrkPIDCut.C
@@ -9,6 +9,7 @@
 #include "TH1F.h"
 #include "TCanvas.h"
 
+using namespace rooutil;
 void PlotEoverP_TrkPIDCut(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotGenCosmicMom.C b/rooutil/examples/PlotGenCosmicMom.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotGenCosmicMom(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotMCParentPosZ.C b/rooutil/examples/PlotMCParentPosZ.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotMCParentPosZ(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotMCParticleMom.C b/rooutil/examples/PlotMCParticleMom.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotMCParticleMom(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotMuonPosZ.C b/rooutil/examples/PlotMuonPosZ.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotMuonPosZ(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotStoppingTargetFoilSegments.C b/rooutil/examples/PlotStoppingTargetFoilSegments.C
@@ -9,6 +9,7 @@
 #include "TH1F.h"
 #include "TLegend.h"
 
+using namespace rooutil;
 void PlotStoppingTargetFoilSegments(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrackHitCalibs.C b/rooutil/examples/PlotTrackHitCalibs.C
@@ -8,6 +8,7 @@
 
 #include "TH2F.h"
 
+using namespace rooutil;
 void PlotTrackHitCalibs(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrackHitTimes.C b/rooutil/examples/PlotTrackHitTimes.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotTrackHitTimes(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrackHitTimesMC.C b/rooutil/examples/PlotTrackHitTimesMC.C
@@ -10,6 +10,7 @@
 #include "TH2F.h"
 #include "TCanvas.h"
 
+using namespace rooutil;
 void PlotTrackHitTimesMC(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrackMaterials.C b/rooutil/examples/PlotTrackMaterials.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotTrackMaterials(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrackNHits_RecoVsTrue.C b/rooutil/examples/PlotTrackNHits_RecoVsTrue.C
@@ -8,6 +8,7 @@
 
 #include "TH2F.h"
 
+using namespace rooutil;
 void PlotTrackNHits_RecoVsTrue(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PlotTrkCaloHitEnergy.C b/rooutil/examples/PlotTrkCaloHitEnergy.C
@@ -8,6 +8,7 @@
 
 #include "TH1F.h"
 
+using namespace rooutil;
 void PlotTrkCaloHitEnergy(std::string filename) {
 
   // Create the histogram you want to fill
diff --git a/rooutil/examples/PrintEvents.C b/rooutil/examples/PrintEvents.C
@@ -6,6 +6,7 @@
 
 #include <iostream>
 
+using namespace rooutil;
 void PrintEvents(std::string filename) {
 
   RooUtil util(filename);
diff --git a/rooutil/examples/PrintEventsNoMC.C b/rooutil/examples/PrintEventsNoMC.C
@@ -3,6 +3,7 @@
 
 #include <iostream>
 
+using namespace rooutil;
 bool good_track(Track& track) {
   if (track.trk->fitcon > 1e-3 && is_e_minus(track)) {
     return true;
diff --git a/rooutil/examples/TimingTest.C b/rooutil/examples/TimingTest.C
@@ -7,6 +7,7 @@ using namespace std::chrono;
 #include "EventNtuple/rooutil/inc/RooUtil.hh"
 #include "EventNtuple/rooutil/inc/common_cuts.hh"
 
+using namespace rooutil;
 void TimingTest(std::string filename, bool log_output = false) {
 
   auto start_time = system_clock::now();
diff --git a/rooutil/examples/TrackCounting.C b/rooutil/examples/TrackCounting.C
@@ -3,6 +3,7 @@
 
 #include <iostream>
 
+using namespace rooutil;
 bool good_track(Track& track) {
   if (track.trk->fitcon > 1e-3) {
     return true;
diff --git a/rooutil/inc/CaloCluster.hh b/rooutil/inc/CaloCluster.hh
@@ -5,20 +5,21 @@
 #include "EventNtuple/inc/CaloClusterInfo.hh"
 #include "EventNtuple/inc/CaloHitInfo.hh"
 
-struct CaloCluster {
-  CaloCluster(mu2e::CaloClusterInfo* calocluster)
-    : calocluster(calocluster) {
+namespace rooutil {
+  struct CaloCluster {
+    CaloCluster(mu2e::CaloClusterInfo* calocluster)
+      : calocluster(calocluster) {
 
-  }
+    }
 
-  void Update(bool debug = false) {
-  }
+    void Update(bool debug = false) {
+    }
 
-  // Pointers to the data
-  mu2e::CaloClusterInfo* calocluster = nullptr;
-};
-
-typedef std::function<bool(CaloCluster&)> CaloClusterCut;
-typedef std::vector<CaloCluster> CaloClusters;
+    // Pointers to the data
+    mu2e::CaloClusterInfo* calocluster = nullptr;
+  };
 
+  typedef std::function<bool(CaloCluster&)> CaloClusterCut;
+  typedef std::vector<CaloCluster> CaloClusters;
+} // namespace rooutil
 #endif
diff --git a/rooutil/inc/CrvCoinc.hh b/rooutil/inc/CrvCoinc.hh
@@ -5,18 +5,19 @@
 #include "EventNtuple/inc/CrvHitInfoReco.hh"
 #include "EventNtuple/inc/CrvHitInfoMC.hh"
 
-struct CrvCoinc {
-  CrvCoinc(mu2e::CrvHitInfoReco* reco)
-    : reco(reco) {
+namespace rooutil {
+  struct CrvCoinc {
+    CrvCoinc(mu2e::CrvHitInfoReco* reco)
+      : reco(reco) {
 
-  }
+    }
 
-  // Pointers to the data
-  mu2e::CrvHitInfoReco* reco = nullptr;
-  mu2e::CrvHitInfoMC* mc = nullptr;
-};
-
-typedef std::function<bool(CrvCoinc&)> CrvCoincCut;
-typedef std::vector<CrvCoinc> CrvCoincs;
+    // Pointers to the data
+    mu2e::CrvHitInfoReco* reco = nullptr;
+    mu2e::CrvHitInfoMC* mc = nullptr;
+  };
 
+  typedef std::function<bool(CrvCoinc&)> CrvCoincCut;
+  typedef std::vector<CrvCoinc> CrvCoincs;
+} // namespace rooutil
 #endif
diff --git a/rooutil/inc/Event.hh b/rooutil/inc/Event.hh
diff --git a/rooutil/inc/MCParticle.hh b/rooutil/inc/MCParticle.hh
diff --git a/rooutil/inc/RooUtil.hh b/rooutil/inc/RooUtil.hh
diff --git a/rooutil/inc/Track.hh b/rooutil/inc/Track.hh
diff --git a/rooutil/inc/TrackHit.hh b/rooutil/inc/TrackHit.hh
diff --git a/rooutil/inc/TrackSegment.hh b/rooutil/inc/TrackSegment.hh
diff --git a/rooutil/inc/common_cuts.hh b/rooutil/inc/common_cuts.hh
diff --git a/rooutil/inc/cutflow.hh b/rooutil/inc/cutflow.hh
