Merge pull request #12642 from lveldere/fastsim-era-globalValidation2

Fastsim: use fastsim era in global validation

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1269,7 +1269,7 @@ def identityFS(wf):
                      '--filetype':'DQM',
                      '--era' : 'Run2_25ns',
                      }
-steps['HARVESTFS']={'-s':'HARVESTING:validationHarvestingFS',
+steps['HARVESTFS']={'-s':'HARVESTING:validationHarvesting',
                    '--conditions':'auto:run1_mc',
                    '--mc':'',
                     '--filetype':'DQM',
@@ -1299,7 +1299,7 @@ def identityFS(wf):
 # unSchHarvestOverrides={'-s':'HARVESTING:@standardValidation+@standardDQM+@miniAODValidation+@miniAODDQM'}
 # steps['HARVESTmAODUP15']=merge([unSchHarvestOverrides,steps['HARVESTUP15']])
 
-steps['HARVESTUP15FS']={'-s':'HARVESTING:validationHarvestingFS',
+steps['HARVESTUP15FS']={'-s':'HARVESTING:validationHarvesting',
                         '--conditions':'auto:run2_mc',
                         '--mc':'',
                         '--era':'Run2_25ns',
@@ -1546,7 +1546,7 @@ def identityFS(wf):
                                    '--relval':'27000,3000'}
     if cust!=None : upgradeStepDict['FastSim'][k]['--customise']=cust
 
-    upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
+    upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvesting',
                                     '--conditions':gt,
                                     '--mc':'',
                                     '--geometry' : geom,

Configuration/StandardSequences/python/Harvesting_cff.py

@@ -6,8 +6,6 @@
 from Validation.Configuration.postValidation_cff import *
 from HLTriggerOffline.Common.HLTValidationHarvest_cff import *
 
-from FastSimulation.Configuration.Harvesting_cff import *
-
 from Validation.RecoHI.HarvestingHI_cff import *
 from Validation.RecoJets.JetPostProcessor_cff import *
 from Validation.RecoMET.METPostProcessor_cff import *
@@ -25,7 +23,9 @@
 # empty (non-hlt) postvalidation sequence here yet
 validationprodHarvesting = cms.Path(hltpostvalidation_prod*postValidation_gen)
 
-validationHarvestingFS = cms.Path(HarvestingFastSim)
+# to be removed in subsequent request
+# kept to avoid too many extra github signatures
+validationHarvestingFS = validationHarvesting.copy()
 
 validationHarvestingHI = cms.Path(postValidationHI)
 

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)

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

@@ -90,6 +90,20 @@
                                  + L1Validator
 )
 
+
+from Configuration.StandardSequences.Eras import eras
+if eras.fastSim.isChosen():
+    # fastsim has no tracker digis and different tracker rechit and simhit structure => skipp
+    globalValidation.remove(trackerHitsValidation)
+    globalValidation.remove(trackerDigisValidation)
+    globalValidation.remove(trackerRecHitsValidation)
+    globalValidation.remove(trackingRecHitsValid)
+    # globalValidation.remove(mixCollectionValidation) # can be put back, once mixing is migrated to fastsim era
+    # the following depends on crossing frame of ecal simhits, which is a bit hard to implement in the fastsim workflow
+    # besides: is this cross frame doing something, or is it a relic from the past?
+    globalValidation.remove(ecalDigisValidationSequence)
+    globalValidation.remove(ecalRecHitsValidationSequence)
+
 #lite tracking validator to be used in the Validation matrix
 liteTrackValidator=trackValidator.clone()
 liteTrackValidator.label=cms.VInputTag(cms.InputTag("generalTracks"),

Validation/Configuration/python/postValidation_cff.py

@@ -13,7 +13,6 @@
 from Validation.RecoParticleFlow.PFValidationClient_cff import *
 from Validation.RPCRecHits.postValidation_cfi import *
 from Validation.RecoTau.DQMMCValidation_cfi import *
-from Validation.RecoEgamma.photonFastSimPostProcessor_cff import *
 from Validation.RecoVertex.PostProcessorVertex_cff import *
 from Validation.RecoMET.METPostProcessor_cff import *
 from DQMOffline.RecoB.dqmCollector_cff import *
@@ -44,10 +43,10 @@
 
 
 postValidation_fastsim = cms.Sequence(
-      recoMuonPostProcessorsFastSim
+      recoMuonPostProcessors
     + postProcessorTrackSequence
     + MuIsoValPostProcessor
-    + fastSimPhotonPostProcessor
+    + photonPostProcessor
     + bTagCollectorSequenceMC
     + runTauEff
 )

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/EcalRecHits/python/ecalRecHitsValidation_cfi.py

@@ -12,4 +12,6 @@
     moduleLabelMC = cms.string('generatorSmeared')
 )
 
-
+from Configuration.StandardSequences.Eras import eras
+if eras.fastSim.isChosen():
+    ecalRecHitsValidation.hitsProducer = "famosSimHits"

Validation/HcalDigis/python/HcalDigisParam_cfi.py

@@ -6,6 +6,11 @@
     digiLabel	= cms.InputTag("hcalDigis"),
     mode	= cms.untracked.string('multi'),
     hcalselector= cms.untracked.string('all'),
-    mc		= cms.untracked.string('yes')
+    mc		= cms.untracked.string('yes'),
+    simHits     = cms.untracked.InputTag("g4SimHits","HcalHits")
 )
 
+from Configuration.StandardSequences.Eras import eras
+if eras.fastSim.isChosen():
+    hcaldigisAnalyzer.simHits = cms.untracked.InputTag("famosSimHits","HcalHits")
+

Validation/HcalDigis/src/HcalDigisValidation.cc

@@ -31,7 +31,10 @@ HcalDigisValidation::HcalDigisValidation(const edm::ParameterSet& iConfig) {
     dirName_ = iConfig.getUntrackedParameter<std::string > ("dirName", "HcalDigisV/HcalDigiTask");
 
     // register for data access
-    tok_mc_ = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits", "HcalHits"));
+    if (iConfig.exists("simHits"))
+    {
+	tok_mc_ = consumes<edm::PCaloHitContainer>(iConfig.getUntrackedParameter<edm::InputTag>("simHits"));
+    }
     tok_hbhe_ = consumes<edm::SortedCollection<HBHEDataFrame> >(inputTag_);
     tok_ho_ = consumes<edm::SortedCollection<HODataFrame> >(inputTag_);
     tok_hf_ = consumes<edm::SortedCollection<HFDataFrame> >(inputTag_);

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/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py

@@ -8,3 +8,8 @@
 NoiseRatesValidation = Validation.HcalRecHits.HcalRecHitParam_cfi.hcalNoiseRates.clone()
 
 hcalRecHitsValidationSequence = cms.Sequence(NoiseRatesValidation*RecHitsValidation)
+
+# fastsim hasn't got the right noise collection for the moment => no noise validation
+from Configuration.StandardSequences.Eras import eras
+if eras.fastSim.isChosen():
+    hcalRecHitsValidationSequence.remove(NoiseRatesValidation)

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/MuonIdentification/python/muonIdVal_cfi.py

@@ -19,3 +19,8 @@
     makeShowerInformationPlots    = cms.untracked.bool(True),
     baseFolder                    = cms.untracked.string("Muons/MuonIdentificationV")
 )
+
+# fastsim has no cosmic muon veto in place
+from Configuration.StandardSequences.Eras import eras
+if eras.fastSim.isChosen():
+    muonIdVal.makeCosmicCompatibilityPlots = False

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