intermediate commit

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)

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 *

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"))
+

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']
+

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"),

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")
+

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")

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')
+
 

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")

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")

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')
+

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")
+
 
 

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")
 
 

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")

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")
+

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")
+

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")
+