From 34f461bf99bbbe196dc161e56a4bd6b1ff391877 Mon Sep 17 00:00:00 2001 From: Jeongeun Lee Date: Thu, 7 Jul 2022 13:33:29 +0200 Subject: [PATCH] Replace Geometry_cff with GeometryDB_cff --- .../Configuration/test/RecoToDisplay_Data_cfg.py | 6 +++--- .../Configuration/test/RecoToDisplay_NoTracking_cfg.py | 5 ++--- .../Configuration/test/RecoToDisplay_batch_cfg.py | 5 ++--- RecoParticleFlow/Configuration/test/RecoToDisplay_cfg.py | 7 +++---- .../Configuration/test/RecoToDisplay_egnew_cfg.py | 7 +++---- .../Configuration/test/RecoToDisplay_usePFSC_cfg.py | 7 +++---- RecoParticleFlow/PFClusterProducer/test/clustering_cfg.py | 6 +++--- 7 files changed, 19 insertions(+), 24 deletions(-) diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_Data_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_Data_cfg.py index 2b861b2794fd8..30e1ec0151a08 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_Data_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_Data_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.GeometryDB_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') # Global tag from Configuration.AlCa.autoCond import autoCond @@ -43,7 +43,7 @@ # This is for filtering on L1 technical trigger bit: MB and no beam halo process.load('L1TriggerConfig.L1GtConfigProducers.L1GtTriggerMaskTechTrigConfig_cff') -process.load('HLTrigger/HLTfilters/hltLevel1GTSeed_cfi') +process.load('HLTrigger.HLTfilters.hltLevel1GTSeed_cfi') process.hltLevel1GTSeed.L1TechTriggerSeeding = cms.bool(True) process.hltLevel1GTSeed.L1SeedsLogicalExpression = cms.string('(0 AND (36 OR 37 OR 38 OR 39))') @@ -54,7 +54,7 @@ thresh = cms.untracked.double(0.25) ) -process.load('CommonTools/RecoAlgos/HBHENoiseFilter_cfi') +process.load('CommonTools.RecoAlgos.HBHENoiseFilter_cfi') process.dump = cms.EDAnalyzer("EventContentAnalyzer") diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py index e71c407c1b180..0ab770b80e3c5 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_NoTracking_cfg.py @@ -5,12 +5,11 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.StandardSequences.MagneticField_4T_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #from Configuration.AlCa.autoCond import autoCond #process.GlobalTag.globaltag = autoCond['mc'] from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = cms.string( autoCond[ 'startup' ] ) -#process.GlobalTag.globaltag = 'START50_V10::All' +process.GlobalTag.globaltag = cms.string( autoCond[ 'phase1_2022_realistic' ] ) #process.Timing =cms.Service("Timing") process.maxEvents = cms.untracked.PSet( diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py index a38d34307e72a..fe4ccaae61400 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_batch_cfg.py @@ -11,10 +11,9 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.StandardSequences.MagneticField_4T_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['startup'] -#process.GlobalTag.globaltag = 'START50_V10::All' +process.GlobalTag.globaltag = autoCond['phase1_2022_realistic'] #process.Timing =cms.Service("Timing") process.maxEvents = cms.untracked.PSet( diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_cfg.py index d62f644ba751d..c6b6b2a057741 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_cfg.py @@ -5,11 +5,10 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.StandardSequences.MagneticField_4T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load("Configuration.StandardSequences.GeometryDB_cff") +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['startup'] -#process.GlobalTag.globaltag = 'START50_V10::All' +process.GlobalTag.globaltag = autoCond['phase1_2022_realistic'] #process.Timing =cms.Service("Timing") process.maxEvents = cms.untracked.PSet( diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_egnew_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_egnew_cfg.py index 46e24334aad25..456334a56707e 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_egnew_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_egnew_cfg.py @@ -4,11 +4,10 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.StandardSequences.MagneticField_4T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load("Configuration.StandardSequences.GeometryDB_cff") +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['startup'] -#process.GlobalTag.globaltag = 'START50_V10::All' +process.GlobalTag.globaltag = autoCond['phase1_2022_realistic'] #process.Timing =cms.Service("Timing") process.maxEvents = cms.untracked.PSet( diff --git a/RecoParticleFlow/Configuration/test/RecoToDisplay_usePFSC_cfg.py b/RecoParticleFlow/Configuration/test/RecoToDisplay_usePFSC_cfg.py index e18250bd1a2e4..b5542bf91cf7f 100644 --- a/RecoParticleFlow/Configuration/test/RecoToDisplay_usePFSC_cfg.py +++ b/RecoParticleFlow/Configuration/test/RecoToDisplay_usePFSC_cfg.py @@ -4,11 +4,10 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.StandardSequences.MagneticField_4T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load("Configuration.StandardSequences.GeometryDB_cff") +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['startup'] -#process.GlobalTag.globaltag = 'START50_V10::All' +process.GlobalTag.globaltag = autoCond['phase1_2022_realistic'] #process.Timing =cms.Service("Timing") process.maxEvents = cms.untracked.PSet( diff --git a/RecoParticleFlow/PFClusterProducer/test/clustering_cfg.py b/RecoParticleFlow/PFClusterProducer/test/clustering_cfg.py index dc2cde57e63d3..e3a2bbdad9f97 100644 --- a/RecoParticleFlow/PFClusterProducer/test/clustering_cfg.py +++ b/RecoParticleFlow/PFClusterProducer/test/clustering_cfg.py @@ -5,10 +5,10 @@ process = cms.Process("PFC") -process.load("Configuration.StandardSequences.Geometry_cff") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +process.load("Configuration.StandardSequences.GeometryDB_cff") +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.autoCond import autoCond -process.GlobalTag.globaltag = autoCond['startup'] +process.GlobalTag.globaltag = autoCond['phase1_2022_realistic'] process.source = cms.Source("PoolSource",