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 in RecoHI, RecoJets and RecoMET #36510

Merged
merged 4 commits into from Dec 31, 2021
Merged

Drop type specs in RecoHI, RecoJets and RecoMET #36510

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c499df
Drop type specs in RecoHI, RecoJets and RecoMET
NiharSaha Dec 15, 2021
35dfffc
Update muonValidationHeavyIons_cff.py
NiharSaha Dec 17, 2021
c78cd2c
Update muonValidationHeavyIons_cff.py
NiharSaha Dec 31, 2021
07044d7
Update muonValidationHeavyIons_cff.py
NiharSaha Dec 31, 2021
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
10 changes: 5 additions & 5 deletions Validation/RecoHI/python/TrackValidationHeavyIons_cff.py
View file
Open in desktop
Expand Up @@ -24,17 +24,17 @@
hiTrackValidator = multiTrackValidator.clone(
associators = ["trackAssociatorByHitsRecoDenom"],
UseAssociators = True,
label_tp_effic = cms.InputTag("primaryChgSimTracks"),
label_tp_fake = cms.InputTag("cutsTPFake"),
label_tp_effic = "primaryChgSimTracks",
label_tp_fake = "cutsTPFake",
label_tp_effic_refvector = True,
label_tp_fake_refvector = True,
signalOnlyTP = cms.bool(False),
trackCollectionForDrCalculation = cms.InputTag("cutsRecoTracks"),
signalOnlyTP = False,
trackCollectionForDrCalculation = "cutsRecoTracks",
minpT = cms.double(1.0),
maxpT = cms.double(100.0),
nintpT = cms.int32(40),
useLogPt = cms.untracked.bool(True),
cores = cms.InputTag("")
cores = ""
)

hiTrackValidator.label = cms.VInputTag(cms.InputTag('cutsRecoTracks'),
Expand Down
97 changes: 49 additions & 48 deletions Validation/RecoHI/python/muonValidationHeavyIons_cff.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
# MuonAssociation labels; hit-by-hit matching only,MuonAssociator
#
import SimMuon.MCTruth.MuonAssociatorByHits_cfi
hiMABH = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone()
hiMABH = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone(
# DEFAULTS ###################################
# EfficiencyCut_track = cms.double(0.),
# PurityCut_track = cms.double(0.),
Expand All @@ -15,38 +15,39 @@
# includeZeroHitMuons = cms.bool(True),
# acceptOneStubMatchings = cms.bool(False),
##############################################
hiMABH.tpTag = 'cutsTpMuons'
#hiMABH.acceptOneStubMatchings = cms.bool(True) # this was the OLD setting
hiMABH.PurityCut_track = 0.75
hiMABH.PurityCut_muon = 0.75
#hiMABH.EfficiencyCut_track = 0.5 # maybe this could be added
#hiMABH.EfficiencyCut_muon = 0.5 # maybe this could be added
#hiMABH.includeZeroHitMuons = False # maybe this could be added
tpTag = 'cutsTpMuons',
#acceptOneStubMatchings = cms.bool(True) # this was the OLD setting
PurityCut_track = 0.75,
PurityCut_muon = 0.75
#EfficiencyCut_track = 0.5 # maybe this could be added
#EfficiencyCut_muon = 0.5 # maybe this could be added
#includeZeroHitMuons = False # maybe this could be added
)
################################################

# sim to tracker tracks,
tpToTkMuonAssociationHI = hiMABH.clone()
tpToTkMuonAssociationHI.tracksTag = 'cutsRecoTrkMuons'
tpToTkMuonAssociationHI.UseTracker = True
tpToTkMuonAssociationHI.UseMuon = False

tpToTkMuonAssociationHI = hiMABH.clone(
tracksTag = 'cutsRecoTrkMuons',
UseTracker = True,
UseMuon = False
)
# sim to sta, and sta:updatedAtVtx
tpToStaMuonAssociationHI = hiMABH.clone()
tpToStaMuonAssociationHI.tracksTag = 'standAloneMuons'
tpToStaMuonAssociationHI.UseTracker = False
tpToStaMuonAssociationHI.UseMuon = True

tpToStaUpdMuonAssociationHI = hiMABH.clone()
tpToStaUpdMuonAssociationHI.tracksTag = 'standAloneMuons:UpdatedAtVtx'
tpToStaUpdMuonAssociationHI.UseTracker = False
tpToStaUpdMuonAssociationHI.UseMuon = True

tpToStaMuonAssociationHI = hiMABH.clone(
tracksTag = 'standAloneMuons',
UseTracker = False,
UseMuon = True
)
tpToStaUpdMuonAssociationHI = hiMABH.clone(
tracksTag = 'standAloneMuons:UpdatedAtVtx',
UseTracker = False,
UseMuon = True
)
# sim to glb track
tpToGlbMuonAssociationHI = hiMABH.clone()
tpToGlbMuonAssociationHI.tracksTag = 'globalMuons'
tpToGlbMuonAssociationHI.UseTracker = True
tpToGlbMuonAssociationHI.UseMuon = True

tpToGlbMuonAssociationHI = hiMABH.clone(
tracksTag = 'globalMuons',
UseTracker = True,
UseMuon = True
)

# Muon association sequences
# (some are commented out until timing is addressed)
Expand All @@ -68,26 +69,26 @@
MTVhi.maxPt = cms.double(100)

# MuonTrackValidator parameters
trkMuonTrackVMuonAssocHI = MTVhi.clone()
trkMuonTrackVMuonAssocHI.associatormap = 'tpToTkMuonAssociationHI'
trkMuonTrackVMuonAssocHI.label = ['cutsRecoTrkMuons']
trkMuonTrackVMuonAssocHI.muonHistoParameters = trkMuonHistoParameters

glbMuonTrackVMuonAssocHI = MTVhi.clone()
glbMuonTrackVMuonAssocHI.associatormap = 'tpToGlbMuonAssociationHI'
glbMuonTrackVMuonAssocHI.label = ['globalMuons']
glbMuonTrackVMuonAssocHI.muonHistoParameters = glbMuonHistoParameters

staMuonTrackVMuonAssocHI = MTVhi.clone()
staMuonTrackVMuonAssocHI.associatormap = 'tpToStaMuonAssociationHI'
staMuonTrackVMuonAssocHI.label = ('standAloneMuons',)
staMuonTrackVMuonAssocHI.muonHistoParameters = staMuonHistoParameters

staUpdMuonTrackVMuonAssocHI = MTVhi.clone()
staUpdMuonTrackVMuonAssocHI.associatormap = 'tpToStaUpdMuonAssociationHI'
staUpdMuonTrackVMuonAssocHI.label = ('standAloneMuons:UpdatedAtVtx',)
staUpdMuonTrackVMuonAssocHI.muonHistoParameters = staUpdMuonHistoParameters

trkMuonTrackVMuonAssocHI = MTVhi.clone(
associatormap = 'tpToTkMuonAssociationHI',
label = ['cutsRecoTrkMuons'],
Copy link
Contributor

Choose a reason for hiding this comment

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

I am not sure why [] was used here in the original version of the file instead of ( ) like below and the original class:

cmssw/Validation/RecoMuon/python/MuonTrackValidator_cfi.py

Line 16 in 3c499df

label = cms.VInputTag(cms.InputTag("globalMuons")),

It probably has no effect at all but we could uniform it now

Copy link
Contributor Author

@NiharSaha NiharSaha Dec 16, 2021 •
edited

Choose a reason for hiding this comment

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

I have edited from [] to () in the new commit. Thank you.

muonHistoParameters = trkMuonHistoParameters
)
glbMuonTrackVMuonAssocHI = MTVhi.clone(
associatormap = 'tpToGlbMuonAssociationHI',
label = ['globalMuons'],
Copy link
Contributor

Choose a reason for hiding this comment

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

Same comment as previous

muonHistoParameters = glbMuonHistoParameters
)
staMuonTrackVMuonAssocHI = MTVhi.clone(
associatormap = 'tpToStaMuonAssociationHI',
label = ('standAloneMuons',),
muonHistoParameters = staMuonHistoParameters
)
staUpdMuonTrackVMuonAssocHI = MTVhi.clone(
associatormap = 'tpToStaUpdMuonAssociationHI',
label = ('standAloneMuons:UpdatedAtVtx',),
muonHistoParameters = staUpdMuonHistoParameters
)

# Muon validation sequences
hiMuonValidation_seq = cms.Sequence(
Expand Down
10 changes: 5 additions & 5 deletions Validation/RecoJets/python/JetValidationHeavyIons_cff.py
View file
Open in desktop
Expand Up @@ -6,12 +6,12 @@

iterativeCone5HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('iterativeCone5HiGenJets'))
#iterativeCone7HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('iterativeCone7HiGenJets'))
ak2HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('ak2HiGenJets'))
ak3HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('ak3HiGenJets'))
ak4HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('ak4HiGenJets'))
ak5HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('ak5HiGenJets'))
ak2HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = 'ak2HiGenJets')
ak3HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = 'ak3HiGenJets')
ak4HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = 'ak4HiGenJets')
ak5HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = 'ak5HiGenJets')

ak7HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = cms.InputTag('ak7HiGenJets'))
ak7HiCleanedGenJets = heavyIonCleanedGenJets.clone( src = 'ak7HiGenJets')

### jet analyzer for several radii
### iterative cone with PU, anti-kt with PU, anti-kt with fastjet PU
Expand Down
10 changes: 5 additions & 5 deletions Validation/RecoMET/python/METRelValForDQM_cff.py
View file
Open in desktop
Expand Up @@ -35,18 +35,18 @@
)
metPreValidSeq = cms.Sequence(metPreValidSeqTask)

valCorrPfMetType1=corrPfMetType1.clone(jetCorrLabel = cms.InputTag('newAK4PFCHSL1FastL2L3Corrector'),
jetCorrLabelRes = cms.InputTag('newAK4PFCHSL1FastL2L3ResidualCorrector')
valCorrPfMetType1=corrPfMetType1.clone(jetCorrLabel = 'newAK4PFCHSL1FastL2L3Corrector',
jetCorrLabelRes = 'newAK4PFCHSL1FastL2L3ResidualCorrector'
)

PfMetT1=pfMetT1.clone(srcCorrections = cms.VInputTag(
cms.InputTag('valCorrPfMetType1', 'type1')
'valCorrPfMetType1:type1'
))

PfMetT0pcT1=pfMetT0pcT1.clone(
srcCorrections = cms.VInputTag(
cms.InputTag('corrPfMetType0PfCand'),
cms.InputTag('valCorrPfMetType1', 'type1')
'corrPfMetType0PfCand',
'valCorrPfMetType1:type1'
)
)

Expand Down