diff --git a/FastSimulation/Configuration/python/Validation_cff.py b/FastSimulation/Configuration/python/Validation_cff.py index 0117daaebadab..e44336e0d6abc 100644 --- a/FastSimulation/Configuration/python/Validation_cff.py +++ b/FastSimulation/Configuration/python/Validation_cff.py @@ -1,14 +1,21 @@ import FWCore.ParameterSet.Config as cms from Validation.EventGenerator.BasicGenValidation_cff import * -from FastSimulation.Validation.globalValidation_cff import * +from Validation.Configuration.globalValidation_cff import * from HLTriggerOffline.Common.HLTValidation_cff import * from DQM.Physics.DQMPhysics_cff import * from Validation.RecoMET.METRelValForDQM_cff import metPreValidSeq from Validation.RecoJets.JetValidation_cff import jetPreValidSeq -prevalidation = cms.Sequence(globalPrevalidation+hltassociation+metPreValidSeq+jetPreValidSeq) -prevalidation_preprod = cms.Sequence(globalPrevalidation) -prevalidation_prod = cms.Sequence(globalPrevalidation) -validation = cms.Sequence(basicGenTest_seq+globalValidation+hltvalidation+dqmPhysics) -validation_preprod = cms.Sequence(basicGenTest_seq+globalValidation_preprod+hltvalidation_preprod) -validation_prod = cms.Sequence(basicGenTest_seq+hltvalidation_prod) +# main sequences +prevalidation = cms.Sequence(globalPrevalidation * hltassociation * metPreValidSeq * jetPreValidSeq) +validation = cms.Sequence(cms.SequencePlaceholder("mix") + +genvalid_all + *globalValidation + *hltvalidation) + +# hlt-free versions +prevalidation_noHLT = prevalidation.copy() +prevalidation_noHLT.remove(hltassociation) +validation_noHLT = validation.copy() +validation_noHLT.remove(hltvalidation) +allvalidation_noHLT = cms.Sequence(prevalidation_noHLT+validation_noHLT) diff --git a/FastSimulation/Validation/python/globalValidation_cff.py b/FastSimulation/Validation/python/globalValidation_cff.py index 314329ba82301..050d787122189 100644 --- a/FastSimulation/Validation/python/globalValidation_cff.py +++ b/FastSimulation/Validation/python/globalValidation_cff.py @@ -2,14 +2,10 @@ # TrackingParticle-SimHit associator from SimGeneral.TrackingAnalysis.simHitTPAssociation_cfi import * -simHitTPAssocProducer.simHitSrc = cms.VInputTag(cms.InputTag('famosSimHits','TrackerHits'), - cms.InputTag("MuonSimHits","MuonCSCHits"), - cms.InputTag("MuonSimHits","MuonDTHits"), - cms.InputTag("MuonSimHits","MuonRPCHits")) +from Validation.TrackingMCTruth.trackingTruthValidation_cfi import * from Validation.RecoMET.METRelValForDQM_cff import * -from Validation.TrackingMCTruth.trackingTruthValidation_cfi import * from Validation.RecoTrack.TrackValidation_cff import * from Validation.RecoTrack.TrajectorySeedValidation_cff import * from Validation.RecoJets.JetValidation_cff import * diff --git a/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py b/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py index 52748f85826e8..522a24be9d682 100644 --- a/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py +++ b/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py @@ -18,3 +18,11 @@ cms.InputTag('g4SimHits','TrackerHitsPixelEndcapHighTof') ), trackingParticleSrc = cms.InputTag('mix', 'MergedTrackTruth') ) + +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + simHitTPAssocProducer.simHitSrc = cms.VInputTag(cms.InputTag('famosSimHits','TrackerHits'), + cms.InputTag("MuonSimHits","MuonCSCHits"), + cms.InputTag("MuonSimHits","MuonDTHits"), + cms.InputTag("MuonSimHits","MuonRPCHits")) + diff --git a/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py b/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py index 416d648d49970..f46c4cc8caecd 100644 --- a/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py +++ b/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py @@ -92,6 +92,22 @@ inputCSCSegmentCollection = cms.InputTag("cscSegments"), ) + +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): +#if True: + obj = muonAssociatorByHitsCommonParameters + obj.simtracksTag = "famosSimHits" + obj.DTsimhitsTag = "MuonSimHits:MuonDTHits" + obj.CSCsimHitsTag = "MuonSimHits:MuonCSCHits" + obj.RPCsimhitsTag = "MuonSimHits:MuonRPCHits" + obj.simtracksXFTag = "mix:famosSimHits" + obj.DTsimhitsXFTag = "mix:MuonSimHitsMuonDTHits" + obj.CSCsimHitsXFTag = "mix:MuonSimHitsMuonCSCHits" + obj.RPCsimhitsXFTag = "mix:MuonSimHitsMuonRPCHits" + obj.ROUList = ['famosSimHitsTrackerHits'] + + muonAssociatorByHits = cms.EDProducer("MuonAssociatorEDProducer", # COMMON CONFIGURATION muonAssociatorByHitsCommonParameters, @@ -123,14 +139,4 @@ ignoreMissingTrackCollection = cms.untracked.bool(False), ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): - muonAssociatorByHits.simtracksTag = "famosSimHits" - muonAssociatorByHits.DTsimhitsTag = "MuonSimHits:MuonDTHits" - muonAssociatorByHits.CSCsimHitsTag = "MuonSimHits:MuonCSCHits" - muonAssociatorByHits.RPCsimhitsTag = "MuonSimHits:MuonRPCHits" - muonAssociatorByHits.simtracksXFTag = "mix:famosSimHits" - muonAssociatorByHits.DTsimhitsXFTag = "mix:MuonSimHitsMuonDTHits" - muonAssociatorByHits.CSCsimHitsXFTag = "mix:MuonSimHitsMuonCSCHits" - muonAssociatorByHits.RPCsimhitsXFTag = "mix:MuonSimHitsMuonRPCHits" - muonAssociatorByHits.ROUList = ['famosSimHitsTrackerHits'] + diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index f6784dd5b12f4..270fe383aad71 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -1,11 +1,11 @@ import FWCore.ParameterSet.Config as cms from SimGeneral.TrackingAnalysis.simHitTPAssociation_cfi import * -from Validation.TrackerHits.trackerHitsValidation_cff import * -from Validation.TrackerDigis.trackerDigisValidation_cff import * -from Validation.TrackerRecHits.trackerRecHitsValidation_cff import * -from Validation.TrackingMCTruth.trackingTruthValidation_cfi import * -from Validation.RecoTrack.SiTrackingRecHitsValid_cff import * +from Validation.TrackerHits.trackerHitsValidation_cff import * # not in fs +from Validation.TrackerDigis.trackerDigisValidation_cff import * # not in fs +from Validation.TrackerRecHits.trackerRecHitsValidation_cff import * # not in fs +from Validation.TrackingMCTruth.trackingTruthValidation_cfi import * +from Validation.RecoTrack.SiTrackingRecHitsValid_cff import * # not in fs from Validation.RecoTrack.TrackValidation_cff import * from Validation.EcalHits.ecalSimHitsValidationSequence_cff import * from Validation.EcalDigis.ecalDigisValidationSequence_cff import * @@ -91,6 +91,14 @@ + L1Validator ) + +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + globalValidation.remove(trackerDigisValidation) + globalValidation.remove(trackerRecHitsValidation) + globalValidation.remove(trackingRecHitsValid) + globalValidation.remove(mixCollectionValidation) # can be put back, once mixing is migrated to fastsim era + #lite tracking validator to be used in the Validation matrix liteTrackValidator=trackValidator.clone() liteTrackValidator.label=cms.VInputTag(cms.InputTag("generalTracks"), diff --git a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py index f7b27ae0bad6b..75e442301d427 100644 --- a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py +++ b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py @@ -52,3 +52,10 @@ dtLocalRecoValidation = cms.Sequence(rechivalidation*seg2dvalidation*seg2dsuperphivalidation*seg4dvalidation) dtLocalRecoValidation_no2D = cms.Sequence(rechivalidation*seg2dsuperphivalidation*seg4dvalidation) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + rechivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg2dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg2dsuperphivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg4dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + diff --git a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py index 70b456f0cc393..93f5c0c0fd078 100644 --- a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py +++ b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py @@ -52,3 +52,9 @@ dtLocalRecoValidation = cms.Sequence(rechivalidation*seg2dvalidation*seg2dsuperphivalidation*seg4dvalidation) dtLocalRecoValidation_no2D = cms.Sequence(rechivalidation*seg2dsuperphivalidation*seg4dvalidation) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + rechivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg2dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg2dsuperphivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") + seg4dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") diff --git a/Validation/EcalDigis/python/ecalDigisValidation_cfi.py b/Validation/EcalDigis/python/ecalDigisValidation_cfi.py index 967269146169f..c6648bfc64df4 100644 --- a/Validation/EcalDigis/python/ecalDigisValidation_cfi.py +++ b/Validation/EcalDigis/python/ecalDigisValidation_cfi.py @@ -10,4 +10,8 @@ moduleLabelG4 = cms.string('g4SimHits') ) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + ecalDigisValidation.moduleLabelG4 = cms.string('famosSimHits') + diff --git a/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py b/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py index f589f3d9cf09a..adfb16aeb187e 100644 --- a/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py +++ b/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py @@ -83,3 +83,7 @@ +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + ecalSelectiveReadoutValidation.EbSimHitCollection = cms.InputTag("famosSimHits","EcalHitsEB") + ecalSelectiveReadoutValidation.EeSimHitCollection = cms.InputTag("famosSimHits","EcalHitsEE") diff --git a/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py b/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py index a5d520405cb99..90320ab7a8498 100644 --- a/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py +++ b/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py @@ -10,4 +10,6 @@ moduleLabelG4 = cms.string('g4SimHits') ) - +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + ecalSimHitsValidation.moduleLabelG4 = cms.string("famosSimHits") diff --git a/Validation/HcalHits/python/HcalSimHitStudy_cfi.py b/Validation/HcalHits/python/HcalSimHitStudy_cfi.py index 2a82b3e22ea0f..498436f64aa34 100644 --- a/Validation/HcalHits/python/HcalSimHitStudy_cfi.py +++ b/Validation/HcalHits/python/HcalSimHitStudy_cfi.py @@ -8,4 +8,7 @@ ) - +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + hcalSimHitStudy.ModuleLabel = cms.untracked.string('famosSimHits') + diff --git a/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py b/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py index e44aab4d7cc6d..cfbbca9604cf0 100644 --- a/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py +++ b/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py @@ -7,5 +7,9 @@ TestNumber = cms.untracked.bool(False), ) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + simHitsValidationHcal.ModuleLabel = cms.untracked.string("famosSimHits") + diff --git a/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py b/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py index 7fb49640a96af..d490f6c4659ab 100644 --- a/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py +++ b/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py @@ -11,5 +11,8 @@ doSim = cms.bool(False) ) +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + cscDigiValidation.simHitsTag = cms.InputTag("mix", "MuonSimHitsMuonCSCHits") diff --git a/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py b/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py index e4677e0e10b13..58476d1e25da8 100644 --- a/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py +++ b/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py @@ -11,5 +11,6 @@ verbose = cms.untracked.bool(False) ) - - +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + muondtdigianalyzer.SimHitLabel = cms.InputTag("MuonSimHits","MuonDTHits") diff --git a/Validation/MuonHits/python/muonHitsValidation_cfi.py b/Validation/MuonHits/python/muonHitsValidation_cfi.py index 1e3b83cf5a96b..4e2c7bed6f533 100644 --- a/Validation/MuonHits/python/muonHitsValidation_cfi.py +++ b/Validation/MuonHits/python/muonHitsValidation_cfi.py @@ -16,4 +16,9 @@ Label = cms.string('Hits') ) - +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + validSimHit.DTHitsSrc = cms.InputTag("MuonSimHits","MuonDTHits") + validSimHit.CSCHitsSrc = cms.InputTag("MuonSimHits","MuonCSCHits") + validSimHit.RPCHitsSrc = cms.InputTag("MuonSimHits","MuonRPCHits") + diff --git a/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py b/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py index 6041d4b8e78c2..8b73bc21b3056 100644 --- a/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py +++ b/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py @@ -11,5 +11,7 @@ outputFile = cms.untracked.string('') ) - - +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + validationMuonRPCDigis.simHitTag = cms.untracked.InputTag("MuonSimHits","MuonRPCHits") + diff --git a/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py b/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py index bc6ed18f10987..41b5d1e5ada04 100644 --- a/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py +++ b/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py @@ -10,3 +10,8 @@ ) rpcRecHitValidation_step = cms.Sequence(rpcRecHitV) + +from Configuration.StandardSequences.Eras import eras +if eras.fastSim.isChosen(): + rpcRecHitV.simHit = cms.InputTag("MuonSimHits","MuonRPCHits") +