Decouple response correction and gain correction parts

cms-sw · Sep 18, 2017 · 22ff2d4 · 22ff2d4
1 parent 20c6a4b
commit 22ff2d4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc b/Calibration/HcalCalibAlgos/plugins/HcalHBHEMuonAnalyzer.cc
@@ -180,7 +180,6 @@ HcalHBHEMuonAnalyzer::HcalHBHEMuonAnalyzer(const edm::ParameterSet& iConfig) : h
   fileInCorr_        = iConfig.getUntrackedParameter<std::string>("FileInCorr","");
   writeRespCorr_     = iConfig.getUntrackedParameter<bool>("WriteRespCorr",false);
 
-  if (getCharge_) unCorrect_ = true;
   mergedDepth_  = (!isItPreRecHit_) || (collapseDepth_);
   tok_trigRes_  = consumes<edm::TriggerResults>(HLTriggerResults_);
   tok_bs_       = consumes<reco::BeamSpot>(labelBS_);
@@ -563,18 +562,20 @@ void HcalHBHEMuonAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSet
 	      if (unCorrect_) {
 		double corr = (ignoreHECorr_ && (subdet0==HcalEndcap)) ? 1.0 : respCorr(DetId(hcid0));
 		if (corr != 0) {ene /= corr; chg /= corr;}
+#ifdef EDM_ML_DEBUG
+		edm::LogVerbatim("HBHEMuon") << hcid0 << " Corr " << corr
+					     << " E " << ene << ":" << enec;
+#endif
+	      }
+	      if (getCharge_) {
 		double gain(1.0);
-		if (getCharge_) {
-		  if (!(ignoreHECorr_ && (subdet0==HcalEndcap))) {
-		    gain  = gainFactor(conditions,hcid0);
-		    if (gain  != 0) chg  /= gain;
-		  }
+		if (!(ignoreHECorr_ && (subdet0==HcalEndcap))) {
+		  gain  = gainFactor(conditions,hcid0);
+		  if (gain  != 0) chg  /= gain;
 		}
 #ifdef EDM_ML_DEBUG
-		edm::LogVerbatim("HBHEMuon") << hcid0 << " Corr " << corr
-					     << " Gain " << gain << " E "
-					     << ene << ":" << enec << " C "
-					     << chg;
+		edm::LogVerbatim("HBHEMuon") << hcid0 << " Gain " << gain
+					     << " C " << chg;
 #endif
 	      }
 	      int depth  = ehdepth[i].second  - 1;

diff --git a/Calibration/HcalCalibAlgos/test/hcalHBHEMuon_cfg.py b/Calibration/HcalCalibAlgos/test/hcalHBHEMuon_cfg.py
@@ -3,13 +3,12 @@
 process = cms.Process("RaddamMuon")
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
-process.load("Configuration.Geometry.GeometryExtended2017Plan1_cff")
-process.load("Configuration.Geometry.GeometryExtended2017Plan1Reco_cff")
+process.load("Configuration.StandardSequences.GeometryDB_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")  
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("RecoJets.Configuration.CaloTowersES_cfi")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
-from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag=autoCond['run2_data']
+process.GlobalTag.globaltag='92X_dataRun2_Prompt_v5'
 
 process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi")
 process.load("Calibration.HcalCalibAlgos.hcalHBHEMuon_cfi")
@@ -30,14 +29,14 @@
 )
 
 process.hcalHBHEMuon.UseRaw = False
-process.hcalHBHEMuon.UnCorrect = True
+process.hcalHBHEMuon.UnCorrect = False
 process.hcalHBHEMuon.GetCharge = True
 process.hcalHBHEMuon.CollapseDepth = False
 process.hcalHBHEMuon.IsItPlan1 = True
 process.hcalHBHEMuon.IgnoreHECorr = False
 process.hcalHBHEMuon.IsItPreRecHit = True
 process.hcalHBHEMuon.MaxDepth = 7
 process.hcalHBHEMuon.LabelHBHERecHit = cms.InputTag("hbheprereco")
-process.hcalHBHEMuon.Verbosity = 1111
+process.hcalHBHEMuon.Verbosity = 0
 
 process.p = cms.Path(process.hcalHBHEMuon)