Merge pull request #12203 from goni/CMSSW_7_5_X_DQMfix

CMSSW_7_5_X_DQMfix for HI
cms-sw · Nov 10, 2015 · da65dca · da65dca
2 parents d66c207 + 36021e7
commit da65dca
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py b/DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
@@ -30,6 +30,19 @@
                                        DQMMessageLogger )
 
 from DQMOffline.Muon.muonMonitors_cff import *
+diMuonHistos.etaBin = cms.int32(70) # mass range & bin changed
+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 *
 from DQMOffline.Trigger.DQMOffline_Trigger_cff import *

diff --git a/DQMOffline/Muon/interface/DiMuonHistograms.h b/DQMOffline/Muon/interface/DiMuonHistograms.h
@@ -53,6 +53,9 @@ class DiMuonHistograms : public DQMEDAnalyzer {
   int etaBin;
   int etaBBin;
   int etaEBin;
+  int etaBinLM;
+  int etaBBinLM;
+  int etaEBinLM;
   int etaOvlpBin;
 
   //Defining relevant eta regions

diff --git a/DQMOffline/Muon/python/diMuonHistograms_cfi.py b/DQMOffline/Muon/python/diMuonHistograms_cfi.py
@@ -10,7 +10,11 @@
                               etaBin = cms.int32(400),
                               etaBBin = cms.int32(400),
                               etaEBin = cms.int32(200),
-
+
+                              etaBinLM = cms.int32(0),
+                              etaBBinLM = cms.int32(0),
+                              etaEBinLM = cms.int32(0),
+
                               etaBMin = cms.double(0.),
                               etaBMax = cms.double(1.1),
                               etaECMin = cms.double(0.9),

diff --git a/DQMOffline/Muon/src/DiMuonHistograms.cc b/DQMOffline/Muon/src/DiMuonHistograms.cc
@@ -43,7 +43,11 @@ DiMuonHistograms::DiMuonHistograms(const edm::ParameterSet& pSet){
   etaBin = parameters.getParameter<int>("etaBin");
   etaBBin = parameters.getParameter<int>("etaBBin");
   etaEBin = parameters.getParameter<int>("etaEBin");
-
+
+  etaBinLM = parameters.getParameter<int>("etaBinLM");
+  etaBBinLM = parameters.getParameter<int>("etaBBinLM");
+  etaEBinLM = parameters.getParameter<int>("etaEBinLM");
+
   etaBMin = parameters.getParameter<double>("etaBMin");
   etaBMax = parameters.getParameter<double>("etaBMax");
   etaECMin = parameters.getParameter<double>("etaECMin");
@@ -65,15 +69,22 @@ void DiMuonHistograms::bookHistograms(DQMStore::IBooker & ibooker,
   ibooker.cd();
   ibooker.setCurrentFolder("Muons/DiMuonHistograms");  
 
-  int nBin = 0;
+  int nBin = 0, nBinLM = 0;
   for (unsigned int iEtaRegion=0; iEtaRegion<3; iEtaRegion++){
     if (iEtaRegion==0) { EtaName = "";         nBin = etaBin;} 
     if (iEtaRegion==1) { EtaName = "_Barrel";  nBin = etaBBin;}
     if (iEtaRegion==2) { EtaName = "_EndCap";  nBin = etaEBin;}
 
-    GlbGlbMuon_LM.push_back(ibooker.book1D("GlbGlbMuon_LM"+EtaName,"InvMass_{GLB,GLB}"+EtaName,nBin, LowMassMin, LowMassMax));
-    TrkTrkMuon_LM.push_back(ibooker.book1D("TrkTrkMuon_LM"+EtaName,"InvMass_{TRK,TRK}"+EtaName,nBin, LowMassMin, LowMassMax));
-    StaTrkMuon_LM.push_back(ibooker.book1D("StaTrkMuon_LM"+EtaName,"InvMass_{STA,TRK}"+EtaName,nBin, LowMassMin, LowMassMax));
+    if (etaBinLM == 0) { nBinLM = nBin;} //for HeavyIons
+    else{
+    if (iEtaRegion==0) { EtaName = "";         nBinLM = etaBinLM;}
+    if (iEtaRegion==1) { EtaName = "_Barrel";  nBinLM = etaBBinLM;}
+    if (iEtaRegion==2) { EtaName = "_EndCap";  nBinLM = etaEBinLM;}
+    }
+
+    GlbGlbMuon_LM.push_back(ibooker.book1D("GlbGlbMuon_LM"+EtaName,"InvMass_{GLB,GLB}"+EtaName,nBinLM, LowMassMin, LowMassMax));
+    TrkTrkMuon_LM.push_back(ibooker.book1D("TrkTrkMuon_LM"+EtaName,"InvMass_{TRK,TRK}"+EtaName,nBinLM, LowMassMin, LowMassMax));
+    StaTrkMuon_LM.push_back(ibooker.book1D("StaTrkMuon_LM"+EtaName,"InvMass_{STA,TRK}"+EtaName,nBinLM, LowMassMin, LowMassMax));
 
     GlbGlbMuon_HM.push_back(ibooker.book1D("GlbGlbMuon_HM"+EtaName,"InvMass_{GLB,GLB}"+EtaName,nBin, HighMassMin, HighMassMax));
     TrkTrkMuon_HM.push_back(ibooker.book1D("TrkTrkMuon_HM"+EtaName,"InvMass_{TRK,TRK}"+EtaName,nBin, HighMassMin, HighMassMax));

diff --git a/Validation/RecoHI/python/muonValidationHeavyIons_cff.py b/Validation/RecoHI/python/muonValidationHeavyIons_cff.py
@@ -7,12 +7,12 @@
 cutsRecoTrkMuons = PhysicsTools.RecoAlgos.recoTrackSelector_cfi.recoTrackSelector.clone()
 cutsRecoTrkMuons.src = "hiGeneralTracks"
 cutsRecoTrkMuons.quality = []
-cutsRecoTrkMuons.ptMin = 2.0
+cutsRecoTrkMuons.ptMin = 0.0
 
 # pt-selection of tracking particles
 import PhysicsTools.RecoAlgos.trackingParticleSelector_cfi
 cutsTpMuons = PhysicsTools.RecoAlgos.trackingParticleSelector_cfi.trackingParticleSelector.clone()
-cutsTpMuons.ptMin = 2.0
+cutsTpMuons.ptMin = 0.0
 
 #----------------------------------------
 
@@ -69,10 +69,10 @@
 staUpdMuonTrackVMuonAssoc.label_tp_fake  = 'cutsTpMuons'
 
 #change pt max of track validator
-trkMuonTrackVTrackAssoc.maxpT = cms.double(200)
-glbMuonTrackVMuonAssoc.maxpT = cms.double(200)
-staMuonTrackVMuonAssoc.maxpT = cms.double(200)
-staUpdMuonTrackVMuonAssoc.maxpT = cms.double(200)
+trkMuonTrackVTrackAssoc.maxpT = cms.double(100)
+glbMuonTrackVMuonAssoc.maxpT = cms.double(100)
+staMuonTrackVMuonAssoc.maxpT = cms.double(100)
+staUpdMuonTrackVMuonAssoc.maxpT = cms.double(100)
 
 # Muon validation sequences
 hiMuonValidation_seq = cms.Sequence(