diff --git a/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py b/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py index 9329e2c3e85f8..6118ac976ed7d 100644 --- a/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py +++ b/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py @@ -1,108 +1,106 @@ -import FWCore.ParameterSet.Config as cms - +import FWCore.ParameterSet.Config as cms + from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 -process = cms.Process('TEST',Run2_2018) - -### RANDOM setting (change last digit(s) to make runs different !) -process.load("Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff") - -process.load("Configuration.StandardSequences.Simulation_cff") -process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("SimGeneral.MixingModule.mixNoPU_cfi") -process.load('Configuration/StandardSequences/DigiToRaw_cff') -process.load('Configuration/StandardSequences/RawToDigi_cff') - -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['phase1_2018_realistic'] - -process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") -process.load("Configuration.StandardSequences.GeometryDB_cff") -process.load("Configuration.StandardSequences.MagneticField_cff") -process.g4SimHits.UseMagneticField = False - -process.load("DQMServices.Core.DQMStore_cfi") -process.load("DQMServices.Components.MEtoEDMConverter_cfi") - -process.maxEvents = cms.untracked.PSet( - input = cms.untracked.int32(1000) -) -# Input source -process.source = cms.Source("PoolSource", - firstEvent = cms.untracked.uint32(XXXXX), - fileNames = cms.untracked.vstring('file:mc.root') -) - -process.FEVT = cms.OutputModule("PoolOutputModule", - outputCommands = cms.untracked.vstring('drop *', 'keep *_MEtoEDMConverter_*_*'), - splitLevel = cms.untracked.int32(0), - fileName = cms.untracked.string("output.root") -) - -process.VtxSmeared.SigmaX = 0.00001 -process.VtxSmeared.SigmaY = 0.00001 -process.VtxSmeared.SigmaZ = 0.00001 - -process.load("Validation.HcalHits.HcalSimHitsValidation_cfi") -process.HcalSimHitsAnalyser.outputFile = cms.untracked.string('HcalSimHitsValidation.root') - -process.load("Validation.HcalDigis.HcalDigisParam_cfi") -process.hcaldigisAnalyzer.outputFile = cms.untracked.string('HcalDigisValidationRelVal.root') - -process.load("Validation.HcalRecHits.HcalRecHitParam_cfi") - -process.load("Validation.CaloTowers.CaloTowersParam_cfi") -process.calotowersAnalyzer.outputFile = cms.untracked.string('CaloTowersValidationRelVal.root') - - -process.load("Validation.RecoParticleFlow.PFCluster_cfi") -process.pfclusterAnalyzer.outputFile = cms.untracked.string('PFcluster.root') - -#------------- CUSTOMIZATION - replace hbhereco with hbheprereco -delattr(process,"hbhereco") -process.hbhereco = process.hbheprereco.clone() -process.hcalLocalRecoSequence = cms.Sequence(process.hbhereco+process.hfprereco+process.hfreco+process.horeco) - - -#---------- PATH -# -- NB: for vertex smearing the Label should be: "unsmeared" -# for GEN produced since 760pre6, for older GEN - just "": - -process.VtxSmeared.src = cms.InputTag("generator", "") -process.generatorSmeared = cms.EDProducer("GeneratorSmearedProducer") -process.g4SimHits.Generator.HepMCProductLabel = cms.InputTag('VtxSmeared') - - -process.p = cms.Path( - process.VtxSmeared * - process.generatorSmeared * - process.g4SimHits * - process.mix * - process.ecalDigiSequence * - process.hcalDigiSequence * - process.addPileupInfo * - process.bunchSpacingProducer * - process.ecalPacker * - process.esDigiToRaw * - process.hcalRawData * - process.rawDataCollector * - process.ecalDigis * - process.ecalPreshowerDigis * - process.hcalDigis * - process.castorDigis * - process.calolocalreco * - process.caloTowersRec * - process.hcalnoise * - process.particleFlowCluster * - # - process.HcalSimHitsAnalyser * - process.hcaldigisAnalyzer * - process.calotowersAnalyzer * - process.pfclusterAnalyzer * - process.hcalRecoAnalyzer * - # - process.MEtoEDMConverter -) - -process.outpath = cms.EndPath(process.FEVT) - +process = cms.Process('TEST',Run2_2018) + +### RANDOM setting (change last digit(s) to make runs different !) +process.load("Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff") + +process.load("Configuration.StandardSequences.Simulation_cff") +process.load("Configuration.StandardSequences.Reconstruction_cff") +process.load("SimGeneral.MixingModule.mixNoPU_cfi") +process.load('Configuration/StandardSequences/DigiToRaw_cff') +process.load('Configuration/StandardSequences/RawToDigi_cff') + +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.autoCond import autoCond +process.GlobalTag.globaltag = autoCond['phase1_2018_realistic'] + +process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi") +process.load("Configuration.StandardSequences.GeometryDB_cff") +process.load("Configuration.StandardSequences.MagneticField_cff") +process.g4SimHits.UseMagneticField = False + +process.load("DQMServices.Core.DQMStore_cfi") +process.load("DQMServices.Components.MEtoEDMConverter_cfi") + +process.maxEvents = cms.untracked.PSet( + input = cms.untracked.int32(1000) +) +# Input source +process.source = cms.Source("PoolSource", + firstEvent = cms.untracked.uint32(XXXXX), + fileNames = cms.untracked.vstring('file:mc.root') +) + +process.FEVT = cms.OutputModule("PoolOutputModule", + outputCommands = cms.untracked.vstring('drop *', 'keep *_MEtoEDMConverter_*_*'), + splitLevel = cms.untracked.int32(0), + fileName = cms.untracked.string("output.root") +) + +process.VtxSmeared.SigmaX = 0.00001 +process.VtxSmeared.SigmaY = 0.00001 +process.VtxSmeared.SigmaZ = 0.00001 + +process.load("Validation.HcalHits.HcalSimHitsValidation_cfi") +process.HcalSimHitsAnalyser.outputFile = cms.untracked.string('HcalSimHitsValidation.root') + +process.load("Validation.HcalDigis.HcalDigisParam_cfi") +process.hcaldigisAnalyzer.outputFile = cms.untracked.string('HcalDigisValidationRelVal.root') + +process.load("Validation.HcalRecHits.HcalRecHitParam_cfi") + +process.load("Validation.CaloTowers.CaloTowersParam_cfi") +process.calotowersAnalyzer.outputFile = cms.untracked.string('CaloTowersValidationRelVal.root') + +process.load("Validation.RecoParticleFlow.pfClusterValidation_cfi") + +#------------- CUSTOMIZATION - replace hbhereco with hbheprereco +delattr(process,"hbhereco") +process.hbhereco = process.hbheprereco.clone() +process.hcalLocalRecoSequence = cms.Sequence(process.hbhereco+process.hfprereco+process.hfreco+process.horeco) + + +#---------- PATH +# -- NB: for vertex smearing the Label should be: "unsmeared" +# for GEN produced since 760pre6, for older GEN - just "": + +process.VtxSmeared.src = cms.InputTag("generator", "") +process.generatorSmeared = cms.EDProducer("GeneratorSmearedProducer") +process.g4SimHits.Generator.HepMCProductLabel = cms.InputTag('VtxSmeared') + + +process.p = cms.Path( + process.VtxSmeared * + process.generatorSmeared * + process.g4SimHits * + process.mix * + process.ecalDigiSequence * + process.hcalDigiSequence * + process.addPileupInfo * + process.bunchSpacingProducer * + process.ecalPacker * + process.esDigiToRaw * + process.hcalRawData * + process.rawDataCollector * + process.ecalDigis * + process.ecalPreshowerDigis * + process.hcalDigis * + process.castorDigis * + process.calolocalreco * + process.caloTowersRec * + process.hcalnoise * + process.particleFlowCluster * + # + process.HcalSimHitsAnalyser * + process.hcaldigisAnalyzer * + process.calotowersAnalyzer * + process.pfClusterValidation * + process.hcalRecoAnalyzer * + # + process.MEtoEDMConverter +) + +process.outpath = cms.EndPath(process.FEVT) + diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index 26e3ba73b7c87..31c04916488ba 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -168,6 +168,7 @@ ecalSimHitsValidationSequence + ecalDigisValidationSequence + ecalRecHitsValidationSequence + + pfClusterCaloOnlyValidationSequence ) # HCAL local reconstruction @@ -191,6 +192,7 @@ + hcaldigisValidationSequence + hcalSimHitStudy + hcalRecHitsOnlyValidationSequence + + pfClusterCaloOnlyValidationSequence ) globalValidationHCALOnly = cms.Sequence( diff --git a/Validation/RecoParticleFlow/python/PFClusterValidation_cff.py b/Validation/RecoParticleFlow/python/PFClusterValidation_cff.py index b9dbfe6700a4a..be64fd1a44123 100644 --- a/Validation/RecoParticleFlow/python/PFClusterValidation_cff.py +++ b/Validation/RecoParticleFlow/python/PFClusterValidation_cff.py @@ -1,4 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Validation.RecoParticleFlow.PFCluster_cfi import pfclusterAnalyzer +from Validation.RecoParticleFlow.pfClusterValidation_cfi import pfClusterValidation -pfClusterValidationSequence = cms.Sequence( pfclusterAnalyzer ) +pfClusterValidationSequence = cms.Sequence( pfClusterValidation ) + +pfClusterCaloOnlyValidation = pfClusterValidation.clone( + pflowClusterHCAL = 'particleFlowClusterHCALOnly', +) + +pfClusterCaloOnlyValidationSequence = cms.Sequence( pfClusterCaloOnlyValidation ) diff --git a/Validation/RecoParticleFlow/python/PFCluster_cfi.py b/Validation/RecoParticleFlow/python/PFCluster_cfi.py deleted file mode 100644 index a5a8db892b292..0000000000000 --- a/Validation/RecoParticleFlow/python/PFCluster_cfi.py +++ /dev/null @@ -1,15 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer -pfclusterAnalyzer = DQMEDAnalyzer('PFClusterValidation', - outputFile = cms.untracked.string(''), - pflowClusterECAL = cms.untracked.InputTag('particleFlowClusterECAL'), - pflowClusterHCAL = cms.untracked.InputTag('particleFlowClusterHCAL'), - pflowClusterHO = cms.untracked.InputTag('particleFlowClusterHO'), - pflowClusterHF = cms.untracked.InputTag('particleFlowClusterHF'), - #hcalselector = cms.untracked.string('all'), - mc = cms.untracked.bool(True) - -) - - diff --git a/Validation/RecoParticleFlow/python/pfClusterValidation_cfi.py b/Validation/RecoParticleFlow/python/pfClusterValidation_cfi.py new file mode 100644 index 0000000000000..046dea6034972 --- /dev/null +++ b/Validation/RecoParticleFlow/python/pfClusterValidation_cfi.py @@ -0,0 +1,10 @@ +import FWCore.ParameterSet.Config as cms + +from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer + +pfClusterValidation = DQMEDAnalyzer('PFClusterValidation', + pflowClusterECAL = cms.untracked.InputTag('particleFlowClusterECAL'), + pflowClusterHCAL = cms.untracked.InputTag('particleFlowClusterHCAL'), + pflowClusterHO = cms.untracked.InputTag('particleFlowClusterHO'), + pflowClusterHF = cms.untracked.InputTag('particleFlowClusterHF'), +)