diff --git a/Validation/RecoEgamma/python/photonValidator_cfi.py b/Validation/RecoEgamma/python/photonValidator_cfi.py index 07447e5ed110c..8fef3d250131c 100644 --- a/Validation/RecoEgamma/python/photonValidator_cfi.py +++ b/Validation/RecoEgamma/python/photonValidator_cfi.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms -import SimTracker.TrackAssociation.TrackAssociatorByHits_cfi -trackAssociatorByHitsForPhotonValidation = SimTracker.TrackAssociation.TrackAssociatorByHits_cfi.TrackAssociatorByHits.clone() +import SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi +trackAssociatorByHitsForPhotonValidation = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() trackAssociatorByHitsForPhotonValidation.ComponentName = cms.string('trackAssociatorByHitsForPhotonValidation') trackAssociatorByHitsForPhotonValidation.Cut_RecoToSim = 0.5 trackAssociatorByHitsForPhotonValidation.Quality_SimToReco = 0.5 diff --git a/Validation/RecoEgamma/python/tkConvValidator_cfi.py b/Validation/RecoEgamma/python/tkConvValidator_cfi.py index 8103a1f069ea2..38aeacbfaac5b 100644 --- a/Validation/RecoEgamma/python/tkConvValidator_cfi.py +++ b/Validation/RecoEgamma/python/tkConvValidator_cfi.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms from Validation.RecoEgamma.tpSelection_cfi import * -from SimTracker.TrackAssociation.TrackAssociatorByHits_cfi import * -import SimTracker.TrackAssociation.TrackAssociatorByHits_cfi -trackAssociatorByHitsForConversionValidation = SimTracker.TrackAssociation.TrackAssociatorByHits_cfi.TrackAssociatorByHits.clone() +from SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi import * +import SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi +trackAssociatorByHitsForConversionValidation = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() trackAssociatorByHitsForConversionValidation.ComponentName = cms.string('trackAssociatorByHitsForConversionValidation') trackAssociatorByHitsForConversionValidation.SimToRecoDenominator = 'reco' trackAssociatorByHitsForConversionValidation.Quality_SimToReco = 0.5 diff --git a/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h b/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h index 42116cf6bd78e..4a84d5c712c2d 100644 --- a/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h +++ b/Validation/RecoHI/plugins/HitPixelLayersTPSelector.h @@ -77,7 +77,7 @@ class HitPixelLayersTPSelector } // selection criteria - if ( tpr->matchedHit() >= minHit_ && + if ( tpr->numberOfTrackerLayers() >= minHit_ && sqrt(tpr->momentum().perp2()) >= ptMin_ && tpr->momentum().eta() >= minRapidity_ && tpr->momentum().eta() <= maxRapidity_ && sqrt(tpr->vertex().perp2()) <= tip_ && @@ -97,6 +97,8 @@ class HitPixelLayersTPSelector { std::vector hitpattern(5,false); // PXB 0,1,2 PXF 0,1 +#warning "This file has been modified just to get it to compile without any regard as to whether it still functions as intended" +#ifdef REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED for(std::vector::const_iterator simHit = simTrack->pSimHit_begin();simHit!= simTrack->pSimHit_end();simHit++){ DetId id = DetId(simHit->detUnitId()); @@ -111,6 +113,7 @@ class HitPixelLayersTPSelector } }// end simhit loop +#endif return hitpattern; } diff --git a/Validation/RecoHI/python/selectSimTracks_cff.py b/Validation/RecoHI/python/selectSimTracks_cff.py index c38ff1deea670..4442aa26f497c 100644 --- a/Validation/RecoHI/python/selectSimTracks_cff.py +++ b/Validation/RecoHI/python/selectSimTracks_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms findableSimTracks = cms.EDFilter("HitPixelLayersTPSelection", - src = cms.InputTag("mergedtruth","MergedTrackTruth"), + src = cms.InputTag("mix","MergedTrackTruth"), tripletSeedOnly = cms.bool(True), chargedOnly = cms.bool(True), signalOnly = cms.bool(False), @@ -18,7 +18,7 @@ primaryChgSimTracks = cms.EDFilter("HitPixelLayersTPSelection", - src = cms.InputTag("mergedtruth","MergedTrackTruth"), + src = cms.InputTag("mix","MergedTrackTruth"), tripletSeedOnly = cms.bool(False), chargedOnly = cms.bool(True), signalOnly = cms.bool(False), diff --git a/Validation/RecoMuon/python/MuonTrackValidator_cfi.py b/Validation/RecoMuon/python/MuonTrackValidator_cfi.py index 8bc27159b8830..a96a91513e6c4 100644 --- a/Validation/RecoMuon/python/MuonTrackValidator_cfi.py +++ b/Validation/RecoMuon/python/MuonTrackValidator_cfi.py @@ -5,8 +5,8 @@ muonTrackValidator = cms.EDAnalyzer("MuonTrackValidator", # input TrackingParticle collections - label_tp_effic = cms.InputTag("mergedtruth","MergedTrackTruth"), - label_tp_fake = cms.InputTag("mergedtruth","MergedTrackTruth"), + label_tp_effic = cms.InputTag("mix","MergedTrackTruth"), + label_tp_fake = cms.InputTag("mix","MergedTrackTruth"), # input reco::Track collection label = cms.VInputTag(cms.InputTag("globalMuons")), # switches to be set according to the input Track collection to properly count SimHits diff --git a/Validation/RecoMuon/python/RecoMuonValidator_cfi.py b/Validation/RecoMuon/python/RecoMuonValidator_cfi.py index b44cda0cadcc3..c09f513806ab1 100644 --- a/Validation/RecoMuon/python/RecoMuonValidator_cfi.py +++ b/Validation/RecoMuon/python/RecoMuonValidator_cfi.py @@ -8,7 +8,7 @@ usePFMuon = cms.untracked.bool(False), - simLabel = cms.InputTag("mergedtruth","MergedTrackTruth"), + simLabel = cms.InputTag("mix","MergedTrackTruth"), muonLabel = cms.InputTag("muons"), muAssocLabel = cms.InputTag("MuonAssociatorByHits"), diff --git a/Validation/RecoMuon/python/associators_cff.py b/Validation/RecoMuon/python/associators_cff.py index 34f74ee4c8a3a..e40dfffaab0c0 100644 --- a/Validation/RecoMuon/python/associators_cff.py +++ b/Validation/RecoMuon/python/associators_cff.py @@ -8,13 +8,12 @@ import SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi import SimTracker.TrackAssociation.TrackAssociatorByPosition_cfi -TrackAssociatorByHits = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() -TrackAssociatorByHits.ComponentName = 'TrackAssociatorByHits' +TrackAssociatorByHits = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone( ComponentName = 'TrackAssociatorByHits' ) OnlineTrackAssociatorByHits = SimTracker.TrackAssociation.quickTrackAssociatorByHits_cfi.quickTrackAssociatorByHits.clone() OnlineTrackAssociatorByHits.ComponentName = 'OnlineTrackAssociatorByHits' -#OnlineTrackAssociatorByHits.UseGrouped = False -#OnlineTrackAssociatorByHits.UseSplitting = False +OnlineTrackAssociatorByHits.UseGrouped = cms.bool(False) +OnlineTrackAssociatorByHits.UseSplitting = cms.bool(False) OnlineTrackAssociatorByHits.ThreeHitTracksAreSpecial = False TrackAssociatorByPosDeltaR = SimTracker.TrackAssociation.TrackAssociatorByPosition_cfi.TrackAssociatorByPosition.clone() @@ -39,95 +38,95 @@ tpToTkmuTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('generalTracks') ) tpToStaTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneMuons','') ) tpToStaUpdTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneMuons','UpdatedAtVtx') ) tpToGlbTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('extractedGlobalMuons') ) tpToStaSETTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneSETMuons','') ) tpToStaSETUpdTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneSETMuons','UpdatedAtVtx') ) tpToGlbSETTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('globalSETMuons') ) tpToTevFirstTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','firstHit') ) tpToTevPickyTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','picky') ) tpToTevDytTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','dyt') ) tpToL2TrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL2Muons','') ) tpToL2UpdTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL2Muons','UpdatedAtVtx') ) tpToL3TrackAssociation = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL3Muons') ) tpToL3TkTrackTrackAssociation = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('OnlineTrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth','MergedTrackTruth'), + label_tp = cms.InputTag('mix','MergedTrackTruth'), label_tr = cms.InputTag('hltL3TkTracksFromL2','') ) tpToL3L2TrackTrackAssociation = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('OnlineTrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth','MergedTrackTruth'), + label_tp = cms.InputTag('mix','MergedTrackTruth'), label_tr = cms.InputTag('hltL3Muons:L2Seeded') ) @@ -153,67 +152,67 @@ tpToL2UpdMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone() tpToL3MuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone() -tpToTkMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTkMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToTkMuonAssociation.tracksTag = 'generalTracks' tpToTkMuonAssociation.UseTracker = True tpToTkMuonAssociation.UseMuon = False -tpToStaMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaMuonAssociation.tracksTag = 'standAloneMuons' tpToStaMuonAssociation.UseTracker = False tpToStaMuonAssociation.UseMuon = True -tpToStaUpdMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaUpdMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaUpdMuonAssociation.tracksTag = 'standAloneMuons:UpdatedAtVtx' tpToStaUpdMuonAssociation.UseTracker = False tpToStaUpdMuonAssociation.UseMuon = True -tpToGlbMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToGlbMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToGlbMuonAssociation.tracksTag = 'extractedGlobalMuons' tpToGlbMuonAssociation.UseTracker = True tpToGlbMuonAssociation.UseMuon = True -tpToStaRefitMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaRefitMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaRefitMuonAssociation.tracksTag = 'refittedStandAloneMuons' tpToStaRefitMuonAssociation.UseTracker = False tpToStaRefitMuonAssociation.UseMuon = True -tpToStaRefitUpdMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaRefitUpdMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaRefitUpdMuonAssociation.tracksTag = 'refittedStandAloneMuons:UpdatedAtVtx' tpToStaRefitUpdMuonAssociation.UseTracker = False tpToStaRefitUpdMuonAssociation.UseMuon = True -tpToStaSETMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaSETMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaSETMuonAssociation.tracksTag = 'standAloneSETMuons' tpToStaSETMuonAssociation.UseTracker = False tpToStaSETMuonAssociation.UseMuon = True -tpToStaSETUpdMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaSETUpdMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaSETUpdMuonAssociation.tracksTag = 'standAloneSETMuons:UpdatedAtVtx' tpToStaSETUpdMuonAssociation.UseTracker = False tpToStaSETUpdMuonAssociation.UseMuon = True -tpToGlbSETMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToGlbSETMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToGlbSETMuonAssociation.tracksTag = 'globalSETMuons' tpToGlbSETMuonAssociation.UseTracker = True tpToGlbSETMuonAssociation.UseMuon = True -tpToTevFirstMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevFirstMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToTevFirstMuonAssociation.tracksTag = 'tevMuons:firstHit' tpToTevFirstMuonAssociation.UseTracker = True tpToTevFirstMuonAssociation.UseMuon = True -tpToTevPickyMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevPickyMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToTevPickyMuonAssociation.tracksTag = 'tevMuons:picky' tpToTevPickyMuonAssociation.UseTracker = True tpToTevPickyMuonAssociation.UseMuon = True -tpToTevDytMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevDytMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToTevDytMuonAssociation.tracksTag = 'tevMuons:dyt' tpToTevDytMuonAssociation.UseTracker = True tpToTevDytMuonAssociation.UseMuon = True -tpToL3TkMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL3TkMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToL3TkMuonAssociation.tracksTag = 'hltL3TkTracksFromL2' tpToL3TkMuonAssociation.DTrechitTag = 'hltDt1DRecHits' tpToL3TkMuonAssociation.UseTracker = True @@ -222,21 +221,21 @@ tpToL3TkMuonAssociation.UseSplitting = False tpToL3TkMuonAssociation.UseGrouped = False -tpToL2MuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL2MuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToL2MuonAssociation.tracksTag = 'hltL2Muons' tpToL2MuonAssociation.DTrechitTag = 'hltDt1DRecHits' tpToL2MuonAssociation.UseTracker = False tpToL2MuonAssociation.UseMuon = True tpToL2MuonAssociation.ignoreMissingTrackCollection = True -tpToL2UpdMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL2UpdMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToL2UpdMuonAssociation.tracksTag = 'hltL2Muons:UpdatedAtVtx' tpToL2UpdMuonAssociation.DTrechitTag = 'hltDt1DRecHits' tpToL2UpdMuonAssociation.UseTracker = False tpToL2UpdMuonAssociation.UseMuon = True tpToL2UpdMuonAssociation.ignoreMissingTrackCollection = True -tpToL3MuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL3MuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToL3MuonAssociation.tracksTag = 'hltL3Muons' tpToL3MuonAssociation.DTrechitTag = 'hltDt1DRecHits' tpToL3MuonAssociation.UseTracker = True @@ -251,19 +250,19 @@ tpToTkCosmicTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('ctfWithMaterialTracksP5LHCNavigation') ) tpToStaCosmicTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('cosmicMuons') ) tpToGlbCosmicTrackAssociation = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('globalCosmicMuons') ) @@ -271,17 +270,17 @@ tpToStaCosmicMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone() tpToGlbCosmicMuonAssociation = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone() -tpToTkCosmicMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTkCosmicMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToTkCosmicMuonAssociation.tracksTag = 'ctfWithMaterialTracksP5LHCNavigation' tpToTkCosmicMuonAssociation.UseTracker = True tpToTkCosmicMuonAssociation.UseMuon = False -tpToStaCosmicMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToStaCosmicMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToStaCosmicMuonAssociation.tracksTag = 'cosmicMuons' tpToStaCosmicMuonAssociation.UseTracker = False tpToStaCosmicMuonAssociation.UseMuon = True -tpToGlbCosmicMuonAssociation.tpTag = 'mergedtruth:MergedTrackTruth' +tpToGlbCosmicMuonAssociation.tpTag = 'mix:MergedTrackTruth' tpToGlbCosmicMuonAssociation.tracksTag = 'globalCosmicMuons' tpToGlbCosmicMuonAssociation.UseTracker = True tpToGlbCosmicMuonAssociation.UseMuon = True @@ -324,78 +323,78 @@ tpToTkmuTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('generalTracks') ) tpToStaTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruthMuon', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneMuons','') ) tpToStaUpdTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruthMuon', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('standAloneMuons','UpdatedAtVtx') ) tpToGlbTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('extractedGlobalMuons') ) tpToTevFirstTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','firstHit') ) tpToTevPickyTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','picky') ) tpToTevDytTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('tevMuons','dyt') ) tpToL2TrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruthMuon', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL2Muons','') ) tpToL2UpdTrackAssociationFS = cms.EDProducer('TrackAssociatorEDProducer', ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruthMuon', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL2Muons','UpdatedAtVtx') ) tpToL3TrackAssociationFS = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('TrackAssociatorByDeltaR'), - label_tp = cms.InputTag('mergedtruth', 'MergedTrackTruth'), + label_tp = cms.InputTag('mix', 'MergedTrackTruth'), label_tr = cms.InputTag('hltL3Muons') ) tpToL3TkTrackTrackAssociationFS = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('OnlineTrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth','MergedTrackTruth'), + label_tp = cms.InputTag('mix','MergedTrackTruth'), label_tr = cms.InputTag('hltL3TkTracksFromL2','') ) tpToL3L2TrackTrackAssociationFS = cms.EDProducer("TrackAssociatorEDProducer", ignoremissingtrackcollection=cms.untracked.bool(True), associator = cms.string('OnlineTrackAssociatorByHits'), - label_tp = cms.InputTag('mergedtruth','MergedTrackTruth'), + label_tp = cms.InputTag('mix','MergedTrackTruth'), label_tr = cms.InputTag('hltL3Muons:L2Seeded') ) @@ -404,7 +403,7 @@ import SimMuon.MCTruth.MuonAssociatorByHits_cfi baseMuonAssociatorFS = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.clone() -baseMuonAssociatorFS.tpTag = 'mergedtruthMuon:MergedTrackTruth' +baseMuonAssociatorFS.tpTag = 'mix:MergedTrackTruth' baseMuonAssociatorFS.UseTracker = True baseMuonAssociatorFS.UseMuon = True baseMuonAssociatorFS.simtracksTag = "famosSimHits" @@ -433,7 +432,7 @@ tpToL3MuonAssociationFS = baseMuonAssociatorFS.clone() tpToTkMuonAssociationFS.tracksTag = 'generalTracks' -tpToTkMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTkMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToTkMuonAssociationFS.UseTracker = True tpToTkMuonAssociationFS.UseMuon = False @@ -454,27 +453,27 @@ tpToStaRefitUpdMuonAssociationFS.UseMuon = True tpToGlbMuonAssociationFS.tracksTag = 'extractedGlobalMuons' -tpToGlbMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToGlbMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToGlbMuonAssociationFS.UseTracker = True tpToGlbMuonAssociationFS.UseMuon = True tpToTevFirstMuonAssociationFS.tracksTag = 'tevMuons:firstHit' -tpToTevFirstMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevFirstMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToTevFirstMuonAssociationFS.UseTracker = True tpToTevFirstMuonAssociationFS.UseMuon = True tpToTevPickyMuonAssociationFS.tracksTag = 'tevMuons:picky' -tpToTevPickyMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevPickyMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToTevPickyMuonAssociationFS.UseTracker = True tpToTevPickyMuonAssociationFS.UseMuon = True tpToTevDytMuonAssociationFS.tracksTag = 'tevMuons:dyt' -tpToTevDytMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToTevDytMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToTevDytMuonAssociationFS.UseTracker = True tpToTevDytMuonAssociationFS.UseMuon = True tpToL3TkMuonAssociationFS.tracksTag = 'hltL3TkTracksFromL2' -tpToL3TkMuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL3TkMuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToL3TkMuonAssociationFS.UseTracker = True tpToL3TkMuonAssociationFS.UseMuon = False tpToL3TkMuonAssociationFS.ignoreMissingTrackCollection = True @@ -492,7 +491,7 @@ tpToL2UpdMuonAssociationFS.ignoreMissingTrackCollection = True tpToL3MuonAssociationFS.tracksTag = 'hltL3Muons' -tpToL3MuonAssociationFS.tpTag = 'mergedtruth:MergedTrackTruth' +tpToL3MuonAssociationFS.tpTag = 'mix:MergedTrackTruth' tpToL3MuonAssociationFS.UseTracker = True tpToL3MuonAssociationFS.UseMuon = True tpToL3MuonAssociationFS.ignoreMissingTrackCollection = True diff --git a/Validation/RecoMuon/python/muonValidationFastSim_cff.py b/Validation/RecoMuon/python/muonValidationFastSim_cff.py index b1a9307d9f4b1..86b123a5de1c8 100644 --- a/Validation/RecoMuon/python/muonValidationFastSim_cff.py +++ b/Validation/RecoMuon/python/muonValidationFastSim_cff.py @@ -13,99 +13,99 @@ #staMuonTrackVTrackAssocFS = Validation.RecoMuon.muonValidation_cff.staMuonTrackVTrackAssoc.clone() staMuonTrackVTrackAssocFS = staMuonTrackVTrackAssoc.clone() staMuonTrackVTrackAssocFS.associatormap = 'tpToStaTrackAssociationFS' -staMuonTrackVTrackAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staMuonTrackVTrackAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staMuonTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staMuonTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import staUpdMuonTrackVTrackAssoc staUpdMuonTrackVTrackAssocFS = staUpdMuonTrackVTrackAssoc.clone() staUpdMuonTrackVTrackAssocFS.associatormap = 'tpToStaUpdTrackAssociationFS' -staUpdMuonTrackVTrackAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staUpdMuonTrackVTrackAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staUpdMuonTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staUpdMuonTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import glbMuonTrackVTrackAssoc glbMuonTrackVTrackAssocFS = glbMuonTrackVTrackAssoc.clone() glbMuonTrackVTrackAssocFS.associatormap = 'tpToGlbTrackAssociationFS' -glbMuonTrackVTrackAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -glbMuonTrackVTrackAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +glbMuonTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +glbMuonTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonFirstTrackVTrackAssoc tevMuonFirstTrackVTrackAssocFS = tevMuonFirstTrackVTrackAssoc.clone() tevMuonFirstTrackVTrackAssocFS.associatormap = 'tpToTevFirstTrackAssociationFS' -tevMuonFirstTrackVTrackAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonFirstTrackVTrackAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonFirstTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonFirstTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonPickyTrackVTrackAssoc tevMuonPickyTrackVTrackAssocFS = tevMuonPickyTrackVTrackAssoc.clone() tevMuonPickyTrackVTrackAssocFS.associatormap = 'tpToTevPickyTrackAssociationFS' -tevMuonPickyTrackVTrackAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonPickyTrackVTrackAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonPickyTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonPickyTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonDytTrackVTrackAssoc tevMuonDytTrackVTrackAssocFS = tevMuonDytTrackVTrackAssoc.clone() tevMuonDytTrackVTrackAssocFS.associatormap = 'tpToTevDytTrackAssociationFS' -tevMuonDytTrackVTrackAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonDytTrackVTrackAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonDytTrackVTrackAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonDytTrackVTrackAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import staMuonTrackVMuonAssoc staMuonTrackVMuonAssocFS = staMuonTrackVMuonAssoc.clone() staMuonTrackVMuonAssocFS.associatormap = 'tpToStaMuonAssociationFS' -staMuonTrackVMuonAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staMuonTrackVMuonAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staMuonTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staMuonTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import staUpdMuonTrackVMuonAssoc staUpdMuonTrackVMuonAssocFS = staUpdMuonTrackVMuonAssoc.clone() staUpdMuonTrackVMuonAssocFS.associatormap = 'tpToStaUpdMuonAssociationFS' -staUpdMuonTrackVMuonAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staUpdMuonTrackVMuonAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staUpdMuonTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staUpdMuonTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import staRefitMuonTrackVMuonAssoc staRefitMuonTrackVMuonAssocFS = staRefitMuonTrackVMuonAssoc.clone() staRefitMuonTrackVMuonAssocFS.associatormap = 'tpToStaRefitMuonAssociationFS' -staRefitMuonTrackVMuonAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staRefitMuonTrackVMuonAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staRefitMuonTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staRefitMuonTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import staRefitUpdMuonTrackVMuonAssoc staRefitUpdMuonTrackVMuonAssocFS = staRefitUpdMuonTrackVMuonAssoc.clone() staRefitUpdMuonTrackVMuonAssocFS.associatormap = 'tpToStaRefitUpdMuonAssociationFS' -staRefitUpdMuonTrackVMuonAssocFS.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -staRefitUpdMuonTrackVMuonAssocFS.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +staRefitUpdMuonTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +staRefitUpdMuonTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import glbMuonTrackVMuonAssoc glbMuonTrackVMuonAssocFS = glbMuonTrackVMuonAssoc.clone() glbMuonTrackVMuonAssocFS.associatormap = 'tpToGlbMuonAssociationFS' -glbMuonTrackVMuonAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -glbMuonTrackVMuonAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +glbMuonTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +glbMuonTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonFirstTrackVMuonAssoc tevMuonFirstTrackVMuonAssocFS = tevMuonFirstTrackVMuonAssoc.clone() tevMuonFirstTrackVMuonAssocFS.associatormap = 'tpToTevFirstMuonAssociationFS' -tevMuonFirstTrackVMuonAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonFirstTrackVMuonAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonFirstTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonFirstTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonPickyTrackVMuonAssoc tevMuonPickyTrackVMuonAssocFS = tevMuonPickyTrackVMuonAssoc.clone() tevMuonPickyTrackVMuonAssocFS.associatormap = 'tpToTevPickyMuonAssociationFS' -tevMuonPickyTrackVMuonAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonPickyTrackVMuonAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonPickyTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonPickyTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' from Validation.RecoMuon.muonValidation_cff import tevMuonDytTrackVMuonAssoc tevMuonDytTrackVMuonAssocFS = tevMuonDytTrackVMuonAssoc.clone() tevMuonDytTrackVMuonAssocFS.associatormap = 'tpToTevDytMuonAssociationFS' -tevMuonDytTrackVMuonAssocFS.label_tp_effic = 'mergedtruth:MergedTrackTruth' -tevMuonDytTrackVMuonAssocFS.label_tp_fake = 'mergedtruth:MergedTrackTruth' +tevMuonDytTrackVMuonAssocFS.label_tp_effic = 'mix:MergedTrackTruth' +tevMuonDytTrackVMuonAssocFS.label_tp_fake = 'mix:MergedTrackTruth' # Configurations for RecoMuonValidators from Validation.RecoMuon.muonValidation_cff import * diff --git a/Validation/RecoMuon/python/muonValidationHLTFastSim_cff.py b/Validation/RecoMuon/python/muonValidationHLTFastSim_cff.py index d72a66415a8c1..62a5287ba86d9 100644 --- a/Validation/RecoMuon/python/muonValidationHLTFastSim_cff.py +++ b/Validation/RecoMuon/python/muonValidationHLTFastSim_cff.py @@ -6,50 +6,50 @@ l2MuonTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l2MuonTrackV.clone() l2MuonTrackFSV.associatormap = 'tpToL2TrackAssociationFS' -l2MuonTrackFSV.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -l2MuonTrackFSV.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +l2MuonTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l2MuonTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l2MuonTrackFSV.beamSpot = 'offlineBeamSpot' l2UpdMuonTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l2UpdMuonTrackV.clone() l2UpdMuonTrackFSV.associatormap = 'tpToL2UpdTrackAssociationFS' -l2UpdMuonTrackFSV.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -l2UpdMuonTrackFSV.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +l2UpdMuonTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l2UpdMuonTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l2UpdMuonTrackFSV.beamSpot = 'offlineBeamSpot' l3TkMuonTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l3TkMuonTrackV.clone() l3TkMuonTrackFSV.associatormap = 'tpToL3TkTrackTrackAssociationFS' -l3TkMuonTrackFSV.label_tp_effic = 'mergedtruth:MergedTrackTruth' -l3TkMuonTrackFSV.label_tp_fake = 'mergedtruth:MergedTrackTruth' +l3TkMuonTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l3TkMuonTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l3TkMuonTrackFSV.beamSpot = 'offlineBeamSpot' l3MuonTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l3MuonTrackV.clone() l3MuonTrackFSV.associatormap = 'tpToL3TrackAssociationFS' -l3MuonTrackFSV.label_tp_effic = 'mergedtruth:MergedTrackTruth' -l3MuonTrackFSV.label_tp_fake = 'mergedtruth:MergedTrackTruth' +l3MuonTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l3MuonTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l3MuonTrackFSV.beamSpot = 'offlineBeamSpot' l2MuonMuTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l2MuonMuTrackV.clone() l2MuonMuTrackFSV.associatormap = 'tpToL2MuonAssociationFS' -l2MuonMuTrackFSV.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -l2MuonMuTrackFSV.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +l2MuonMuTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l2MuonMuTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l2MuonMuTrackFSV.beamSpot = 'offlineBeamSpot' l2UpdMuonMuTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l2UpdMuonMuTrackV.clone() l2UpdMuonMuTrackFSV.associatormap = 'tpToL2UpdMuonAssociationFS' -l2UpdMuonMuTrackFSV.label_tp_effic = 'mergedtruthMuon:MergedTrackTruth' -l2UpdMuonMuTrackFSV.label_tp_fake = 'mergedtruthMuon:MergedTrackTruth' +l2UpdMuonMuTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l2UpdMuonMuTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l2UpdMuonMuTrackFSV.beamSpot = 'offlineBeamSpot' l3TkMuonMuTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l3TkMuonMuTrackV.clone() l3TkMuonMuTrackFSV.associatormap = 'tpToL3TkMuonAssociationFS' -l3TkMuonMuTrackFSV.label_tp_effic = 'mergedtruth:MergedTrackTruth' -l3TkMuonMuTrackFSV.label_tp_fake = 'mergedtruth:MergedTrackTruth' +l3TkMuonMuTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l3TkMuonMuTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l3TkMuonMuTrackFSV.beamSpot = 'offlineBeamSpot' l3MuonMuTrackFSV = Validation.RecoMuon.muonValidationHLT_cff.l3MuonMuTrackV.clone() l3MuonMuTrackFSV.associatormap = 'tpToL3MuonAssociationFS' -l3MuonMuTrackFSV.label_tp_effic = 'mergedtruth:MergedTrackTruth' -l3MuonMuTrackFSV.label_tp_fake = 'mergedtruth:MergedTrackTruth' +l3MuonMuTrackFSV.label_tp_effic = 'mix:MergedTrackTruth' +l3MuonMuTrackFSV.label_tp_fake = 'mix:MergedTrackTruth' l3MuonMuTrackFSV.beamSpot = 'offlineBeamSpot' # # Muon validation sequence diff --git a/Validation/RecoMuon/python/muonValidationHLT_cff.py b/Validation/RecoMuon/python/muonValidationHLT_cff.py index ff5774d0121ce..0a39cd400f8e5 100644 --- a/Validation/RecoMuon/python/muonValidationHLT_cff.py +++ b/Validation/RecoMuon/python/muonValidationHLT_cff.py @@ -7,7 +7,7 @@ import Validation.RecoMuon.MuonTrackValidator_cfi l2MuonTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l2MuonTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l2MuonTrackV.label_tp_effic = 'mix:MergedTrackTruth' l2MuonTrackV.label = ('hltL2Muons',) l2MuonTrackV.associatormap = 'tpToL2TrackAssociation' l2MuonTrackV.associators = ('TrackAssociatorByDeltaR',) @@ -18,7 +18,7 @@ l2MuonTrackV.usemuon = True l2UpdMuonTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l2UpdMuonTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l2UpdMuonTrackV.label_tp_effic = 'mix:MergedTrackTruth' l2UpdMuonTrackV.label = ('hltL2Muons:UpdatedAtVtx',) l2UpdMuonTrackV.associatormap = 'tpToL2UpdTrackAssociation' l2UpdMuonTrackV.associators = ('TrackAssociatorByDeltaR',) @@ -29,7 +29,7 @@ l2UpdMuonTrackV.usemuon = True l3MuonTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l3MuonTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l3MuonTrackV.label_tp_effic = 'mix:MergedTrackTruth' l3MuonTrackV.associatormap = 'tpToL3TrackAssociation' l3MuonTrackV.label = ('hltL3Muons',) l3MuonTrackV.associators = ('TrackAssociatorByDeltaR',) @@ -40,7 +40,7 @@ l3MuonTrackV.usemuon = True l3TkMuonTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l3TkMuonTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l3TkMuonTrackV.label_tp_effic = 'mix:MergedTrackTruth' l3TkMuonTrackV.associatormap = 'tpToL3TkTrackTrackAssociation' l3TkMuonTrackV.label = ('hltL3TkTracksFromL2',) l3TkMuonTrackV.associators = ('OnlineTrackAssociatorByHits',) @@ -51,7 +51,7 @@ l3TkMuonTrackV.usemuon = False l3TkMuonMuTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l3TkMuonMuTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l3TkMuonMuTrackV.label_tp_effic = 'mix:MergedTrackTruth' l3TkMuonMuTrackV.associatormap = 'tpToL3TkMuonAssociation' l3TkMuonMuTrackV.label = ('hltL3TkTracksFromL2:',) l3TkMuonMuTrackV.associators = ('MuonAssociationByHits',) @@ -62,7 +62,7 @@ l3TkMuonMuTrackV.usemuon = False l2MuonMuTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l2MuonMuTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l2MuonMuTrackV.label_tp_effic = 'mix:MergedTrackTruth' l2MuonMuTrackV.associatormap = 'tpToL2MuonAssociation' l2MuonMuTrackV.label = ('hltL2Muons',) l2MuonMuTrackV.associators = ('MuonAssociationByHits',) @@ -73,7 +73,7 @@ l2MuonMuTrackV.usemuon = True l2UpdMuonMuTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l2UpdMuonMuTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l2UpdMuonMuTrackV.label_tp_effic = 'mix:MergedTrackTruth' l2UpdMuonMuTrackV.associatormap = 'tpToL2UpdMuonAssociation' l2UpdMuonMuTrackV.label = ('hltL2Muons:UpdatedAtVtx',) l2UpdMuonMuTrackV.associators = ('MuonAssociationByHits',) @@ -84,7 +84,7 @@ l2UpdMuonMuTrackV.usemuon = True l3MuonMuTrackV = Validation.RecoMuon.MuonTrackValidator_cfi.muonTrackValidator.clone() -l3MuonMuTrackV.label_tp_effic = 'mergedtruth:MergedTrackTruth' +l3MuonMuTrackV.label_tp_effic = 'mix:MergedTrackTruth' l3MuonMuTrackV.associatormap = 'tpToL3MuonAssociation' l3MuonMuTrackV.label = ('hltL3Muons:',) l3MuonMuTrackV.associators = ('MuonAssociationByHits',) diff --git a/Validation/RecoMuon/python/muonValidation_cff.py b/Validation/RecoMuon/python/muonValidation_cff.py index 4d743e29e06bf..7da05031057d6 100644 --- a/Validation/RecoMuon/python/muonValidation_cff.py +++ b/Validation/RecoMuon/python/muonValidation_cff.py @@ -204,7 +204,7 @@ muonAssociatorByHitsESProducerNoSimHits_trk.UseMuon = False recoMuonVMuAssoc_trk = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_trk.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_Trk' -recoMuonVMuAssoc_trk.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_trk.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_trk.muAssocLabel = 'muonAssociatorByHits_NoSimHits_tracker' recoMuonVMuAssoc_trk.trackType = 'inner' recoMuonVMuAssoc_trk.selection = "isTrackerMuon" @@ -217,7 +217,7 @@ recoMuonVMuAssoc_trkPF = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_trkPF.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_TrkPF' recoMuonVMuAssoc_trkPF.usePFMuon = True -recoMuonVMuAssoc_trkPF.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_trkPF.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_trkPF.muAssocLabel = 'muonAssociatorByHits_NoSimHits_trackerPF' recoMuonVMuAssoc_trkPF.trackType = 'inner' recoMuonVMuAssoc_trkPF.selection = "isTrackerMuon & isPFMuon" @@ -229,7 +229,7 @@ muonAssociatorByHitsESProducerNoSimHits_sta.UseMuon = True recoMuonVMuAssoc_sta = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_sta.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_Sta' -recoMuonVMuAssoc_sta.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_sta.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_sta.muAssocLabel = 'muonAssociatorByHits_NoSimHits_standalone' recoMuonVMuAssoc_sta.trackType = 'outer' recoMuonVMuAssoc_sta.selection = "isStandAloneMuon" @@ -242,7 +242,7 @@ recoMuonVMuAssoc_staPF = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_staPF.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_StaPF' recoMuonVMuAssoc_staPF.usePFMuon = True -recoMuonVMuAssoc_staPF.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_staPF.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_staPF.muAssocLabel = 'muonAssociatorByHits_NoSimHits_standalonePF' recoMuonVMuAssoc_staPF.trackType = 'outer' recoMuonVMuAssoc_staPF.selection = "isStandAloneMuon & isPFMuon" @@ -254,7 +254,7 @@ muonAssociatorByHitsESProducerNoSimHits_glb.UseMuon = True recoMuonVMuAssoc_glb = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_glb.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_Glb' -recoMuonVMuAssoc_glb.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_glb.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_glb.muAssocLabel = 'muonAssociatorByHits_NoSimHits_global' recoMuonVMuAssoc_glb.trackType = 'global' recoMuonVMuAssoc_glb.selection = "isGlobalMuon" @@ -267,7 +267,7 @@ recoMuonVMuAssoc_glbPF = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_glbPF.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_GlbPF' recoMuonVMuAssoc_glbPF.usePFMuon = True -recoMuonVMuAssoc_glbPF.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_glbPF.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_glbPF.muAssocLabel = 'muonAssociatorByHits_NoSimHits_globalPF' recoMuonVMuAssoc_glbPF.trackType = 'global' recoMuonVMuAssoc_glbPF.selection = "isGlobalMuon & isPFMuon" @@ -279,7 +279,7 @@ muonAssociatorByHitsESProducerNoSimHits_tgt.UseMuon = True recoMuonVMuAssoc_tgt = Validation.RecoMuon.RecoMuonValidator_cfi.recoMuonValidator.clone() recoMuonVMuAssoc_tgt.subDir = 'Muons/RecoMuonV/RecoMuon_MuonAssoc_Tgt' -recoMuonVMuAssoc_tgt.simLabel = 'mergedtruth:MergedTrackTruth' +recoMuonVMuAssoc_tgt.simLabel = 'mix:MergedTrackTruth' recoMuonVMuAssoc_tgt.muAssocLabel = 'muonAssociatorByHits_NoSimHits_tight' recoMuonVMuAssoc_tgt.trackType = 'global' recoMuonVMuAssoc_tgt.selection = 'isGlobalMuon' diff --git a/Validation/RecoMuon/python/selectors_cff.py b/Validation/RecoMuon/python/selectors_cff.py index 16203a888b3f3..c3d7cf694dd45 100644 --- a/Validation/RecoMuon/python/selectors_cff.py +++ b/Validation/RecoMuon/python/selectors_cff.py @@ -2,7 +2,7 @@ # TrackingParticle (MC truth) selectors muonTPSet = cms.PSet( - src = cms.InputTag("mergedtruth", "MergedTrackTruth"), + src = cms.InputTag("mix", "MergedTrackTruth"), pdgId = cms.vint32(13, -13), tip = cms.double(3.5), lip = cms.double(30.0),