Fix clang errors (cms-sw#14)

* fixed clang error * directory for MC txt files
tomalin · May 13, 2020 · de9b0a8 · de9b0a8
1 parent 1abdff8
commit de9b0a8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/L1Trigger/TrackFindingTMTT/data/README b/L1Trigger/TrackFindingTMTT/data/README
@@ -0,0 +1 @@
+Add a symbolic link from here to the MCsamples/ directory that can be found in https://github.com/cms-data/L1Trigger-TrackFindingTMTT , where .txt files listing available MC samples can be found.
diff --git a/L1Trigger/TrackFindingTMTT/interface/Stub.h b/L1Trigger/TrackFindingTMTT/interface/Stub.h
@@ -183,12 +183,12 @@ namespace tmtt {
     float sigmaZ() const { return (barrel() ? sigmaPar() : 0.); }
     // Hit resolution perpendicular to strip. Measures phi.
     float sigmaPerp() const {
-      constexpr float f = sqrt(1. / 12);
+      static const float f = sqrt(1. / 12);
       return f * stripPitch_;
     }
     // Hit resolution parallel to strip. Measures r or z.
     float sigmaPar() const {
-      constexpr float f = sqrt(1. / 12.);
+      static const float f = sqrt(1. / 12.);
       return f * stripLength_;
     }
 

diff --git a/L1Trigger/TrackFindingTMTT/interface/TrackerModule.h b/L1Trigger/TrackFindingTMTT/interface/TrackerModule.h
@@ -84,12 +84,12 @@ namespace tmtt {
     float stripLength() const { return stripLength_; }
     // Hit resolution perpendicular to strip (or to longest pixel axis). Measures phi.
     float sigmaPerp() const {
-      constexpr float f = sqrt(1. / 12.);
+      static const float f = sqrt(1. / 12.);
       return f * stripPitch_;
     }
     // Hit resolution parallel to strip (or to longest pixel axis). Measures r or z.
     float sigmaPar() const {
-      constexpr float f = sqrt(1. / 12.);
+      static const float f = sqrt(1. / 12.);
       return f * stripLength_;
     }
     // Sensor pitch over separation.

diff --git a/L1Trigger/TrackFindingTMTT/src/KFParamsComb.cc b/L1Trigger/TrackFindingTMTT/src/KFParamsComb.cc
@@ -36,27 +36,20 @@ namespace tmtt {
     // Assumed track seed (from HT) uncertainty in transverse impact parameter.
 
     // Constants optimised by hand for TMTT algo.
-    const float inv2Rsigma2 = pow(0.0314 * invPtToInv2R, 2);
-    constexpr float phi0sigma2 = pow(0.0102, 2);
-    constexpr float z0sigma2 = pow(5.0, 2);
-    constexpr float tanLsigma2 = pow(0.5, 2);
-    constexpr float d0Sigma2 = pow(1.0, 2);
-    matC[INV2R][INV2R] = inv2Rsigma2;
-    matC[PHI0][PHI0] = phi0sigma2;
-    matC[Z0][Z0] = z0sigma2;
-    matC[T][T] = tanLsigma2;
+    const float inv2Rsigma    = 0.0314 * invPtToInv2R;
+    constexpr float phi0sigma = 0.0102;
+    constexpr float z0sigma   = 5.0;
+    constexpr float tanLsigma = 0.5;
+    constexpr float d0Sigma   = 1.0;
+    // (z0, tanL, d0) uncertainties could be smaller for Hybrid, if seeded in PS? -- To check!
+    // if (L1track3D.seedPS() > 0) z0sigma /= 4; ???
+    matC[INV2R][INV2R] = pow(inv2Rsigma, 2);
+    matC[PHI0][PHI0]   = pow(phi0sigma, 2);
+    matC[Z0][Z0]       = pow(z0sigma, 2);
+    matC[T][T]         = pow(tanLsigma, 2);
     if (nPar_ == 5) {
-      matC[D0][D0] = d0Sigma2;
+      matC[D0][D0]     = pow(d0Sigma, 2);
     }
-
-    //if (settings_->hybrid()) {
-    // N.B. (z0, tanL, d0) seed uncertainties could be smaller for hybrid, if seeded in PS? -- not tried
-    //if (l1track3D.seedPS() > 0) { // Tracklet seed used PS layers
-    //  matC[Z0][Z0] /= (4.*4.).;
-    //  matC[T][T] /= (4.*4.);
-    // }
-    //}
-
     return matC;
   }