Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[HIN Dilepton] pPb Run DQMOffline for 80X #16289

Merged
merged 12 commits into from Nov 10, 2016
Merged

[HIN Dilepton] pPb Run DQMOffline for 80X #16289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f2fb93
cusomization and modification of DQMOffline for 2016 pPb run
goni-zz Oct 20, 2016
8ee5619
add customization function for pPb run
goni-zz Oct 28, 2016
b3a2ebf
add customization function for pPb run
goni-zz Oct 28, 2016
b77d320
add customization function for pPb run
goni-zz Oct 28, 2016
45f6e1e
add customization and modification of DQMOffline for 2016 pPb run
goni-zz Oct 31, 2016
c5719b5
rebase on #16394
goni-zz Nov 4, 2016
6d9bf98
rebase on #16394
goni-zz Nov 4, 2016
7ef6581
rebase on #16394
goni-zz Nov 4, 2016
ea904b2
same binwidth and mass range with 81X
goni-zz Nov 4, 2016
0ce976c
same binwidth and mass range with 81X
goni-zz Nov 4, 2016
f7f033f
removed modifications of binning and mass range
goni-zz Nov 5, 2016
a0f98bd
regression/change
goni-zz Nov 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions DQMOffline/Configuration/python/DQMOfflineHeavyIons_cff.py
View file
Open in desktop
Expand Up @@ -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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there an 81X PR with cleanup of this file?
Your currently pending PR
still has these modifications
https://github.com/cms-sw/cmssw/pull/16288/files#diff-59b63a7bb9dd6c9e55764b5600006fdbR34

BTW, as I mentioned in the other PR, if these are needed for HeavyIons scenario in general and should override what we have in the pp scenario defaults, then these edits have to stay here.

Copy link
Contributor Author

@goni-zz goni-zz Nov 4, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slava77 , yeah We know about that.
we would better delete the line in 81X later(maybe end of pPb run).
should I delete the lines in 81X, right now?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the nominal policy is for everything aiming for 80X to first have an equivalent in 81X

from DQMOffline.JetMET.jetMETDQMOfflineSourceHI_cff import *
from DQMOffline.EGamma.egammaDQMOffline_cff import *
Expand Down Expand Up @@ -113,5 +113,4 @@
liteDQMOfflineHeavyIons.remove( SiStripMonitorCluster )
liteDQMOfflineHeavyIons.remove( jetMETDQMOfflineSource )


#DQMOfflineHeavyIonsPhysics = cms.Sequence( dqmPhysics )
12 changes: 12 additions & 0 deletions DQMOffline/Muon/python/diMuonHistograms_cfi.py
View file
Open in desktop
Expand Up @@ -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
)
2 changes: 2 additions & 0 deletions DQMOffline/Trigger/interface/HLTMuonMatchAndPlot.h
View file
Open in desktop
Expand Up @@ -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_;
Expand Down
6 changes: 6 additions & 0 deletions DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py
View file
Open in desktop
Expand Up @@ -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.))
5 changes: 4 additions & 1 deletion DQMOffline/Trigger/src/HLTMuonMatchAndPlot.cc
View file
Open in desktop
Expand Up @@ -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.)),
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down