added masks and removed commented out code from BarrelKalmanParams

cms-sw · Jul 27, 2021 · 063e451 · 063e451
1 parent e98cd9a
commit 063e451
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 56 deletions.
diff --git a/CondFormats/L1TObjects/interface/L1TMuonBarrelKalmanParams.h b/CondFormats/L1TObjects/interface/L1TMuonBarrelKalmanParams.h
@@ -15,6 +15,7 @@
 #include <vector>
 
 #include "CondFormats/Serialization/interface/Serializable.h"
+#include "CondFormats/L1TObjects/interface/L1MuDTTFMasks.h"
 #include "CondFormats/L1TObjects/interface/LUT.h"
 
 class L1TMuonBarrelKalmanParams {
@@ -34,63 +35,11 @@ class L1TMuonBarrelKalmanParams {
     COND_SERIALIZABLE;
   };
 
-  // for future extention
-  // Kalman TF params as (statically) defined in file
-  // L1Trigger/L1TMuonBarrel/python/simKBmtfDigis_cfi.py
-  // -------
-  //enum {
-  //  initialK,
-  //  initialK2,
-  //  eLoss,
-  //  aPhi,
-  //  aPhiB,
-  //  aPhiBNLO,
-  //  bPhi,
-  //  bPhiB,
-  //  phiAt2,
-  //  etaLUT0,
-  //  etaLUT1,
-  //  //generic cuts
-  //  chiSquare,
-  //  chiSquareCutPattern,
-  //  chiSquareCutCurvMax,
-  //  chiSquareCut,
-  //  //vertex cuts
-  //  trackComp,
-  //  trackCompErr1,
-  //  trackCompErr2,
-  //  trackCompCutPattern,
-  //  trackCompCutCurvMax,
-  //  trackCompCut,
-  //  chiSquareCutTight,
-  //  //combos
-  //  combos4,
-  //  combos3,
-  //  combos2,
-  //  combos1,
-  //  //
-  //  useOfflineAlgo,
-  //  // Only for the offline algo -not in firmware -------------------- (possible use in phase2 ???)
-  //  mScatteringPhi,
-  //  mScatteringPhiB,
-  //  pointResolutionPhi,
-  //  pointResolutionPhiB,
-  //  pointResolutionPhiBH,
-  //  pointResolutionPhiBL,
-  //  pointResolutionVertex,
-  //  //
-  //  NUM_CONFIG_PARAMS //to check
-  //};
-
-  // THIS SECTION IS TO BE USED FOR HANDLING THE MASKS
-  // after initial integration with downstream code, a small update will change:
-  //L1MuDTTFMasks l1mudttfmasks;
-  // to this:
-  //L1MuDTTFMasks &      l1mudttfmasks(){return l1mudttfmasks_[0]; }
-
+  L1MuDTTFMasks l1mudttfmasks;
   unsigned version_;
-  std::vector<Node> pnodes_;
 
+  std::vector<Node> pnodes_;
+  std::vector<L1MuDTTFMasks> l1mudttfmasks_;
   COND_SERIALIZABLE;
 };
 #endif
diff --git a/CondFormats/L1TObjects/src/L1TMuonBarrelKalmanParams.cc b/CondFormats/L1TObjects/src/L1TMuonBarrelKalmanParams.cc
@@ -1,7 +1,8 @@
 #include "CondFormats/L1TObjects/interface/L1TMuonBarrelKalmanParams.h"
 
 L1TMuonBarrelKalmanParams::L1TMuonBarrelKalmanParams()
-    : pnodes_(NUM_BMTF_PARAM_NODES)  //, l1mudttfmasks_(1) // auto masking (future)
+  : pnodes_(NUM_BMTF_PARAM_NODES),
+    l1mudttfmasks_(1)
 {
   version_ = Version;
   pnodes_[CONFIG].type_ = "unspecified";