Merge pull request #16289 from goni/PADQMOffline_fixed_80X

[HIN Dilepton] pPb Run DQMOffline for 80X
cms-sw · Nov 10, 2016 · c607322 · c607322
2 parents 67d8798 + a0f98bd
commit c607322
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 11 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
@@ -30,15 +30,15 @@
                                        DQMMessageLogger )
 
 from DQMOffline.Muon.muonMonitors_cff import *
-diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin
-diMuonHistos.etaBBin = cms.int32(70)
-diMuonHistos.etaEBin = cms.int32(70)
-diMuonHistos.etaBinLM = cms.int32(12)
-diMuonHistos.etaBBinLM = cms.int32(12)
-diMuonHistos.etaEBinLM = cms.int32(12)
-diMuonHistos.LowMassMin = cms.double(2.0)
-diMuonHistos.LowMassMax = cms.double(14.0)
-diMuonHistos.HighMassMin = cms.double(55.0)
+diMuonHistos.etaBin = cms.int32(70) #dimuonhistograms mass, bin   
+diMuonHistos.etaBBin = cms.int32(70)    
+diMuonHistos.etaEBin = cms.int32(70)    
+diMuonHistos.etaBinLM = cms.int32(12)   
+diMuonHistos.etaBBinLM = cms.int32(12)    
+diMuonHistos.etaEBinLM = cms.int32(12)    
+diMuonHistos.LowMassMin = cms.double(2.0)   
+diMuonHistos.LowMassMax = cms.double(14.0)    
+diMuonHistos.HighMassMin = cms.double(55.0)   
 diMuonHistos.HighMassMax = cms.double(125.0)
 from DQMOffline.JetMET.jetMETDQMOfflineSourceHI_cff import *
 from DQMOffline.EGamma.egammaDQMOffline_cff import *
@@ -113,5 +113,4 @@
 liteDQMOfflineHeavyIons.remove( SiStripMonitorCluster )
 liteDQMOfflineHeavyIons.remove( jetMETDQMOfflineSource )
 
-
 #DQMOfflineHeavyIonsPhysics = cms.Sequence( dqmPhysics )
diff --git a/DQMOffline/Muon/python/diMuonHistograms_cfi.py b/DQMOffline/Muon/python/diMuonHistograms_cfi.py
@@ -25,3 +25,15 @@
                               HighMassMin = cms.double(55.0),
                               HighMassMax = cms.double(155.0)
                               )
+
+from Configuration.StandardSequences.Eras import eras
+eras.pA_2016.toModify(diMuonHistos,
+                      etaBin = 350,
+                      etaBBin = 350,
+                      etaEBin = 350,
+
+                      LowMassMin = 2.0,
+                      LowMassMax = 51.0,
+                      HighMassMin = 55.0,
+                      HighMassMax = 125.0
+                      )
diff --git a/DQMOffline/Trigger/interface/HLTMuonMatchAndPlot.h b/DQMOffline/Trigger/interface/HLTMuonMatchAndPlot.h
@@ -122,6 +122,8 @@ class HLTMuonMatchAndPlot
   StringCutObjectSelector<reco::Muon> targetMuonSelector_;
   double targetZ0Cut_; 
   double targetD0Cut_;
+  double targetptCutZ_;
+  double targetptCutJpsi_;
   StringCutObjectSelector<reco::Muon> probeMuonSelector_;
   double probeZ0Cut_; 
   double probeD0Cut_;

diff --git a/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py b/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py
@@ -74,3 +74,9 @@
     tightAnalyzer *
     looseAnalyzer
 )
+
+from Configuration.StandardSequences.Eras import eras
+for muAna in [globalAnalyzer.targetParams, trackerAnalyzer.targetParams, tightAnalyzer.targetParams, looseAnalyzer.targetParams]:
+    eras.pA_2016.toModify(muAna, ptCut_Jpsi = cms.untracked.double( 5.0))
+for muAna in [globalAnalyzer.binParams, trackerAnalyzer.binParams, tightAnalyzer.binParams, looseAnalyzer.binParams]:
+    eras.pA_2016.toModify(muAna, ptCoarse = cms.untracked.vdouble(0.,1.,2.,3.,4.,5.,7.,9.,12.,15.,20.,30.,40.))
diff --git a/DQMOffline/Trigger/src/HLTMuonMatchAndPlot.cc b/DQMOffline/Trigger/src/HLTMuonMatchAndPlot.cc
@@ -46,6 +46,8 @@ HLTMuonMatchAndPlot::HLTMuonMatchAndPlot(const ParameterSet & pset,
   targetMuonSelector_(targetParams_.getUntrackedParameter<string>("recoCuts", "")),
   targetZ0Cut_(targetParams_.getUntrackedParameter<double>("z0Cut",0.)),
   targetD0Cut_(targetParams_.getUntrackedParameter<double>("d0Cut",0.)),
+  targetptCutZ_(targetParams_.getUntrackedParameter<double>("ptCut_Z",20.)),
+  targetptCutJpsi_(targetParams_.getUntrackedParameter<double>("ptCut_Jpsi",20.)),
   probeMuonSelector_(probeParams_.getUntrackedParameter<string>("recoCuts", "")),
   probeZ0Cut_(probeParams_.getUntrackedParameter<double>("z0Cut",0.)),
   probeD0Cut_(probeParams_.getUntrackedParameter<double>("d0Cut",0.)),
@@ -281,11 +283,11 @@ void HLTMuonMatchAndPlot::analyze(Handle<MuonCollection>   & allMuons,
     if(matches[i] >= targetMuons.size()) continue;
     for (size_t k = 0; k < targetMuons.size(); k++) {
       if(k == i) continue;
-      if(muon.pt() < 20.0) continue;
       Muon & theProbe = targetMuons[k];
       if (muon.charge() != theProbe.charge() && !pairalreadyconsidered) {
         double mass = (muon.p4() + theProbe.p4()).M();
         if(mass > 60 && mass < 120) {
+          if(muon.pt() < targetptCutZ_) continue;
           hists_["massVsEtaZ_denom"]->Fill(theProbe.eta());
           hists_["massVsPtZ_denom"]->Fill(theProbe.pt());
           hists_["massVsVertexZ_denom"]->Fill(vertices->size());
@@ -297,6 +299,7 @@ void HLTMuonMatchAndPlot::analyze(Handle<MuonCollection>   & allMuons,
           pairalreadyconsidered = true;
         }
         if(mass > 1 && mass < 4) {
+          if(muon.pt() < targetptCutJpsi_) continue;
           hists_["massVsEtaJpsi_denom"]->Fill(theProbe.eta());
           hists_["massVsPtJpsi_denom"]->Fill(theProbe.pt());
           hists_["massVsVertexJpsi_denom"]->Fill(vertices->size());