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

Drop type specs for Muon and RecoB #36674

Merged
merged 2 commits into from Jan 12, 2022
Merged

Drop type specs for Muon and RecoB #36674

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b2e91
Drop type specs for Muon and RecoB
NiharSaha Jan 11, 2022
b585c7a
Update dqmCollector_cff.py
NiharSaha Jan 12, 2022
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
16 changes: 9 additions & 7 deletions DQMOffline/Muon/python/muonCosmicAnalyzer_cff.py
View file
Open in desktop
Expand Up @@ -7,13 +7,15 @@
from DQMOffline.Muon.muonSeedsAnalyzer_cfi import *

# Cloning the modules that need some changes...
muonCosmicSeedAnalyzer = muonSeedsAnalyzer.clone()
muonCosmicGlbSegmentAnalyzer = glbMuonSegmentAnalyzer.clone()
muonCosmicStaSegmentAnalyzer = staMuonSegmentAnalyzer.clone()

muonCosmicSeedAnalyzer.SeedCollection = cms.InputTag('CosmicMuonSeed')
muonCosmicGlbSegmentAnalyzer.MuTrackCollection = cms.InputTag('globalCosmicMuons')
muonCosmicStaSegmentAnalyzer.MuTrackCollection = cms.InputTag('cosmicMuons')
muonCosmicSeedAnalyzer = muonSeedsAnalyzer.clone(
SeedCollection = 'CosmicMuonSeed'
)
muonCosmicGlbSegmentAnalyzer = glbMuonSegmentAnalyzer.clone(
MuTrackCollection = 'globalCosmicMuons'
)
muonCosmicStaSegmentAnalyzer = staMuonSegmentAnalyzer.clone(
MuTrackCollection = 'cosmicMuons'
)

muonCosmicAnalyzer = cms.Sequence(muonEnergyDepositAnalyzer*
muonCosmicSeedAnalyzer*
Expand Down
20 changes: 10 additions & 10 deletions DQMOffline/Muon/python/muonTestSummaryCosmics_cfi.py
View file
Open in desktop
@@ -1,13 +1,13 @@
import FWCore.ParameterSet.Config as cms

import DQMOffline.Muon.muonTestSummary_cfi
muonCosmicTestSummary = DQMOffline.Muon.muonTestSummary_cfi.muonTestSummary.clone()
muonCosmicTestSummary.etaExpected = cms.double(0.5)
muonCosmicTestSummary.phiExpected = cms.double(0.01)
muonCosmicTestSummary.expMultiplicityGlb_min = cms.double(0.)
muonCosmicTestSummary.expMultiplicityGlb_max = cms.double(0.1)
muonCosmicTestSummary.expMultiplicityTk_min = cms.double(0.)
muonCosmicTestSummary.expMultiplicityTk_max = cms.double(0.045)
muonCosmicTestSummary.expMultiplicitySta_min = cms.double(0.75)
muonCosmicTestSummary.expMultiplicitySta_max = cms.double(0.95)

muonCosmicTestSummary = DQMOffline.Muon.muonTestSummary_cfi.muonTestSummary.clone(
etaExpected = 0.5,
phiExpected = 0.01,
expMultiplicityGlb_min = 0.,
expMultiplicityGlb_max = 0.1,
expMultiplicityTk_min = 0.,
expMultiplicityTk_max = 0.045,
expMultiplicitySta_min = 0.75,
expMultiplicitySta_max = 0.95
)
2 changes: 1 addition & 1 deletion DQMOffline/RecoB/python/PixelVertexMonitor_cff.py
View file
Open in desktop
Expand Up @@ -4,5 +4,5 @@
pixelPVMonitor = _pvMonitor.clone(
TopFolderName = "OfflinePixelPV",
vertexLabel = "pixelVertices",
ndof = cms.int32( 1 )
ndof = 1
)
2 changes: 1 addition & 1 deletion DQMOffline/RecoB/python/bTagMiniDQM_cff.py
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ def addSequences(Analyzer, Harvester, discriminators, regions, globalPSet, label
# Validation addSequences

bTagMiniValidationGlobal = bTagMiniDQMGlobal.clone(
MClevel = cms.int32(1) # produce flavour plots for b, c ,light (dusg)
MClevel = 1 # produce flavour plots for b, c ,light (dusg)
)

bTagMiniValidationSource = cms.Sequence()
Expand Down
14 changes: 7 additions & 7 deletions DQMOffline/RecoB/python/dqmAnalyzer_cff.py
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@
from PhysicsTools.JetMCAlgos.HadronAndPartonSelector_cfi import selectedHadronsAndPartons
from PhysicsTools.JetMCAlgos.AK4PFJetsMCFlavourInfos_cfi import ak4JetFlavourInfos
myak4JetFlavourInfos = ak4JetFlavourInfos.clone(
jets = cms.InputTag("ak4PFJetsCHS"),
partons = cms.InputTag("selectedHadronsAndPartons","algorithmicPartons"),
hadronFlavourHasPriority = cms.bool(True)
jets = "ak4PFJetsCHS",
partons = "selectedHadronsAndPartons:algorithmicPartons",
hadronFlavourHasPriority = True
)

#Get gen jet collection for real jets
Expand All @@ -35,10 +35,10 @@
#do reco gen - reco matching
from PhysicsTools.PatAlgos.mcMatchLayer0.jetMatch_cfi import patJetGenJetMatch
newpatJetGenJetMatch = patJetGenJetMatch.clone(
src = cms.InputTag("ak4PFJetsCHS"),
matched = cms.InputTag("ak4GenJetsForPUid"),
maxDeltaR = cms.double(0.25),
resolveAmbiguities = cms.bool(True)
src = "ak4PFJetsCHS",
matched = "ak4GenJetsForPUid",
maxDeltaR = 0.25,
resolveAmbiguities = True
)

from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
Expand Down
10 changes: 5 additions & 5 deletions DQMOffline/RecoB/python/dqmCollector_cff.py
View file
Open in desktop
Expand Up @@ -3,18 +3,18 @@
from DQMOffline.RecoB.dqmAnalyzer_cff import *

#pf DATA collector
bTagCollectorDATA = bTagHarvest.clone(ptRanges = cms.vdouble(0.0))
bTagCollectorDATA = bTagHarvest.clone(ptRanges = (0.0,))
# module execution
bTagCollectorSequenceDATA = cms.Sequence(bTagCollectorDATA)

#pf MC collector
bTagCollectorMC = bTagHarvestMC.clone(
flavPlots = cms.string("allbcl"), #harvest all, b, c, dusg and ni histos
ptRanges = cms.vdouble(0.0),
etaRanges = cms.vdouble(0.0),
flavPlots = "allbcl", #harvest all, b, c, dusg and ni histos
ptRanges = (0.0,),
etaRanges = (0.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 this syntax correct? Maybe yes... But why not sticking on the usual way of listing vectors in python with squared parentheses, e.g.:

Suggested change
ptRanges = (0.0,),
etaRanges = (0.0,),
ptRanges = [0.0],
etaRanges = [0.0],

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@perrotta Okay! I am considering changing parentheses as you mentioned. Thank you.

)
# module execution
bTagCollectorSequenceMC = cms.Sequence(bTagCollectorMC)
#special sequence for fullsim, all histos havested by the DATA sequence in the dqm offline sequence
bTagCollectorMCbcl = bTagCollectorMC.clone(flavPlots = cms.string("bcl")) #harvest b, c, dusg and ni histos, all not harvested
bTagCollectorMCbcl = bTagCollectorMC.clone(flavPlots = "bcl") #harvest b, c, dusg and ni histos, all not harvested
bTagCollectorSequenceMCbcl = cms.Sequence(bTagCollectorMCbcl)