[rechits] option to choose which CM noise TS to use for subtraction

CMS-HGCAL · Nov 11, 2018 · c68531a · c68531a
1 parent 9da7665
commit c68531a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/Reco/plugins/HGCalTBRecHitProducer.cc b/Reco/plugins/HGCalTBRecHitProducer.cc
@@ -17,6 +17,7 @@ HGCalTBRecHitProducer::HGCalTBRecHitProducer(const edm::ParameterSet& cfg) :
   m_expectedMaxTimeSample(cfg.getUntrackedParameter<int>("ExpectedMaxTimeSample", 3)),
   m_maxADCCut(cfg.getUntrackedParameter<double>("MaxADCCut", 15)),
   m_subtractCommonMode(cfg.getUntrackedParameter<bool>("subtractCommonMode", true)),
+  m_TSForCommonModeNoiseSubtraction(cfg.getUntrackedParameter<int>("TSForCommonModeNoiseSubtraction", -1)), //-1: use all TS
   m_preselectionMethod(cfg.getUntrackedParameter<std::string>("preselectionMethod", "TB2018"))
 {
   m_HGCalTBRawHitCollection = consumes<HGCalTBRawHitCollection>(cfg.getParameter<edm::InputTag>("InputCollection"));
@@ -124,30 +125,30 @@ void HGCalTBRecHitProducer::produce(edm::Event& event, const edm::EventSetup& iS
       }
     case 0 :
       for ( int it = 0; it < NUMBER_OF_TIME_SAMPLES; it++ ) {
-        subHG[it] = m_subtractCommonMode ? cmMap[iski].fullHG[it] : 0.;
-        subLG[it] = m_subtractCommonMode ? cmMap[iski].fullLG[it] : 0.;
+        subHG[it] = m_subtractCommonMode ? cmMap[iski].fullHG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
+        subLG[it] = m_subtractCommonMode ? cmMap[iski].fullLG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
       }
       break;
     case 2 :
       for ( int it = 0; it < NUMBER_OF_TIME_SAMPLES; it++ ) {
-        subHG[it] = m_subtractCommonMode ? cmMap[iski].halfHG[it] : 0.;
-        subLG[it] = m_subtractCommonMode ? cmMap[iski].halfLG[it] : 0.;
+        subHG[it] = m_subtractCommonMode ? cmMap[iski].halfHG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
+        subLG[it] = m_subtractCommonMode ? cmMap[iski].halfLG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
       }
       break;
     case 3 :
       for ( int it = 0; it < NUMBER_OF_TIME_SAMPLES; it++ ) {
-        subHG[it] = m_subtractCommonMode ? cmMap[iski].mouseBiteHG[it] : 0.;
-        subLG[it] = m_subtractCommonMode ? cmMap[iski].mouseBiteLG[it] : 0.;
+        subHG[it] = m_subtractCommonMode ? cmMap[iski].mouseBiteHG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
+        subLG[it] = m_subtractCommonMode ? cmMap[iski].mouseBiteLG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
       }
       break;
     case 4 : for ( int it = 0; it < NUMBER_OF_TIME_SAMPLES; it++ ) {
-        subHG[it] = m_subtractCommonMode ? cmMap[iski].outerHG[it] : 0.;
-        subLG[it] = m_subtractCommonMode ? cmMap[iski].outerLG[it] : 0.;
+        subHG[it] = m_subtractCommonMode ? cmMap[iski].outerHG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
+        subLG[it] = m_subtractCommonMode ? cmMap[iski].outerLG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
       }
       break;
     case 5 : for ( int it = 0; it < NUMBER_OF_TIME_SAMPLES; it++ ) {
-        subHG[it] = m_subtractCommonMode ? cmMap[iski].mergedHG[it] : 0.;
-        subLG[it] = m_subtractCommonMode ? cmMap[iski].mergedLG[it] : 0.;
+        subHG[it] = m_subtractCommonMode ? cmMap[iski].mergedHG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
+        subLG[it] = m_subtractCommonMode ? cmMap[iski].mergedLG[(m_TSForCommonModeNoiseSubtraction==-1) ? it : m_TSForCommonModeNoiseSubtraction] : 0.;
       }
       break;
     }

diff --git a/Reco/plugins/HGCalTBRecHitProducer.h b/Reco/plugins/HGCalTBRecHitProducer.h
@@ -47,6 +47,7 @@ class HGCalTBRecHitProducer : public edm::EDProducer
   double m_maxADCCut;
   bool m_useCalibration;
   bool m_subtractCommonMode;
+  int m_TSForCommonModeNoiseSubtraction;
 
   std::map<int, TH2F*> shapesLG;
   std::map<int, TH2F*> shapesHG;

diff --git a/runConfigurationsCERNOctober2018/hgcalRechits.py b/runConfigurationsCERNOctober2018/hgcalRechits.py
@@ -101,7 +101,8 @@
                                         calibrationPerChannel=cms.untracked.bool(True),
                                         ExpectedMaxTimeSample=cms.untracked.int32(options.ExpectedMaxTimesample),
                                         MaxADCCut=cms.untracked.double(15),
-                                        subtractCommonMode=cms.untracked.bool(False)
+                                        subtractCommonMode=cms.untracked.bool(True),
+                                        TSForCommonModeNoiseSubtraction=cms.untracked.int32(0)
 )