Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,19 @@
)

## Configure calorimetric isolation
from RecoMuon.MuonIsolationProducers.caloExtractorByAssociatorBlocks_cff import MIsoCaloExtractorByAssociatorTowersBlock
from RecoMuon.MuonIsolationProducers.caloExtractorByAssociatorBlocks_cff import *
patAODTrackIsoDepositCalByAssociatorTowers = cms.EDProducer("CandIsoDepositProducer",
src = cms.InputTag("patAODTrackCands"),
trackType = cms.string('best'),
MultipleDepositsFlag = cms.bool(True),
ExtractorPSet = cms.PSet( MIsoCaloExtractorByAssociatorTowersBlock )
)
patAODTrackIsoDepositCalByAssociatorHits = cms.EDProducer("CandIsoDepositProducer",
src = cms.InputTag("patAODTrackCands"),
trackType = cms.string('best'),
MultipleDepositsFlag = cms.bool(True),
ExtractorPSet = cms.PSet( MIsoCaloExtractorByAssociatorHitsBlock )
)

## Select isolation labels to use
patAODTrackIsolationLabels = cms.VInputTag(
Expand Down Expand Up @@ -58,6 +64,7 @@
patAODTrackCandsUnfiltered *
patAODTrackCands *
patAODTrackIsoDepositCalByAssociatorTowers *
patAODTrackIsoDepositCalByAssociatorHits *
patAODTrackIsoDepositCtfTk *
patAODTrackIsolations
)
Expand Down
1 change: 1 addition & 0 deletions RecoMuon/Configuration/python/RecoMuonCosmics_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
muIsoDepositTk.inputTags = ['muons:tracker']
muIsoDepositJets.inputTags = ['muons:jets']
muIsoDepositCalByAssociatorTowers.inputTags = ['muons:ecal', 'muons:hcal', 'muons:ho']
muIsoDepositCalByAssociatorHits.inputTags = ['muons:ecal', 'muons:hcal', 'muons:ho']

# TeV refinement
from RecoMuon.GlobalMuonProducer.tevMuons_cfi import *
Expand Down
6 changes: 3 additions & 3 deletions RecoMuon/MuonIdentification/python/displacedMuons_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
FillTimingInfo = cms.bool(True),

FillDetectorBasedIsolation = cms.bool(True),
EcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowersDisplaced","ecal"),
HcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowersDisplaced","hcal"),
HoIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowersDisplaced","ho"),
EcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","ecal"),
HcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","hcal"),
HoIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHitsDisplaced","ho"),
TrackIsoDeposits = cms.InputTag("muIsoDepositTkDisplaced"),
JetIsoDeposits = cms.InputTag("muIsoDepositJetsDisplaced"),

Expand Down
2 changes: 1 addition & 1 deletion RecoMuon/MuonIdentification/python/isolation_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from RecoMuon.MuonIsolationProducers.jetExtractorBlock_cff import *
MIdIsoExtractorPSetBlock = cms.PSet(
CaloExtractorPSet = cms.PSet(
MIsoCaloExtractorByAssociatorTowersBlock
MIsoCaloExtractorByAssociatorHitsBlock
),
TrackExtractorPSet = cms.PSet(
MIsoTrackExtractorBlock
Expand Down
6 changes: 3 additions & 3 deletions RecoMuon/MuonIdentification/python/muons_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
FillTimingInfo = cms.bool(True),

FillDetectorBasedIsolation = cms.bool(True),
EcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowers","ecal"),
HcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowers","hcal"),
HoIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorTowers","ho"),
EcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHits","ecal"),
HcalIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHits","hcal"),
HoIsoDeposits = cms.InputTag("muIsoDepositCalByAssociatorHits","ho"),
TrackIsoDeposits = cms.InputTag("muIsoDepositTk"),
JetIsoDeposits = cms.InputTag("muIsoDepositJets"),

Expand Down
10 changes: 10 additions & 0 deletions RecoMuon/MuonIsolationProducers/python/muIsoDepositCopies_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,18 @@
depositNames = cms.vstring('ecal', 'hcal', 'ho')
)

muIsoDepositCalByAssociatorHits = cms.EDProducer("MuIsoDepositCopyProducer",
inputTags = cms.VInputTag(cms.InputTag("muons1stStep:ecal"), cms.InputTag("muons1stStep:hcal"), cms.InputTag("muons1stStep:ho")),
depositNames = cms.vstring('ecal', 'hcal', 'ho')
)

muIsoDepositCalByAssociatorTowersDisplaced = cms.EDProducer("MuIsoDepositCopyProducer",
inputTags = cms.VInputTag(cms.InputTag("displacedMuons1stStep:ecal"), cms.InputTag("displacedMuons1stStep:hcal"), cms.InputTag("displacedMuons1stStep:ho")),
depositNames = cms.vstring('ecal', 'hcal', 'ho')
)

muIsoDepositCalByAssociatorHitsDisplaced = cms.EDProducer("MuIsoDepositCopyProducer",
inputTags = cms.VInputTag(cms.InputTag("displacedMuons1stStep:ecal"), cms.InputTag("displacedMuons1stStep:hcal"), cms.InputTag("displacedMuons1stStep:ho")),
depositNames = cms.vstring('ecal', 'hcal', 'ho')
)

8 changes: 4 additions & 4 deletions RecoMuon/MuonIsolationProducers/python/muIsoDeposits_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from RecoMuon.MuonIsolationProducers.muIsoDeposits_setup_cff import *
#the default set of modules first
from RecoMuon.MuonIsolationProducers.muIsoDepositCopies_cfi import *
from RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi import *
import RecoMuon.MuonIsolationProducers.muIsoDepositTk_cfi
import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorTowers_cfi
import RecoMuon.MuonIsolationProducers.muIsoDepositCalByAssociatorHits_cfi
import RecoMuon.MuonIsolationProducers.muIsoDepositJets_cfi
import RecoMuon.MuonIsolationProducers.muIsoDepositCal_cfi

Expand All @@ -30,15 +30,15 @@
#
#------------------------------
# "standard sequences"
muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorTowers,muIsoDepositJets)
muIsoDeposits_muonsTask = cms.Task(muIsoDepositTk,muIsoDepositCalByAssociatorHits,muIsoDepositJets)
muIsoDeposits_muons = cms.Sequence(muIsoDeposits_muonsTask)
# "displaced sequences"
muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorTowersDisplaced,muIsoDepositJetsDisplaced)
muIsoDeposits_displacedMuonsTask = cms.Task(muIsoDepositTkDisplaced,muIsoDepositCalByAssociatorHitsDisplaced,muIsoDepositJetsDisplaced)
muIsoDeposits_displacedMuons = cms.Sequence(muIsoDeposits_displacedMuonsTask)
#old one, using a reduced config set
muIsoDeposits_ParamGlobalMuonsOldTask = cms.Task(muParamGlobalIsoDepositGsTk,muParamGlobalIsoDepositCalEcal,muParamGlobalIsoDepositCalHcal)
muIsoDeposits_ParamGlobalMuonsOld = cms.Sequence(muIsoDeposits_ParamGlobalMuonsOldTask)
muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorTowers,muParamGlobalIsoDepositJets)
muIsoDeposits_ParamGlobalMuonsTask = cms.Task(muParamGlobalIsoDepositTk,muParamGlobalIsoDepositCalByAssociatorHits,muParamGlobalIsoDepositJets)
muIsoDeposits_ParamGlobalMuons = cms.Sequence(muIsoDeposits_ParamGlobalMuonsTask)
muParamGlobalIsoDepositCtfTk.IOPSet = cms.PSet(
MIsoDepositParamGlobalViewIOBlock
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,13 @@
DepositThreshold = cms.double(-1.0),
DepositWeight = cms.double(1.0)
)


UnweightedInputHitEcalDeps = cms.PSet(
DepositTag = cms.InputTag("muIsoDepositCalByAssociatorHits","ecal"),
DepositThreshold = cms.double(-1.0),
DepositWeight = cms.double(1.0)
)
UnweightedInputHitHcalDeps = cms.PSet(
DepositTag = cms.InputTag("muIsoDepositCalByAssociatorHits","hcal"),
DepositThreshold = cms.double(-1.0),
DepositWeight = cms.double(1.0)
)
4 changes: 2 additions & 2 deletions RecoMuon/MuonIsolationProducers/python/muIsoResultM2C_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
UnweightedInputTkDeps
),
cms.PSet(
UnweightedInputTowEcalDeps
UnweightedInputHitEcalDeps
),
cms.PSet(
UnweightedInputTowHcalDeps
UnweightedInputHitHcalDeps
)),
BeamlineOption = cms.string('BeamSpotFromEvent')
)
Expand Down
4 changes: 2 additions & 2 deletions RecoMuon/MuonIsolationProducers/python/muIsoResultM2T_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
UnweightedInputTkDeps
),
cms.PSet(
UnweightedInputTowEcalDeps
UnweightedInputHitEcalDeps
),
cms.PSet(
UnweightedInputTowHcalDeps
UnweightedInputHitHcalDeps
))
)

Expand Down