cms-sw · dildick · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021 · Apr 20, 2021
diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCAnodeLCTProcessor.h
@@ -54,9 +54,6 @@ class CSCAnodeLCTProcessor : public CSCBaseboard {
                        unsigned chamber,
                        const edm::ParameterSet& conf);
 
-  /** Default constructor. Used for testing. */
-  CSCAnodeLCTProcessor();
-
   /** Default destructor. */
   ~CSCAnodeLCTProcessor() override = default;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCCathodeLCTProcessor.h
@@ -51,9 +51,6 @@ class CSCCathodeLCTProcessor : public CSCBaseboard {
                          unsigned chamber,
                          const edm::ParameterSet& conf);
 
-  /** Default constructor. Used for testing. */
-  CSCCathodeLCTProcessor();
-
   /** Default destructor. */
   ~CSCCathodeLCTProcessor() override = default;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboard.h
@@ -38,9 +38,6 @@ class CSCGEMMotherboard : public CSCUpgradeMotherboard {
                     unsigned chamber,
                     const edm::ParameterSet& conf);
 
-  //Default constructor for testing
-  CSCGEMMotherboard();
-
   ~CSCGEMMotherboard() override;
 
   // clear stored pads and copads

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME11.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME11.h
@@ -23,9 +23,6 @@ class CSCGEMMotherboardME11 : public CSCGEMMotherboard {
                         unsigned chamber,
                         const edm::ParameterSet& conf);
 
-  /** Constructor for use during testing. */
-  CSCGEMMotherboardME11();
-
   /** Default destructor. */
   ~CSCGEMMotherboardME11() override;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME21.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCGEMMotherboardME21.h
@@ -23,9 +23,6 @@ class CSCGEMMotherboardME21 : public CSCGEMMotherboard {
                         unsigned chamber,
                         const edm::ParameterSet& conf);
 
-  /** Test destructor. */
-  CSCGEMMotherboardME21();
-
   /** Default destructor. */
   ~CSCGEMMotherboardME21() override;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboard.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboard.h
@@ -49,9 +49,6 @@ class CSCMotherboard : public CSCBaseboard {
                  unsigned chamber,
                  const edm::ParameterSet& conf);
 
-  /** Constructor for use during testing. */
-  CSCMotherboard();
-
   /** Default destructor. */
   ~CSCMotherboard() override = default;
 
@@ -116,10 +113,6 @@ class CSCMotherboard : public CSCBaseboard {
   /** Phase2: whether to readout only the earliest two LCTs in readout window */
   bool readout_earliest_2;
 
-  /** if true: use regular CLCT-to-ALCT matching in TMB
-      if false: do ALCT-to-CLCT matching */
-  bool clct_to_alct;
-
   // encode special bits for high-multiplicity triggers
   unsigned showerSource_;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboardME11.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCMotherboardME11.h
@@ -25,9 +25,6 @@ class CSCMotherboardME11 : public CSCUpgradeMotherboard {
                      unsigned chamber,
                      const edm::ParameterSet& conf);
 
-  /** Constructor for use during testing. */
-  CSCMotherboardME11();
-
   /** Default destructor. */
   ~CSCMotherboardME11() override;
 

diff --git a/L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboard.h b/L1Trigger/CSCTriggerPrimitives/interface/CSCUpgradeMotherboard.h
@@ -42,9 +42,6 @@ class CSCUpgradeMotherboard : public CSCMotherboard {
                         unsigned chamber,
                         const edm::ParameterSet& conf);
 
-  //Default constructor for testing
-  CSCUpgradeMotherboard();
-
   ~CSCUpgradeMotherboard() override;
 
   // Empty the LCT container

diff --git a/L1Trigger/CSCTriggerPrimitives/python/CSCTriggerPrimitivesReader_cfi.py b/L1Trigger/CSCTriggerPrimitives/python/CSCTriggerPrimitivesReader_cfi.py
@@ -4,7 +4,7 @@
 
 # Default parameters for CSCTriggerPrimitives analyzer
 # =====================================================
-lctreader = cms.EDAnalyzer("CSCTriggerPrimitivesReader",
+cscTriggerPrimitivesReader = cms.EDAnalyzer("CSCTriggerPrimitivesReader",
     # Parameters common for all boards
     commonParam = cscTriggerPrimitiveDigis.commonParam,
     # Switch on/off the verbosity and turn on/off histogram production

diff --git a/L1Trigger/CSCTriggerPrimitives/python/params/tmbParams.py b/L1Trigger/CSCTriggerPrimitives/python/params/tmbParams.py
@@ -26,13 +26,6 @@
     # to ALCTs in this BX, and not use them in the following BX
     tmbDropUsedClcts = cms.bool(False),
 
-    # Switch to enable
-    #  True = CLCT-centric matching (default non-upgrade behavior,
-    #         take CLCTs in BX look for matching ALCTs in window)
-        #  False = ALCT-centric matching (recommended for Phase-2,
-    #         take ALCTs in BX look for matching CLCTs in window)
-    clctToAlct = cms.bool(False),
-
     ## bits for high-multiplicity triggers
     useHighMultiplicityBits = cms.bool(False),
 )

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCAnodeLCTProcessor.cc
@@ -90,30 +90,6 @@ CSCAnodeLCTProcessor::CSCAnodeLCTProcessor(unsigned endcap,
   showerMaxOutTBin_ = shower.getParameter<unsigned>("showerMaxOutTBin");
 }
 
-CSCAnodeLCTProcessor::CSCAnodeLCTProcessor() : CSCBaseboard() {
-  // Used for debugging. -JM
-  static std::atomic<bool> config_dumped{false};
-
-  // ALCT parameters.
-  setDefaultConfigParameters();
-  infoV = 2;
-
-  early_tbins = 4;
-
-  // Check and print configuration parameters.
-  checkConfigParameters();
-  if (!config_dumped) {
-    dumpConfigParams();
-    config_dumped = true;
-  }
-
-  numWireGroups = CSCConstants::MAX_NUM_WIRES;
-  MESelection = (theStation < 3) ? 0 : 1;
-
-  // Load pattern mask.
-  loadPatternMask();
-}
-
 void CSCAnodeLCTProcessor::loadPatternMask() {
   // Load appropriate pattern mask.
   if (narrow_mask_r1 && (theRing == 1 || theRing == 4)) {

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCCathodeLCTProcessor.cc
@@ -111,37 +111,6 @@ CSCCathodeLCTProcessor::CSCCathodeLCTProcessor(unsigned endcap,
   qualityControl_ = std::make_unique<LCTQualityControl>(endcap, station, sector, subsector, chamber, conf);
 }
 
-CSCCathodeLCTProcessor::CSCCathodeLCTProcessor() : CSCBaseboard() {
-  // constructor for debugging.
-  static std::atomic<bool> config_dumped{false};
-
-  // CLCT configuration parameters.
-  setDefaultConfigParameters();
-  infoV = 2;
-
-  early_tbins = 4;
-
-  start_bx_shift = 0;
-
-  // Check and print configuration parameters.
-  checkConfigParameters();
-  if (!config_dumped) {
-    dumpConfigParams();
-    config_dumped = true;
-  }
-
-  numStrips_ = CSCConstants::MAX_NUM_STRIPS;
-  // Should be OK for all stations except ME1.
-  for (int i_layer = 0; i_layer < CSCConstants::NUM_LAYERS; i_layer++) {
-    if ((i_layer + 1) % 2 == 0)
-      stagger[i_layer] = 0;
-    else
-      stagger[i_layer] = 1;
-  }
-
-  thePreTriggerDigis.clear();
-}
-
 void CSCCathodeLCTProcessor::setDefaultConfigParameters() {
   // Set default values for configuration parameters.
   fifo_tbins = def_fifo_tbins;

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboard.cc
@@ -26,8 +26,6 @@ CSCGEMMotherboard::CSCGEMMotherboard(unsigned endcap,
                               : tmbParams_.getParameter<int>("maxDeltaPadL2Odd"));
 }
 
-CSCGEMMotherboard::CSCGEMMotherboard() : CSCUpgradeMotherboard() {}
-
 CSCGEMMotherboard::~CSCGEMMotherboard() {}
 
 void CSCGEMMotherboard::clear() {

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME11.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME11.cc
@@ -34,17 +34,6 @@ CSCGEMMotherboardME11::CSCGEMMotherboardME11(unsigned endcap,
   cscTmbLUT_ = std::make_unique<CSCMotherboardLUTME11>();
 }
 
-CSCGEMMotherboardME11::CSCGEMMotherboardME11() : CSCGEMMotherboard() {
-  // Constructor used only for testing.
-  if (!runPhase2_) {
-    edm::LogError("CSCGEMMotherboardME11|SetupError") << "+++ TMB constructed while runPhase2 is not set! +++\n";
-  }
-
-  if (!runME11ILT_) {
-    edm::LogError("CSCGEMMotherboardME11|SetupError") << "+++ TMB constructed while runME11ILT_ is not set! +++\n";
-  }
-}
-
 CSCGEMMotherboardME11::~CSCGEMMotherboardME11() {}
 
 //===============================================

diff --git a/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.cc b/L1Trigger/CSCTriggerPrimitives/src/CSCGEMMotherboardME21.cc
@@ -25,16 +25,6 @@ CSCGEMMotherboardME21::CSCGEMMotherboardME21(unsigned endcap,
   tmbLUT_ = std::make_unique<CSCGEMMotherboardLUTME21>();
 }
 
-CSCGEMMotherboardME21::CSCGEMMotherboardME21() : CSCGEMMotherboard() {
-  if (!runPhase2_) {
-    edm::LogError("CSCGEMMotherboardME21|SetupError") << "+++ TMB constructed while runPhase2 is not set! +++\n";
-  }
-
-  if (!runME21ILT_) {
-    edm::LogError("CSCGEMMotherboardME21|SetupError") << "+++ TMB constructed while runME21ILT_ is not set! +++\n";
-  }
-}
-
 CSCGEMMotherboardME21::~CSCGEMMotherboardME21() {}
 
 void CSCGEMMotherboardME21::run(const CSCWireDigiCollection* wiredc,