Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch5' into …

…use_namespaces_instead_of_templates
cms-L1TK · Aug 17, 2024 · 1a5e2c4 · 1a5e2c4
2 parents 9f6d612 + fb5c0ea
commit 1a5e2c4
Show file tree

Hide file tree

Showing 17 changed files with 118 additions and 138 deletions.
diff --git a/RecoTracker/LST/interface/LSTOutput.h b/RecoTracker/LST/interface/LSTOutput.h
@@ -7,17 +7,14 @@
 class LSTOutput {
 public:
   LSTOutput() = default;
-  LSTOutput(std::vector<std::vector<unsigned int>> const& hitIdx,
-            std::vector<unsigned int> const& len,
-            std::vector<int> const& seedIdx,
-            std::vector<short> const& trackCandidateType) {
-    hitIdx_ = std::move(hitIdx);
-    len_ = std::move(len);
-    seedIdx_ = std::move(seedIdx);
-    trackCandidateType_ = std::move(trackCandidateType);
-  }
-
-  ~LSTOutput() = default;
+  LSTOutput(std::vector<std::vector<unsigned int>> const hitIdx,
+            std::vector<unsigned int> const len,
+            std::vector<int> const seedIdx,
+            std::vector<short> const trackCandidateType)
+      : hitIdx_(std::move(hitIdx)),
+        len_(std::move(len)),
+        seedIdx_(std::move(seedIdx)),
+        trackCandidateType_(std::move(trackCandidateType)) {}
 
   enum LSTTCType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 };
 

diff --git a/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h b/RecoTracker/LST/interface/LSTPhase2OTHitsInput.h
@@ -9,19 +9,12 @@
 class LSTPhase2OTHitsInput {
 public:
   LSTPhase2OTHitsInput() = default;
-  LSTPhase2OTHitsInput(std::vector<unsigned int> const& detId,
-                       std::vector<float> const& x,
-                       std::vector<float> const& y,
-                       std::vector<float> const& z,
-                       std::vector<TrackingRecHit const*> const& hits) {
-    detId_ = std::move(detId);
-    x_ = std::move(x);
-    y_ = std::move(y);
-    z_ = std::move(z);
-    hits_ = std::move(hits);
-  }
-
-  ~LSTPhase2OTHitsInput() = default;
+  LSTPhase2OTHitsInput(std::vector<unsigned int> const detId,
+                       std::vector<float> const x,
+                       std::vector<float> const y,
+                       std::vector<float> const z,
+                       std::vector<TrackingRecHit const*> const hits)
+      : detId_(std::move(detId)), x_(std::move(x)), y_(std::move(y)), z_(std::move(z)), hits_(std::move(hits)) {}
 
   std::vector<unsigned int> const& detId() const { return detId_; }
   std::vector<float> const& x() const { return x_; }

diff --git a/RecoTracker/LST/interface/LSTPixelSeedInput.h b/RecoTracker/LST/interface/LSTPixelSeedInput.h
@@ -7,39 +7,36 @@
 class LSTPixelSeedInput {
 public:
   LSTPixelSeedInput() = default;
-  LSTPixelSeedInput(std::vector<float> const& px,
-                    std::vector<float> const& py,
-                    std::vector<float> const& pz,
-                    std::vector<float> const& dxy,
-                    std::vector<float> const& dz,
-                    std::vector<float> const& ptErr,
-                    std::vector<float> const& etaErr,
-                    std::vector<float> const& stateTrajGlbX,
-                    std::vector<float> const& stateTrajGlbY,
-                    std::vector<float> const& stateTrajGlbZ,
-                    std::vector<float> const& stateTrajGlbPx,
-                    std::vector<float> const& stateTrajGlbPy,
-                    std::vector<float> const& stateTrajGlbPz,
-                    std::vector<int> const& q,
-                    std::vector<std::vector<int>> const& hitIdx) {
-    px_ = std::move(px);
-    py_ = std::move(py);
-    pz_ = std::move(pz);
-    dxy_ = std::move(dxy);
-    dz_ = std::move(dz);
-    ptErr_ = std::move(ptErr);
-    etaErr_ = std::move(etaErr);
-    stateTrajGlbX_ = std::move(stateTrajGlbX);
-    stateTrajGlbY_ = std::move(stateTrajGlbY);
-    stateTrajGlbZ_ = std::move(stateTrajGlbZ);
-    stateTrajGlbPx_ = std::move(stateTrajGlbPx);
-    stateTrajGlbPy_ = std::move(stateTrajGlbPy);
-    stateTrajGlbPz_ = std::move(stateTrajGlbPz);
-    q_ = std::move(q);
-    hitIdx_ = std::move(hitIdx);
-  }
-
-  ~LSTPixelSeedInput() = default;
+  LSTPixelSeedInput(std::vector<float> const px,
+                    std::vector<float> const py,
+                    std::vector<float> const pz,
+                    std::vector<float> const dxy,
+                    std::vector<float> const dz,
+                    std::vector<float> const ptErr,
+                    std::vector<float> const etaErr,
+                    std::vector<float> const stateTrajGlbX,
+                    std::vector<float> const stateTrajGlbY,
+                    std::vector<float> const stateTrajGlbZ,
+                    std::vector<float> const stateTrajGlbPx,
+                    std::vector<float> const stateTrajGlbPy,
+                    std::vector<float> const stateTrajGlbPz,
+                    std::vector<int> const q,
+                    std::vector<std::vector<int>> const hitIdx)
+      : px_(std::move(px)),
+        py_(std::move(py)),
+        pz_(std::move(pz)),
+        dxy_(std::move(dxy)),
+        dz_(std::move(dz)),
+        ptErr_(std::move(ptErr)),
+        etaErr_(std::move(etaErr)),
+        stateTrajGlbX_(std::move(stateTrajGlbX)),
+        stateTrajGlbY_(std::move(stateTrajGlbY)),
+        stateTrajGlbZ_(std::move(stateTrajGlbZ)),
+        stateTrajGlbPx_(std::move(stateTrajGlbPx)),
+        stateTrajGlbPy_(std::move(stateTrajGlbPy)),
+        stateTrajGlbPz_(std::move(stateTrajGlbPz)),
+        q_(std::move(q)),
+        hitIdx_(std::move(hitIdx)) {}
 
   std::vector<float> const& px() const { return px_; }
   std::vector<float> const& py() const { return py_; }

diff --git a/RecoTracker/LSTCore/interface/EndcapGeometry.h b/RecoTracker/LSTCore/interface/EndcapGeometry.h
@@ -23,7 +23,6 @@ namespace lst {
 
     EndcapGeometry() = default;
     EndcapGeometry(std::string const& filename);
-    ~EndcapGeometry() = default;
 
     void load(std::string const&);
     void fillGeoMapArraysExplicit();

diff --git a/RecoTracker/LSTCore/interface/ModuleConnectionMap.h b/RecoTracker/LSTCore/interface/ModuleConnectionMap.h
@@ -16,7 +16,6 @@ namespace lst {
   public:
     ModuleConnectionMap();
     ModuleConnectionMap(std::string const& filename);
-    ~ModuleConnectionMap();
 
     void load(std::string const&);
     void add(std::string const&);

diff --git a/RecoTracker/LSTCore/interface/TiltedGeometry.h b/RecoTracker/LSTCore/interface/TiltedGeometry.h
@@ -18,7 +18,6 @@ namespace lst {
   public:
     TiltedGeometry() = default;
     TiltedGeometry(std::string const& filename);
-    ~TiltedGeometry() = default;
 
     void load(std::string const&);
 

diff --git a/RecoTracker/LSTCore/src/ModuleConnectionMap.cc b/RecoTracker/LSTCore/src/ModuleConnectionMap.cc
@@ -4,8 +4,6 @@ lst::ModuleConnectionMap::ModuleConnectionMap() {}
 
 lst::ModuleConnectionMap::ModuleConnectionMap(std::string const& filename) { load(filename); }
 
-lst::ModuleConnectionMap::~ModuleConnectionMap() {}
-
 void lst::ModuleConnectionMap::load(std::string const& filename) {
   moduleConnections_.clear();