Clang Tidy on tracking (#1821)

Author: tvami

Ecal/src/Ecal/EcalHelper.cxx

@@ -20,23 +20,23 @@ std::vector<float> trackProp(const ldmx::Tracks &tracks,
     ldmx::Track::TrackState &ecal_track_state = trk_ts.value();
 
     // Check that the track state is filled
-    if (ecal_track_state.params.size() < 5) continue;
+    if (ecal_track_state.params_.size() < 5) continue;
 
-    float track_state_loc0 = static_cast<float>(ecal_track_state.params[0]);
-    float track_state_loc1 = static_cast<float>(ecal_track_state.params[1]);
+    float track_state_loc0 = static_cast<float>(ecal_track_state.params_[0]);
+    float track_state_loc1 = static_cast<float>(ecal_track_state.params_[1]);
     // param 2 = phi (azimuthal), param 3 = theta (polar)
     // param 4 = QoP
     // ACTS (local)  to  LDMX (global) coordinates: (y_,z_,x_)->  (x_,y_,z_)
     // convert qop [1/GeV] to p [MeV]
-    float p_track_state = (-1 / ecal_track_state.params[4]) * 1000;
+    float p_track_state = (-1 / ecal_track_state.params_[4]) * 1000;
     // p * sin(theta) * sin(phi)
-    float recoil_mom_x = p_track_state * sin(ecal_track_state.params[3]) *
-                         sin(ecal_track_state.params[2]);
+    float recoil_mom_x = p_track_state * sin(ecal_track_state.params_[3]) *
+                         sin(ecal_track_state.params_[2]);
     // p * cos(theta)
-    float recoil_mom_y = p_track_state * cos(ecal_track_state.params[3]);
+    float recoil_mom_y = p_track_state * cos(ecal_track_state.params_[3]);
     // p * sin(theta) * cos(phi)
-    float recoil_mom_z = p_track_state * sin(ecal_track_state.params[3]) *
-                         cos(ecal_track_state.params[2]);
+    float recoil_mom_z = p_track_state * sin(ecal_track_state.params_[3]) *
+                         cos(ecal_track_state.params_[2]);
 
     // Store the new track state variables
     new_track_states.push_back(track_state_loc0);
@@ -83,4 +83,4 @@ float distPtToLine(ROOT::Math::XYZVector h1, ROOT::Math::XYZVector p1,
   return ((h1 - p1).Cross(h1 - p2)).R() / (p1 - p2).R();
 }
 
-}  // namespace ecal
+}  // namespace ecal

Hcal/src/Hcal/HcalVetoProcessor.cxx

@@ -214,24 +214,24 @@ std::vector<float> HcalVetoProcessor::trackProp(const ldmx::Tracks &tracks,
     ldmx::Track::TrackState &hcal_track_state = trk_ts.value();
 
     // Check that the track state is filled
-    if (hcal_track_state.params.size() < 5) continue;
+    if (hcal_track_state.params_.size() < 5) continue;
 
-    float track_state_loc0 = static_cast<float>(hcal_track_state.params[0]);
-    float track_state_loc1 = static_cast<float>(hcal_track_state.params[1]);
+    float track_state_loc0 = static_cast<float>(hcal_track_state.params_[0]);
+    float track_state_loc1 = static_cast<float>(hcal_track_state.params_[1]);
 
     // param 2 = phi (azimuthal), param 3 = theta (polar)
     // param 4 = QoP
     // ACTS (local)  to  LDMX (global) coordinates: (y_,z_,x_)->  (x_,y_,z_)
     // convert qop [1/GeV] to p [MeV]
-    double p_track_state = (-1 / hcal_track_state.params[4]) * 1000;
+    double p_track_state = (-1 / hcal_track_state.params_[4]) * 1000;
     // p * sin(theta) * sin(phi)
-    double recoil_mom_x = p_track_state * sin(hcal_track_state.params[3]) *
-                          sin(hcal_track_state.params[2]);
+    double recoil_mom_x = p_track_state * sin(hcal_track_state.params_[3]) *
+                          sin(hcal_track_state.params_[2]);
     // p * cos(theta)
-    double recoil_mom_y = p_track_state * cos(hcal_track_state.params[3]);
+    double recoil_mom_y = p_track_state * cos(hcal_track_state.params_[3]);
     // p * sin(theta) * cos(phi)
-    double recoil_mom_z = p_track_state * sin(hcal_track_state.params[3]) *
-                          cos(hcal_track_state.params[2]);
+    double recoil_mom_z = p_track_state * sin(hcal_track_state.params_[3]) *
+                          cos(hcal_track_state.params_[2]);
 
     // Store the new track state variables
     new_track_states.push_back(track_state_loc0);

Tracking/include/Tracking/Digitization/CDFSiSensorSim.h

@@ -36,9 +36,9 @@ class CDFSiSensorSim {
   */
 
  private:
-  std::map<ChargeCarrier, Acts::Vector3> _drift_direction;
-  std::map<ChargeCarrier, SiElectrodeDataCollection> _sense_data;
-  std::map<ChargeCarrier, SiElectrodeDataCollection> _readout_data;
+  std::map<ChargeCarrier, Acts::Vector3> drift_direction_;
+  std::map<ChargeCarrier, SiElectrodeDataCollection> sense_data_;
+  std::map<ChargeCarrier, SiElectrodeDataCollection> readout_data_;
 
   // Simple simulation of charge trapping, this is a temporary kludge.
   // Charge collection efficiency with linear drift distance dependence.

Tracking/include/Tracking/Digitization/ChargeCarrier.h

@@ -22,8 +22,8 @@ class ChargeCarrier {
     mu_0_exponent_ = mu_0_exponent;
     mu_min_factor_ = mu_min_factor;
     mu_min_exponent_ = mu_min_exponent;
-    N_ref_factor_ = N_ref_factor;
-    N_ref_exponent_ = N_ref_exponent;
+    n_ref_factor_ = N_ref_factor;
+    n_ref_exponent_ = N_ref_exponent;
     alpha_factor_ = alpha_factor;
     alpha_exponent_ = alpha_exponent;
   }
@@ -41,22 +41,22 @@ class ChargeCarrier {
   double mu_0_exponent_;
   double mu_min_factor_;
   double mu_min_exponent_;
-  double N_ref_factor_;
-  double N_ref_exponent_;
+  double n_ref_factor_;
+  double n_ref_exponent_;
   double alpha_factor_;
   double alpha_exponent_;
 };
 
-static const ChargeCarrier electron(-1, 1268.0, -2.33, 92.0, -0.57, 1.3E+17,
+static const ChargeCarrier ELECTRON(-1, 1268.0, -2.33, 92.0, -0.57, 1.3E+17,
                                     2.4, 0.91, -0.146);
-static const ChargeCarrier hole(1, 406.9, -2.23, 54.3, -0.57, 2.35E+17, 2.4,
+static const ChargeCarrier HOLE(1, 406.9, -2.23, 54.3, -0.57, 2.35E+17, 2.4,
                                 0.88, -0.146);
 
 static ChargeCarrier getCarrier(int charge) {
   if (charge == -1)
-    return electron;
+    return ELECTRON;
   else if (charge == 1)
-    return hole;
+    return HOLE;
   else
     throw std::invalid_argument("No ChargeCarrier for charge specified");
 }

Tracking/include/Tracking/Digitization/SiElectrodeDataCollection.h

@@ -34,7 +34,7 @@ class SiElectrodeDataCollection {
 
  private:
   std::map<int, SiElectrodeData> collection_;
-  std::string electrodePassName_;
+  std::string electrode_pass_name_;
 };
 
 }  // namespace digitization

Tracking/include/Tracking/Event/Track.h

@@ -56,10 +56,10 @@ class Track {
   // will be accessible when reading back the rootfile using for example the
   // monitoring code.
   struct TrackState {
-    double refX, refY, refZ;
-    std::vector<double> params;
-    std::vector<double> cov;
-    TrackStateType ts_type;
+    double ref_x_, ref_y_, ref_z_;
+    std::vector<double> params_;
+    std::vector<double> cov_;
+    TrackStateType ts_type_;
   };
 
   Track(){};
@@ -85,8 +85,8 @@ class Track {
   int getNhits() const { return n_hits_; }
 
   std::optional<TrackState> getTrackState(TrackStateType tstype) const {
-    for (auto ts : trackStates_)
-      if (ts.ts_type == tstype) return std::optional<TrackState>(ts);
+    for (auto ts : track_states_)
+      if (ts.ts_type_ == tstype) return std::optional<TrackState>(ts);
 
     return std::nullopt;
   }
@@ -109,11 +109,11 @@ class Track {
   void setTrackID(int trackid) { track_id_ = trackid; };
   int getTrackID() const { return track_id_; };
 
-  void setTruthProb(double truthProb) { truthProb_ = truthProb; };
-  double getTruthProb() const { return truthProb_; };
+  void setTruthProb(double truthProb) { truth_prob_ = truthProb; };
+  double getTruthProb() const { return truth_prob_; };
 
-  void setPdgID(int pdgID) { pdgID_ = pdgID; };
-  int getPdgID() const { return pdgID_; };
+  void setPdgID(int pdgID) { pdg_id_ = pdgID; };
+  int getPdgID() const { return pdg_id_; };
 
   // in units of e
   int q() const { return perigee_pars_[4] > 0 ? 1 : -1; }
@@ -202,10 +202,10 @@ class Track {
   double getT() const { return perigee_pars_[5]; };
 
   void addTrackState(const ldmx::Track::TrackState& ts) {
-    trackStates_.push_back(ts);
+    track_states_.push_back(ts);
   };
 
-  std::vector<TrackState> getTrackStates() const { return trackStates_; }
+  std::vector<TrackState> getTrackStates() const { return track_states_; }
 
  protected:
   int n_hits_{0};
@@ -261,13 +261,13 @@ class Track {
   int track_id_{-1};
 
   // Truth probability
-  double truthProb_{0.};
+  double truth_prob_{0.};
 
   // pdgID
-  int pdgID_{0};
+  int pdg_id_{0};
 
   // Track States
-  std::vector<TrackState> trackStates_;
+  std::vector<TrackState> track_states_;
 
   /// Class declaration needed by the ROOT dictionary.
   ClassDef(Track, 4);

Tracking/include/Tracking/Event/TruthTrack.h

@@ -92,11 +92,11 @@ class TruthTrack {
   void setTrackID(int trackid) { track_id_ = trackid; };
   int getTrackID() const { return track_id_; };
 
-  void setPdgID(int pdgID) { pdgID_ = pdgID; };
-  int getPdgID() const { return pdgID_; };
+  void setPdgID(int pdgID) { pdg_id_ = pdgID; };
+  int getPdgID() const { return pdg_id_; };
 
-  void setNhits(int nHits) { nHits_ = nHits; };
-  int getNhits() const { return nHits_; }
+  void setNhits(int nHits) { n_hits_ = nHits; };
+  int getNhits() const { return n_hits_; }
 
   // in units of e
   int q() const { return perigee_pars_[4] > 0 ? 1 : -1; }
@@ -164,13 +164,13 @@ class TruthTrack {
   std::vector<double> position_{0., 0., 0.};
 
   // N hits_
-  int nHits_{0};
+  int n_hits_{0};
 
   // ID of the matched particle in the SimParticles map
   int track_id_{-1};
 
   // pdgID
-  int pdgID_{0};
+  int pdg_id_{0};
 
   /// Class declaration needed by the ROOT dictionary.
   ClassDef(TruthTrack, 3);

Tracking/include/Tracking/Reco/ActsUtils.h

@@ -11,7 +11,7 @@ namespace tracking {
 namespace reco {
 namespace utils {
 
-Acts::Vector3 Ldmx2Acts(Acts::Vector3 ldmx_v);
+Acts::Vector3 ldmx2Acts(Acts::Vector3 ldmx_v);
 
 }
 }  // namespace reco

Tracking/include/Tracking/Reco/AlignmentTestProcessor.h

@@ -30,7 +30,7 @@ class AlignmentTestProcessor final : public TrackingGeometryUser {
   void produce(framework::Event& event) override;
 
  private:
-  std::unordered_map<unsigned int, Acts::Transform3> alignmentTransforms;
+  std::unordered_map<unsigned int, Acts::Transform3> alignment_transforms_;
 
   tracking::geo::GeometryContext test_gctx_;
   // The Trackers Tracking geometry

Tracking/include/Tracking/Reco/CKFProcessor.h

@@ -141,7 +141,7 @@ class CKFProcessor final : public TrackingGeometryUser {
   auto makeGeoIdSourceLinkMap(const geo::TrackersTrackingGeometry &tg,
                               const std::vector<ldmx::Measurement> &ldmxsps)
       -> std::unordered_multimap<Acts::GeometryIdentifier,
-                                 ActsExamples::IndexSourceLink>;
+                                 acts_examples::IndexSourceLink>;
 
   template <typename geometry_t, typename source_link_hash_t,
             typename source_link_equality_t>
@@ -165,8 +165,8 @@ class CKFProcessor final : public TrackingGeometryUser {
 
   bool debug_acts_{false};
 
-  std::shared_ptr<Acts::PlaneSurface> target_surface;
-  Acts::RotationMatrix3 surf_rotation;
+  std::shared_ptr<Acts::PlaneSurface> target_surface_;
+  Acts::RotationMatrix3 surf_rotation_;
   // Constant BField
   double bfield_{0};
   // Use constant bfield
@@ -176,14 +176,14 @@ class CKFProcessor final : public TrackingGeometryUser {
   bool remove_stereo_{false};
 
   // Use 2d measurements instead of 1D
-  bool use1Dmeasurements_{true};
+  bool use1_dmeasurements_{true};
 
   // Minimum number of hits on tracks
   int min_hits_{7};
 
   // Stepping size (in mm)
   double propagator_step_size_{200.};
-  int propagator_maxSteps_{1000};
+  int propagator_max_steps_{1000};
 
   // The extrapolation surface
   bool use_extrapolate_location_{true};
@@ -193,7 +193,7 @@ class CKFProcessor final : public TrackingGeometryUser {
   // The measurement collection to use for track reconstruction
   std::string measurement_collection_{"TaggerMeasurements"};
 
-  std::string simParticles_passName_;
+  std::string sim_particles_pass_name_;
   std::string sim_particles_event_passname_;
 
   // Outlier removal pvalue
@@ -239,7 +239,7 @@ class CKFProcessor final : public TrackingGeometryUser {
   };
 
   // Keep track on which system this processor is running on
-  bool taggerTracking_{true};
+  bool tagger_tracking_{true};
 
 };  // CKFProcessor