Clang tidy on Trigger, TrigScint, Tools, SimCore, Recon, Packing, Hcal, Ecal, DQM (#1827)

Author: tvami

DQM/include/DQM/VisiblesCutflow.h

@@ -26,7 +26,7 @@ class VisiblesCutflow : public framework::Analyzer {
   void analyze(const framework::Event& event) override;
 
  private:
-  std::unique_ptr<ldmx::Ort::ONNXRuntime> rt_;
+  std::unique_ptr<ldmx::ort::ONNXRuntime> rt_;
   double bdt_cut_val_{0.};
   std::string feature_list_name_;
 

DQM/src/DQM/EcalClusterAnalyzer.cxx

@@ -126,9 +126,9 @@ void EcalClusterAnalyzer::analyze(const framework::Event& event) {
         // for each contrib in this simhit
         const auto& contrib = it->getContrib(i);
         // get origin electron ID
-        ancestor = contrib.originID;
+        ancestor = contrib.origin_id_;
         // store energy from this contrib at index = origin electron ID
-        if (ancestor <= nbr_of_electrons) edep[ancestor] += contrib.edep;
+        if (ancestor <= nbr_of_electrons) edep[ancestor] += contrib.edep_;
         if (!tagged && i != 0 && prev_ancestor != ancestor) {
           // if origin electron ID does not match previous origin electron ID
           // this hit has contributions from several electrons, ie mixed case

DQM/src/DQM/EcalDigiVerifier.cxx

@@ -149,9 +149,9 @@ void EcalDigiVerifier::analyze(const framework::Event &event) {
                      num_mod_with_more_than_2hits);
 
   if (total_rec_energy > 6000.) {
-    setStorageHint(framework::hint_should_keep);
+    setStorageHint(framework::HINT_SHOULD_KEEP);
   } else {
-    setStorageHint(framework::hint_should_drop);
+    setStorageHint(framework::HINT_SHOULD_DROP);
   }
 
   return;

DQM/src/DQM/HCalRawDigi.cxx

@@ -35,7 +35,7 @@ void HCalRawDigi::analyze(const framework::Event& event) {
     for (unsigned int i_sample{0}; i_sample < digis.getNumSamplesPerDigi();
          i_sample++) {
       histograms_.fill("adc_by_channel_sample" + std::to_string(i_sample),
-                       i_digi, digi.at(i_sample).adc_t());
+                       i_digi, digi.at(i_sample).adcT());
     }
     i_digi++;
   }

DQM/src/DQM/HgcrocPulseTruthAnalyzer.cxx

@@ -28,7 +28,7 @@ void HgcrocPulseTruthAnalyzer::analyze(const framework::Event& event) {
         if (d.isADC()) {
           int sum_adc = 0;
           for (int i = 0; i < d.size(); i++) {
-            sum_adc += d.at(i).adc_t();
+            sum_adc += d.at(i).adcT();
           }
           histograms_.fill("vpeak_sumADC", vpeak, sum_adc);
         } else {

DQM/src/DQM/NtuplizeHgcrocDigiCollection.cxx

@@ -145,7 +145,7 @@ void NtuplizeHgcrocDigiCollection::analyze(const framework::Event& event) {
       tot_comp_ = d.at(i_sample_).isTOTComplete();
       tot_ = d.at(i_sample_).tot();
       toa_ = d.at(i_sample_).toa();
-      int adc_t = d.at(i_sample_).adc_t();
+      int adc_t = d.at(i_sample_).adcT();
       raw_adc_ = adc_t;
       adc_ = adc_t - pedestal_table.get(d.id(), 0);
       flat_tree_->Fill();

DQM/src/DQM/PhotoNuclearDQM.cxx

@@ -234,12 +234,12 @@ void PhotoNuclearDQM::analyze(const framework::Event &event) {
   }
 
   // Get the recoil electron
-  auto [trackID, recoil] = Analysis::getRecoil(particle_map);
+  auto [trackID, recoil] = analysis::getRecoil(particle_map);
   findRecoilProperties(recoil);
 
   // Use the recoil electron to retrieve the gamma that underwent a
   // photo-nuclear reaction.
-  auto pn_gamma{Analysis::getPNGamma(particle_map, recoil, 2500.)};
+  auto pn_gamma{analysis::getPNGamma(particle_map, recoil, 2500.)};
   if (pn_gamma == nullptr) {
     ldmx_log(warn) << "PN Daughter is lost, skipping";
     return;

DQM/src/DQM/SimObjects.cxx

@@ -198,9 +198,9 @@ void SimObjects::analyze(const framework::Event& event) {
       histograms_.fill(pt.name() + ".n_contribs", n_contribs);
       for (unsigned int i_contrib{0}; i_contrib < n_contribs; i_contrib++) {
         ldmx::SimCalorimeterHit::Contrib contrib{hit.getContrib(i_contrib)};
-        histograms_.fill(pt.name() + ".incidents", contrib.incidentID);
-        histograms_.fill(pt.name() + ".tracks", contrib.trackID);
-        histograms_.fill(pt.name() + ".pdg", contrib.pdgCode);
+        histograms_.fill(pt.name() + ".incidents", contrib.incident_id_);
+        histograms_.fill(pt.name() + ".tracks", contrib.track_id_);
+        histograms_.fill(pt.name() + ".pdg", contrib.pdg_code_);
       }
 
       histograms_.fill(pt.name() + ".edep", hit.getEdep());

DQM/src/DQM/VisiblesCutflow.cxx

@@ -22,7 +22,7 @@
 namespace dqm {
 
 void VisiblesCutflow::configure(framework::config::Parameters &parameters) {
-  rt_ = std::make_unique<ldmx::Ort::ONNXRuntime>(
+  rt_ = std::make_unique<ldmx::ort::ONNXRuntime>(
       parameters.get<std::string>("bdt_file"));
   feature_list_name_ = parameters.get<std::string>("feature_list_name");
   bdt_cut_val_ = parameters.get<double>("disc_cut");
@@ -367,7 +367,7 @@ void VisiblesCutflow::analyze(const framework::Event &event) {
   bdt_features.push_back(hcal_energy);
   bdt_features.push_back(r_mean_from_photon_track);
 
-  ldmx::Ort::FloatArrays inputs({bdt_features});
+  ldmx::ort::FloatArrays inputs({bdt_features});
   float pred =
       rt_->run({feature_list_name_}, inputs, {"probabilities"})[0].at(1);
 

Ecal/include/Ecal/EcalPnetVetoProcessor.h

@@ -73,7 +73,7 @@ class EcalPnetVetoProcessor : public framework::Producer {
 
   float disc_cut_ = -99;
   std::vector<std::vector<float>> data_;
-  std::unique_ptr<ldmx::Ort::ONNXRuntime> rt_;
+  std::unique_ptr<ldmx::ort::ONNXRuntime> rt_;
 
   /** Name of the collection which will containt the results. */
   std::string collection_name_{"EcalPnetVeto"};