From b68ac4e37c3fd65e0120aee75c5bb21956895158 Mon Sep 17 00:00:00 2001 From: federico de guio Date: Tue, 10 Feb 2015 18:36:22 +0100 Subject: [PATCH] move to the geometry from DB --- .../test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- .../2011_44X_Test_beampixel_dqm_sourceclient-live_cfg.py | 2 +- ...ertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- ...ertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py | 2 +- ...ngSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- DQM/BeamMonitor/test/42X_beam_dqm_sourceclient-live_cfg.py | 2 +- .../test/42X_beampixel_dqm_sourceclient-live_cfg.py | 2 +- .../test/44X_HI_beam_dqm_sourceclient-live_cfg.py | 2 +- DQM/BeamMonitor/test/44X_beam_dqm_sourceclient-live_cfg.py | 2 +- .../test/44X_beampixel_dqm_sourceclient-live_cfg.py | 2 +- DQM/BeamMonitor/test/beam_dqm_sourceclient-file_cfg.py | 2 +- DQM/BeamMonitor/test/beam_dqm_sourceclient-live_cfg.py | 2 +- DQM/BeamMonitor/test/beam_dqm_sourceclient-playback_cfg.py | 2 +- .../python/test/csc_dqm_offlineclient-file_cfg.py | 2 +- .../python/test/csc_dqm_sourceclient-file_cfg.py | 2 +- .../python/test/csc_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/csc_dqm_sourceclient-playback_cfg.py | 2 +- .../python/test/csc_dqm_sourceclient-rawfile_cfg.py | 2 +- .../python/test/csc_dqm_sourceclient_offline-file_cfg.py | 2 +- DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py | 2 +- DQM/CSCMonitorModule/test/dqm_repacker_test.py | 2 +- DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py | 2 +- .../python/test/dt_dqm_sourceclient-file_MiniDAQ_cfg.py | 2 +- .../python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py | 2 +- .../python/test/dt_dqm_sourceclient-live_MiniDAQ_cfg.py | 2 +- .../python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py | 2 +- DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py | 2 +- .../test/DTkFactValidation_1_TEMPL_cfg.py.ALCARECO | 2 +- .../test/DTkFactValidation_1_TEMPL_cfg.py.RAW | 2 +- .../test/DTkFactValidation_2_DQM_TEMPL_cfg.py | 2 +- .../test/DTkFactValidation_2_ResidCorr_TEMPL_cfg.py | 2 +- DQM/DTMonitorModule/test/DTkFactValidation_2_TEMPL_cfg.py | 2 +- .../test/dt_dqm_offlineclients_Cosmics_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_offlineclients_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_offlinesourcesRECO_cfg.py | 2 +- .../test/dt_dqm_offlinesources_Cosmics_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_offlinesources_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_visualization-file_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_visualization-live_cfg.py | 2 +- DQM/DTMonitorModule/test/dt_dqm_visualization-offline_cfg.py | 2 +- DQM/HLTEvF/python/hlt_jetmet_dqm_QT_fromfile_cfg.py | 2 +- DQM/HLTEvF/test/Pi0_test.py | 2 +- DQM/HLTEvF/test/testOccPlot_cfg.py | 2 +- .../python/test/beam_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/beampixel_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/castor_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/fedtest_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/hltrates_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/python/test/l1t_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/l1temulator_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/lumi_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/pixel_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/pixellumi_dqm_sourceclient-live_cfg.py | 2 +- .../python/test/sistrip_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/beam_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/beampixel_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/castor_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/csc_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/dt_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/l1t_dqm_sourceclient-live_cfg.py | 2 +- .../rcms/l1temulator_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/pixel_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/rcms/sistrip_dqm_sourceclient-live_cfg.py | 2 +- DQM/Integration/test/pixel_dqm_sourceclient-file_cfg.py | 2 +- DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py | 2 +- DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py | 2 +- DQM/Physics/test/PFJet_topDQM_production_cfg.py | 2 +- DQM/Physics/test/ewkElecDQM_cfg.py | 2 +- DQM/Physics/test/ewkMuDQM_cfg.py | 2 +- DQM/Physics/test/qcdPhotonsDQM_cfg.py | 2 +- DQM/Physics/test/topDQM_cfg.py | 2 +- DQM/Physics/test/topDQM_production_PU_cfg.py | 2 +- DQM/Physics/test/topDQM_production_cfg.py | 2 +- DQM/RPCMonitorDigi/test/rpcdqm_cfg.py | 2 +- DQM/SiPixelCommon/test/client_template_physics_cfg.py | 2 +- .../test/pixel_dqm_sourceclient-file_cfg.py | 2 +- .../python/sipixel_dqm_source_example_cfg.py | 2 +- .../test/sipixel_dqm_source_example_cfg.py | 2 +- .../python/sipixel_dqm_HLTsource_example_cfg.py | 2 +- .../python/sipixel_dqm_source_example_cfg.py | 2 +- .../python/SiRecHits_dqm_source_example_cfg.py | 2 +- .../test/SiPixelMonitorHitEfficiency_data_cfg.py | 2 +- .../test/SiPixelMonitorTrackResiduals_data_cfg.py | 2 +- .../test/SiPixelMonitorTrackResiduals_mc_cfg.py | 2 +- .../test/SiPixelMonitorTrackResiduals_relval_cfg.py | 2 +- .../test/finedelayAnalysis_cfg.template | 2 +- DQM/SiStripCommissioningSources/python/P5Geometry_cff.py | 2 +- DQM/SiStripMonitorClient/test/SiStripCAFHarvest_cfg.py | 2 +- .../test/SiStripCAFHarvest_template_cfg.py | 2 +- .../test/SiStripDQMOfflineGlobalRunCAF_cfg.py | 2 +- .../test/SiStripDQMOfflineGlobalRunCAF_template_cfg.py | 2 +- DQM/SiStripMonitorClient/test/SiStripDQM_HarvestTest_cfg.py | 2 +- .../test/SiStripDQM_RealData_Offline_cfg.py | 2 +- .../test/SiStripDQM_RealData_Online_cfg.py | 2 +- .../test/SiStripDQM_SimData_Offline_cfg.py | 2 +- .../test/SiStripDQM_SimData_Online_cfg.py | 2 +- .../test/SiStripDQM_Tier0GlobalRun_cfg.py | 2 +- .../test/MonitorCluster_RealData_cfg.py | 2 +- DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py | 2 +- .../test/SiStripMonitorDigi_RealData_cfg.py | 2 +- .../python/test/testSiStripCMMonitor_cfg.py | 2 +- .../python/test/testSiStripShotFilter_cfg.py | 2 +- DQM/SiStripMonitorPedestals/test/PedsMonWithDB_cfg.py | 2 +- .../test/SiStripMonitorTrack_RealData_cfg.py | 2 +- .../test/SiStripMonitorTrack_SimCosmics_cfg.py | 2 +- .../test/SiStripMonitorTrack_SimData_cfg.py | 2 +- DQM/TrackerMonitorTrack/test/monitortrackresiduals_cfg.py | 2 +- .../test/TrackEfficiencyMonitor_RealData_cfg.py | 2 +- .../test/TrackingMonitor_AllTrackingSequences_cfg.py | 2 +- DQM/TrackingMonitor/test/TrackingMonitor_SeedMonitor_cfg.py | 2 +- DQM/TrackingMonitor/test/TrackingMonitor_StandAlone_cfg.py | 2 +- DQM/TrigXMonitor/python/hlt_scaler_cfg.py | 2 +- DQM/TrigXMonitor/test/hltSeed_l1Logic_file_cfg.py | 2 +- DQM/TrigXMonitorClient/python/test/hlt_scalerclient_cfg.py | 2 +- DQM/TrigXMonitorClient/python/test/l1t_scalerclient_cfg.py | 2 +- DQMOffline/Alignment/test/testMuAlDQM.py | 2 +- DQMOffline/CalibCalo/test/Pi0_test.py | 2 +- DQMOffline/CalibMuon/python/dtNoiseDBValidation_cfg.py | 2 +- DQMOffline/CalibMuon/python/dtT0DBValidation_cfg.py | 2 +- DQMOffline/CalibMuon/python/dtTTrigDBValidation_cfg.py | 2 +- DQMOffline/CalibMuon/test/DTPreCalibTask_cfg.py | 2 +- .../CalibMuon/test/DTt0DBValidation_ORCONsqlite_cfg.py | 2 +- DQMOffline/CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py | 2 +- DQMOffline/CalibMuon/test/DTt0DBValidation_cfg.py | 2 +- .../test/DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py | 2 +- .../CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_cfg.py | 2 +- DQMOffline/CalibMuon/test/DTtTrigDBValidation_TEMPL_cfg.py | 2 +- DQMOffline/CalibMuon/test/DTtTrigDBValidation_cfg.py | 2 +- .../CRAFTCalib/SiStripDQMBadStripsValidationReReco_cfg.py | 2 +- .../test/CRAFTCalib/SiStripDQMBadStripsValidation_cfg.py | 2 +- .../CalibTracker/test/CRAFTCalib/SiStripDQMBadStrips_cfg.py | 2 +- .../SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py | 2 +- .../CalibTracker/test/example_QualityCalibration_cfg.py | 2 +- .../CalibTracker/test/example_QualityValidation_cfg.py | 2 +- .../test/template_SiStripQualityBadAPVIdentifierRoot_cfg.py | 2 +- ...late_SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py | 2 +- .../template_SiStripQualityHotStripIdentifierRoot_cfg.py | 2 +- DQMOffline/EGamma/test/EgammaAnalyzers_cfg.py | 2 +- DQMOffline/EGamma/test/EgammaDQMOffline_cfg.py | 2 +- DQMOffline/EGamma/test/PhotonOfflineClient_cfg.py | 2 +- DQMOffline/EGamma/test/PiZeroAnalyzer_cfg.py | 2 +- DQMOffline/EGamma/test/cosmicPhotonAnalyzer_cfg.py | 2 +- DQMOffline/Hcal/test/run_onRelVal_cfg.py | 2 +- DQMOffline/JetMET/test/BeamHaloAnalyzer_cfg.py | 2 +- DQMOffline/JetMET/test/cruzet4.py | 2 +- DQMOffline/JetMET/test/run_PromptAna.py | 5 ++--- DQMOffline/JetMET/test/run_PromptAna33X.py | 4 ++-- DQMOffline/JetMET/test/run_PromptAnaHI.py | 2 +- DQMOffline/JetMET/test/run_PromptAna_CAF.py | 4 ++-- DQMOffline/JetMET/test/run_PromptAna_CAF33x.py | 4 ++-- DQMOffline/JetMET/test/simJetMETAnalyzer_cfg.py | 2 +- DQMOffline/Muon/test/muonMonitors_cfg.py | 2 +- DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py | 2 +- DQMOffline/Trigger/test/egHLTOffDQMClientTest_cfg.py | 2 +- DQMOffline/Trigger/test/egHLTOffDQMSourceTest_cfg.py | 2 +- DQMOffline/Trigger/test/egHLTOffDQMTest_cfg.py | 2 +- .../Trigger/test/fv_dqmoffline_sourceclient-file_cfg.py | 2 +- DQMOffline/Trigger/test/trigger_dqmoffline_cfg.py | 2 +- .../test/trigger_dqmoffline_inclusiveVBFParking_cfg.py | 2 +- .../Trigger/test/trigger_dqmoffline_jetmet_data_cfg.py | 2 +- .../test/trigger_dqmoffline_jetmet_relval-file_cfg.py | 2 +- .../Trigger/test/trigger_dqmoffline_sourceclient-file_cfg.py | 2 +- .../test/trigger_dqmoffline_sourceclient_CRUZET_cfg.py | 2 +- .../test/trigger_dqmoffline_sourceclient_relval-file_cfg.py | 2 +- DQMOffline/Trigger/test/trigger_dqmoffline_step2_cfg.py | 2 +- DQMOffline/Trigger/test/trigger_dqmoffline_step3_cfg.py | 2 +- HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py | 2 +- HLTriggerOffline/Btag/test/test.py | 2 +- HLTriggerOffline/Common/test/hltHarvesting_cfg.py | 2 +- HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py | 2 +- .../test/hltriggeroffline_common_sourceclient-file_cfg.py | 2 +- HLTriggerOffline/Egamma/test/testPatRecoElectrons.py | 2 +- HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py | 2 +- HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py | 2 +- HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py | 2 +- HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py | 2 +- HLTriggerOffline/SUSYBSM/test/SUSYBSM_triggerValidation.py | 2 +- HLTriggerOffline/Top/test/topHLTDQM_production_cfg.py | 2 +- Validation/CaloTowers/test/client_cfg.py | 2 +- Validation/CaloTowers/test/run_onRelVal_cfg.py | 2 +- Validation/CaloTowers/test/single_pi_merging_cfg.py | 2 +- Validation/CaloTowers/test/source_cfg.py | 2 +- Validation/Configuration/test/SingleMuPt10_valid_cfg.py | 2 +- .../DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py | 2 +- Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py | 2 +- Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py | 2 +- .../DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py | 2 +- Validation/HcalRecHits/test/runALL_onRelVal_cfg.py | 2 +- Validation/MuonCSCDigis/test/cscTiming.py | 2 +- Validation/MuonDTDigis/test/DTDigiAnalyzer_singlemu.py | 2 +- Validation/MuonHits/test/muonhits_valid_analyzer.py | 2 +- Validation/MuonIdentification/test/MuonIdValToEDM_cfg.py | 2 +- Validation/RPCRecHits/test/rpcRecHitValidation_cfg.py | 2 +- .../RecoB/test/GridValidation/validation_FirstStepOnGrid.py | 2 +- Validation/RecoB/test/validation_customJet_cfg.py | 2 +- Validation/RecoEgamma/test/ElectronRedoFromCore_cfg.py | 2 +- Validation/RecoEgamma/test/ElectronRedoFromTrackSeeds_cfg.py | 2 +- Validation/RecoEgamma/test/PhotonPostprocessing_cfg.py | 2 +- Validation/RecoEgamma/test/PhotonValidatorCrab_cfg.py | 2 +- Validation/RecoJets/test/sequence_validation_cfg.py | 2 +- Validation/RecoMET/test/sequence_validation_cfg.py | 2 +- Validation/RecoMuon/test/muonValidation_cfg.py | 2 +- Validation/RecoParticleFlow/test/QCDForPFFull_cfg.py | 2 +- Validation/RecoParticleFlow/test/SingleParticle_cfg.py | 2 +- Validation/RecoParticleFlow/test/ZTTFullSim_cfg.py | 2 +- .../test/pflowValidationStep1_Template_cfg.py | 2 +- .../RecoParticleFlow/test/pflowValidationStep1_test_cfg.py | 2 +- Validation/RecoParticleFlow/test/ttbarFullSim_cfg.py | 2 +- Validation/RecoTau/test/RunValidation_VtXCutScan.py | 2 +- Validation/RecoTau/test/RunValidation_cfg.py | 4 ++-- Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py | 2 +- Validation/RecoTrack/test/MultiTrackValidator_cfg.py | 2 +- Validation/RecoTrack/test/SeedValidator_cfg.py | 2 +- .../test/cosmictrackingPerformanceValidation_cfg.py | 2 +- Validation/RecoTrack/test/seedPerformanceValidation_cfg.py | 2 +- Validation/RecoVertex/python/pvRecoSequence_cff.py | 2 +- Validation/RecoVertex/test/demoProducePrimaryVertex_cfg.py | 2 +- .../RecoVertex/test/produceAndAnalyzePrimaryVertex_cfg.py | 2 +- Validation/RecoVertex/test/redoPV_cfg.py | 2 +- Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py | 2 +- .../TrackerConfiguration/test/SimHits_Validation_cfg.py | 2 +- .../TrackerConfiguration/test/ValidationChainOnly_cfg.py | 2 +- Validation/TrackerDigis/test/trackerdigivalid_cfg.py | 2 +- .../TrackerDigis/test/trackerdigivalid_frontier_cfg.py | 2 +- Validation/TrackerHits/test/TrackerHitValid_cfg.py | 2 +- Validation/TrackerRecHits/test/SiPixelRecHitsValid_cfg.py | 2 +- Validation/TrackerRecHits/test/SiStripRecHitsValid_cfg.py | 2 +- 229 files changed, 234 insertions(+), 235 deletions(-) diff --git a/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py index 8db3d09faea8f..f843c2da26616 100644 --- a/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py @@ -76,7 +76,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/2011_44X_Test_beampixel_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2011_44X_Test_beampixel_dqm_sourceclient-live_cfg.py index ed5e87c951fde..4baf6d94cae8e 100644 --- a/DQM/BeamMonitor/test/2011_44X_Test_beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2011_44X_Test_beampixel_dqm_sourceclient-live_cfg.py @@ -50,7 +50,7 @@ ### @@@@@@ Comment when running locally @@@@@@ ### process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.EndOfProcess_cff") diff --git a/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py index 017e6c4ec93f9..6a61fd380a64e 100644 --- a/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py @@ -93,7 +93,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py index 186aea79119dd..2a23fd6968643 100644 --- a/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py @@ -76,7 +76,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py index 5adf87ec049b1..e26c85eb88ccf 100644 --- a/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py @@ -84,7 +84,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/42X_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/42X_beam_dqm_sourceclient-live_cfg.py index e67c5794f96a6..c1c3fb22e71fa 100644 --- a/DQM/BeamMonitor/test/42X_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/42X_beam_dqm_sourceclient-live_cfg.py @@ -38,7 +38,7 @@ # Reco reltaed #--------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/BeamMonitor/test/42X_beampixel_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/42X_beampixel_dqm_sourceclient-live_cfg.py index 7c06b5ae9df6c..65f3c068d57ca 100644 --- a/DQM/BeamMonitor/test/42X_beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/42X_beampixel_dqm_sourceclient-live_cfg.py @@ -39,7 +39,7 @@ ### @@@@@@ Comment when running locally @@@@@@ ### process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.EndOfProcess_cff") diff --git a/DQM/BeamMonitor/test/44X_HI_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/44X_HI_beam_dqm_sourceclient-live_cfg.py index 0b9948647b564..78ef158313793 100644 --- a/DQM/BeamMonitor/test/44X_HI_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/44X_HI_beam_dqm_sourceclient-live_cfg.py @@ -58,7 +58,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/44X_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/44X_beam_dqm_sourceclient-live_cfg.py index 9e2d4da6c792b..405b957bd7045 100644 --- a/DQM/BeamMonitor/test/44X_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/44X_beam_dqm_sourceclient-live_cfg.py @@ -37,7 +37,7 @@ #### SETUP TRACKING RECONSTRUCTION #### -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/BeamMonitor/test/44X_beampixel_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/44X_beampixel_dqm_sourceclient-live_cfg.py index bc728c28b1a90..86897d42672c8 100644 --- a/DQM/BeamMonitor/test/44X_beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/44X_beampixel_dqm_sourceclient-live_cfg.py @@ -44,7 +44,7 @@ ### @@@@@@ Comment when running locally @@@@@@ ### process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.EndOfProcess_cff") diff --git a/DQM/BeamMonitor/test/beam_dqm_sourceclient-file_cfg.py b/DQM/BeamMonitor/test/beam_dqm_sourceclient-file_cfg.py index 2a2eb5b7f2c2b..c3b6931416b47 100644 --- a/DQM/BeamMonitor/test/beam_dqm_sourceclient-file_cfg.py +++ b/DQM/BeamMonitor/test/beam_dqm_sourceclient-file_cfg.py @@ -60,7 +60,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/beam_dqm_sourceclient-live_cfg.py index 10979f73a575b..04eb2e73b80e3 100644 --- a/DQM/BeamMonitor/test/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/beam_dqm_sourceclient-live_cfg.py @@ -44,7 +44,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/BeamMonitor/test/beam_dqm_sourceclient-playback_cfg.py b/DQM/BeamMonitor/test/beam_dqm_sourceclient-playback_cfg.py index 16e364874e7bd..65b9818ad5733 100644 --- a/DQM/BeamMonitor/test/beam_dqm_sourceclient-playback_cfg.py +++ b/DQM/BeamMonitor/test/beam_dqm_sourceclient-playback_cfg.py @@ -57,7 +57,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_offlineclient-file_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_offlineclient-file_cfg.py index c330e9a727714..2f1f9a8791d6c 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_offlineclient-file_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_offlineclient-file_cfg.py @@ -53,7 +53,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py index ace89e0d335b6..b2464acc749c6 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py @@ -93,7 +93,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py index 3e7363b35f449..706e5a7f902eb 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py @@ -57,7 +57,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py index 2decf66c26cbc..3290335a14da6 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py @@ -74,7 +74,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py index ddbcaa1af2fdc..4ef66b1ea03e8 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py @@ -124,7 +124,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py index 6bbd1d58d85c7..d62022bf9924e 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py @@ -77,7 +77,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py b/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py index d9a0ee60789e2..3f01e6037f17b 100644 --- a/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py +++ b/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py @@ -76,7 +76,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/CSCMonitorModule/test/dqm_repacker_test.py b/DQM/CSCMonitorModule/test/dqm_repacker_test.py index ae8ccdf4b0a22..d301c68351eb9 100644 --- a/DQM/CSCMonitorModule/test/dqm_repacker_test.py +++ b/DQM/CSCMonitorModule/test/dqm_repacker_test.py @@ -76,7 +76,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py b/DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py index 74cfee23321e8..1f37d85ed538c 100644 --- a/DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py +++ b/DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py @@ -6,7 +6,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") # Geometry & Calibration Tag -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR09_P_V1::All" diff --git a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-file_MiniDAQ_cfg.py b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-file_MiniDAQ_cfg.py index 6bbe20b58a435..b80388ca2d5e4 100644 --- a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-file_MiniDAQ_cfg.py +++ b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-file_MiniDAQ_cfg.py @@ -38,7 +38,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff") #---- for P5 (online) DB access process.GlobalTag.connect ="frontier://(proxyurl=http://localhost:3128)(serverurl=http://frontier1.cms:8000/FrontierOnProd)(serverurl=http://frontier2.cms:8000/FrontierOnProd)(retrieve-ziplevel=0)/CMS_COND_21X_GLOBALTAG" diff --git a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py index c7fa0c23fbfcb..6ec0ca9e8dfe4 100644 --- a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py +++ b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_GlobalRun_cfg.py @@ -41,7 +41,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # ideal geometry for LUT task process.load("Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff") process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff") diff --git a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_MiniDAQ_cfg.py b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_MiniDAQ_cfg.py index 053641aea9c41..f198366c810e6 100644 --- a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_MiniDAQ_cfg.py +++ b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_MiniDAQ_cfg.py @@ -37,7 +37,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff") #---- for P5 (online) DB access diff --git a/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py b/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py index d5fad1edc224f..d6af7fd85c3f6 100644 --- a/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py +++ b/DQM/DTMonitorModule/python/test/hltdt_dqm_sourceclient-live_GlobalRun_cfg.py @@ -38,7 +38,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # filter on trigger type physicsEventsFilter = cms.EDFilter("HLTTriggerTypeFilter", diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py index 28873b4aebd39..1c96ec1ac1e9c 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py +++ b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py @@ -20,7 +20,7 @@ destinations = cms.untracked.vstring('cout') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GLOBALTAGTEMPLATE" diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.ALCARECO b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.ALCARECO index c444685b568df..9ae48249120c4 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.ALCARECO +++ b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.ALCARECO @@ -23,7 +23,7 @@ process.MessageLogger = cms.Service("MessageLogger", destinations = cms.untracked.vstring('cout') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GLOBALTAGTEMPLATE" diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.RAW b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.RAW index d641f7bf97333..d9b4d6e25b515 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.RAW +++ b/DQM/DTMonitorModule/test/DTkFactValidation_1_TEMPL_cfg.py.RAW @@ -23,7 +23,7 @@ process.MessageLogger = cms.Service("MessageLogger", destinations = cms.untracked.vstring('cout') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GLOBALTAGTEMPLATE" diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py b/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py index 56aba521fd85f..9e64925ff2be2 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py +++ b/DQM/DTMonitorModule/test/DTkFactValidation_2_DQM_TEMPL_cfg.py @@ -6,7 +6,7 @@ fileMode = cms.untracked.string('FULLMERGE') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_2_ResidCorr_TEMPL_cfg.py b/DQM/DTMonitorModule/test/DTkFactValidation_2_ResidCorr_TEMPL_cfg.py index 9e01311651826..239ecccd2825f 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_2_ResidCorr_TEMPL_cfg.py +++ b/DQM/DTMonitorModule/test/DTkFactValidation_2_ResidCorr_TEMPL_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("PROD") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQM/DTMonitorModule/test/DTkFactValidation_2_TEMPL_cfg.py b/DQM/DTMonitorModule/test/DTkFactValidation_2_TEMPL_cfg.py index de5b24f1e46a4..58b947682dc80 100644 --- a/DQM/DTMonitorModule/test/DTkFactValidation_2_TEMPL_cfg.py +++ b/DQM/DTMonitorModule/test/DTkFactValidation_2_TEMPL_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("PROD") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQM/DTMonitorModule/test/dt_dqm_offlineclients_Cosmics_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_offlineclients_Cosmics_cfg.py index e27f7d589a00c..fab7d630bc239 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_offlineclients_Cosmics_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_offlineclients_Cosmics_cfg.py @@ -9,7 +9,7 @@ process.GlobalTag.globaltag = "GR09_31X_V5P::All" process.prefer("GlobalTag") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("DQMOffline.Configuration.DQMOfflineCosmics_SecondStep_cff") process.load("DQM.DTMonitorClient.dtDQMOfflineClients_Cosmics_cff") diff --git a/DQM/DTMonitorModule/test/dt_dqm_offlineclients_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_offlineclients_cfg.py index 15a984b62b450..b63effae6592c 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_offlineclients_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_offlineclients_cfg.py @@ -9,7 +9,7 @@ process.GlobalTag.globaltag = "GR09_31X_V5P::All" process.prefer("GlobalTag") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("DQMOffline.Configuration.DQMOfflineCosmics_SecondStep_cff") process.load("DQM.DTMonitorClient.dtDQMOfflineClients_cff") diff --git a/DQM/DTMonitorModule/test/dt_dqm_offlinesourcesRECO_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_offlinesourcesRECO_cfg.py index 8d05c023fe862..875c7b2589162 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_offlinesourcesRECO_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_offlinesourcesRECO_cfg.py @@ -38,7 +38,7 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi # process.load("Configuration.StandardSequences.RawToDigi_Data_cff") diff --git a/DQM/DTMonitorModule/test/dt_dqm_offlinesources_Cosmics_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_offlinesources_Cosmics_cfg.py index d3693fed9b51e..d346f47f3e6df 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_offlinesources_Cosmics_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_offlinesources_Cosmics_cfg.py @@ -35,7 +35,7 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi diff --git a/DQM/DTMonitorModule/test/dt_dqm_offlinesources_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_offlinesources_cfg.py index 99b2817fab31e..c601358c8ef55 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_offlinesources_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_offlinesources_cfg.py @@ -35,7 +35,7 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi diff --git a/DQM/DTMonitorModule/test/dt_dqm_visualization-file_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_visualization-file_cfg.py index 8c0710fce98fd..11bd28384fe3f 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_visualization-file_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_visualization-file_cfg.py @@ -11,7 +11,7 @@ input = cms.untracked.int32(-1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.Integration.test.dt_dqm_visualization_common_cff") diff --git a/DQM/DTMonitorModule/test/dt_dqm_visualization-live_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_visualization-live_cfg.py index fedc8dd8590e3..dbcdf8c502c63 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_visualization-live_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_visualization-live_cfg.py @@ -8,7 +8,7 @@ input = cms.untracked.int32(-1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_visualization_common_cff") diff --git a/DQM/DTMonitorModule/test/dt_dqm_visualization-offline_cfg.py b/DQM/DTMonitorModule/test/dt_dqm_visualization-offline_cfg.py index 87d4b42587798..f0963547d3978 100644 --- a/DQM/DTMonitorModule/test/dt_dqm_visualization-offline_cfg.py +++ b/DQM/DTMonitorModule/test/dt_dqm_visualization-offline_cfg.py @@ -16,7 +16,7 @@ input = cms.untracked.int32(-1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_visualization_common_offline_cff") #process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/DQM/HLTEvF/python/hlt_jetmet_dqm_QT_fromfile_cfg.py b/DQM/HLTEvF/python/hlt_jetmet_dqm_QT_fromfile_cfg.py index ff7f92d0cf552..c14342808aa43 100644 --- a/DQM/HLTEvF/python/hlt_jetmet_dqm_QT_fromfile_cfg.py +++ b/DQM/HLTEvF/python/hlt_jetmet_dqm_QT_fromfile_cfg.py @@ -76,7 +76,7 @@ ##4 lines below are necessary to pick up right conditions in which data was taken.????? -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = 'CRAFT_31X::All' diff --git a/DQM/HLTEvF/test/Pi0_test.py b/DQM/HLTEvF/test/Pi0_test.py index f04943aa4fa6d..44b5ec488611c 100644 --- a/DQM/HLTEvF/test/Pi0_test.py +++ b/DQM/HLTEvF/test/Pi0_test.py @@ -6,7 +6,7 @@ process.load("Geometry.CaloEventSetup.CaloTopology_cfi") process.load("Configuration.StandardSequences.MagneticField_40T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi") process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") diff --git a/DQM/HLTEvF/test/testOccPlot_cfg.py b/DQM/HLTEvF/test/testOccPlot_cfg.py index 827abdbbe3a6a..b58a1ac418425 100644 --- a/DQM/HLTEvF/test/testOccPlot_cfg.py +++ b/DQM/HLTEvF/test/testOccPlot_cfg.py @@ -37,7 +37,7 @@ # running the silly RawToDigi # ################################ -process.load('Configuration.StandardSequences.Geometry_cff') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.GlobalTag.globaltag = 'GR_R_42_V14::All' #process.load('Configuration/StandardSequences/RawToDigi_Data_cff') diff --git a/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py index c9206bbd3ef14..96f64399e4470 100644 --- a/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/beam_dqm_sourceclient-live_cfg.py @@ -42,7 +42,7 @@ #### SETUP TRACKING RECONSTRUCTION #### -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("Configuration.StandardSequences.RawToDigi_Data_cff") diff --git a/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py index 374b577d968b6..09ec22caed138 100644 --- a/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/beampixel_dqm_sourceclient-live_cfg.py @@ -27,7 +27,7 @@ #---------------------------- # Sub-system Configuration #---------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py index a91b57afcc5c6..2164324059ea2 100644 --- a/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/castor_dqm_sourceclient-live_cfg.py @@ -16,7 +16,7 @@ process.load("DQMServices.Components.DQMEnvironment_cfi") #process.DQMStore.referenceFileName = 'castor_reference.root' -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.Integration.test.environment_cfi") process.dqmEnv.subSystemFolder = "Castor" diff --git a/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py index ad2d070902149..e07e830e98c7b 100644 --- a/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/csc_dqm_sourceclient-live_cfg.py @@ -72,7 +72,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py index 0404d430527c9..f83f6981c4ad0 100644 --- a/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/dt_dqm_sourceclient-live_cfg.py @@ -28,7 +28,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff") #---- for P5 (online) DB access process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py index fe0317e884376..b5ee06a66a9f3 100644 --- a/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/fedtest_dqm_sourceclient-live_cfg.py @@ -81,7 +81,7 @@ process.SiPixelHLTSource.slowDown = False process.SiPixelHLTSource.DirName = cms.untracked.string('Pixel/FEDIntegrity_SM/') -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # SiStrip DQM sequences process.load("DQM.SiStripMonitorHardware.siStripFEDCheck_cfi") diff --git a/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py index 236e776ce8978..59fd1c337f758 100644 --- a/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/hltrates_dqm_sourceclient-live_cfg.py @@ -77,7 +77,7 @@ # We don't need to run raw to digi # -#process.load('Configuration.StandardSequences.Geometry_cff') +#process.load('Configuration.StandardSequences.GeometryRecoDB_cff') #process.load('Configuration/StandardSequences/RawToDigi_Data_cff') #process.SiStripDetInfoFileReader = cms.Service("SiStripDetInfoFileReader") diff --git a/DQM/Integration/python/test/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/l1t_dqm_sourceclient-live_cfg.py index ad8028a3585c8..53b3d5474e408 100644 --- a/DQM/Integration/python/test/l1t_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/l1t_dqm_sourceclient-live_cfg.py @@ -41,7 +41,7 @@ # Condition for lxplus #process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------- diff --git a/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py index d54c47bfeb59a..8e0495f4d5f1a 100644 --- a/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py @@ -43,7 +43,7 @@ # Condition for lxplus #process.load("DQM.Integration.test.FrontierCondition_GT_Offline_cfi") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------- diff --git a/DQM/Integration/python/test/lumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/lumi_dqm_sourceclient-live_cfg.py index 0a7f177d7666a..7eb803c1ef8a0 100644 --- a/DQM/Integration/python/test/lumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/lumi_dqm_sourceclient-live_cfg.py @@ -39,7 +39,7 @@ process.GlobalTag.DBParameters.authenticationPath = process.DBService.authPath ### @@@@@@ Comment when running locally @@@@@@ ### process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.EndOfProcess_cff") diff --git a/DQM/Integration/python/test/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/pixel_dqm_sourceclient-live_cfg.py index 9c424c1954256..b411efb20c032 100644 --- a/DQM/Integration/python/test/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/pixel_dqm_sourceclient-live_cfg.py @@ -52,7 +52,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # GLOBALTAG diff --git a/DQM/Integration/python/test/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/pixellumi_dqm_sourceclient-live_cfg.py index deb67e11915e5..8a058958cda44 100644 --- a/DQM/Integration/python/test/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/pixellumi_dqm_sourceclient-live_cfg.py @@ -32,7 +32,7 @@ #--------- # GEOMETRY #--------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #---------- # GLOBALTAG diff --git a/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py index b0a4ca9cd59f2..4952189dfb8fd 100644 --- a/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/test/sistrip_dqm_sourceclient-live_cfg.py @@ -81,7 +81,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #-------------------------- # Calibration diff --git a/DQM/Integration/rcms/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/beam_dqm_sourceclient-live_cfg.py index 62be398e0d8ca..872eb813cd01e 100644 --- a/DQM/Integration/rcms/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/beam_dqm_sourceclient-live_cfg.py @@ -48,7 +48,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #----------------------------- # Magnetic Field diff --git a/DQM/Integration/rcms/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/beampixel_dqm_sourceclient-live_cfg.py index 9299b7b4b0537..f9fee01822977 100644 --- a/DQM/Integration/rcms/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/beampixel_dqm_sourceclient-live_cfg.py @@ -54,7 +54,7 @@ ### @@@@@@ Comment when running locally @@@@@@ ### process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/DQM/Integration/rcms/castor_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/castor_dqm_sourceclient-live_cfg.py index 463ea04c8b272..3df17ce4e1e47 100644 --- a/DQM/Integration/rcms/castor_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/castor_dqm_sourceclient-live_cfg.py @@ -14,7 +14,7 @@ process.load("DQMServices.Components.DQMEnvironment_cfi") #process.DQMStore.referenceFileName = 'castor_reference.root' -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.Integration.test.environment_cfi") process.dqmEnv.subSystemFolder = "Castor" diff --git a/DQM/Integration/rcms/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/csc_dqm_sourceclient-live_cfg.py index 82f8aa80756d8..7adfa9422185b 100644 --- a/DQM/Integration/rcms/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/csc_dqm_sourceclient-live_cfg.py @@ -65,7 +65,7 @@ # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Global Tag diff --git a/DQM/Integration/rcms/dt_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/dt_dqm_sourceclient-live_cfg.py index 3e4321f02b812..0832af59916d6 100644 --- a/DQM/Integration/rcms/dt_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/dt_dqm_sourceclient-live_cfg.py @@ -28,7 +28,7 @@ # DT reco and DQM sequences -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff") #---- for P5 (online) DB access process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/Integration/rcms/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/l1t_dqm_sourceclient-live_cfg.py index 3fba2ac4de9a2..e4e7ecebcd532 100644 --- a/DQM/Integration/rcms/l1t_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/l1t_dqm_sourceclient-live_cfg.py @@ -27,7 +27,7 @@ # process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") diff --git a/DQM/Integration/rcms/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/l1temulator_dqm_sourceclient-live_cfg.py index c1684cf3f767a..f234ed0a30fe7 100644 --- a/DQM/Integration/rcms/l1temulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/l1temulator_dqm_sourceclient-live_cfg.py @@ -10,7 +10,7 @@ process.load("DQM.Integration.test.FrontierCondition_GT_cfi") process.GlobalTag.RefreshEachRun = cms.untracked.bool(True) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQM.L1TMonitor.L1TEmulatorMonitor_cff") process.load("DQM.L1TMonitorClient.L1TEMUMonitorClient_cff") diff --git a/DQM/Integration/rcms/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/pixel_dqm_sourceclient-live_cfg.py index f7bfca4d316ca..9e76fa3603595 100644 --- a/DQM/Integration/rcms/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/pixel_dqm_sourceclient-live_cfg.py @@ -50,7 +50,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # GLOBALTAG diff --git a/DQM/Integration/rcms/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/rcms/sistrip_dqm_sourceclient-live_cfg.py index 1af8f8cae8c3b..d779d17209f92 100644 --- a/DQM/Integration/rcms/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/rcms/sistrip_dqm_sourceclient-live_cfg.py @@ -61,7 +61,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #-------------------------- # Calibration diff --git a/DQM/Integration/test/pixel_dqm_sourceclient-file_cfg.py b/DQM/Integration/test/pixel_dqm_sourceclient-file_cfg.py index 49d60584d52a0..6dacd25313428 100644 --- a/DQM/Integration/test/pixel_dqm_sourceclient-file_cfg.py +++ b/DQM/Integration/test/pixel_dqm_sourceclient-file_cfg.py @@ -6,7 +6,7 @@ #process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi") #process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") #process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.GlobalRuns.ForceZeroTeslaField_cff") process.load("CondCore.DBCommon.CondDBSetup_cfi") diff --git a/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py b/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py index e8a8180ab275b..96a31021563b8 100644 --- a/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py +++ b/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py @@ -109,7 +109,7 @@ es_prefer_GlobalTag = cms.ESPrefer('GlobalTag') -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------- diff --git a/DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py b/DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py index 57e667604ce57..f3199117a5b6b 100644 --- a/DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py +++ b/DQM/L1TMonitor/test/l1temulator_dqm_sourceclient-file_cfg.py @@ -109,7 +109,7 @@ es_prefer_GlobalTag = cms.ESPrefer('GlobalTag') -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------- diff --git a/DQM/Physics/test/PFJet_topDQM_production_cfg.py b/DQM/Physics/test/PFJet_topDQM_production_cfg.py index 5ad82cfd68e1f..dc1fb2c95c8a8 100644 --- a/DQM/Physics/test/PFJet_topDQM_production_cfg.py +++ b/DQM/Physics/test/PFJet_topDQM_production_cfg.py @@ -44,7 +44,7 @@ ## apply VBTF electronID (needed for the current implementation ## of topSingleElectronDQMLoose and topSingleElectronDQMMedium) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/DQM/Physics/test/ewkElecDQM_cfg.py b/DQM/Physics/test/ewkElecDQM_cfg.py index 589191df4c98f..5d007bf705603 100644 --- a/DQM/Physics/test/ewkElecDQM_cfg.py +++ b/DQM/Physics/test/ewkElecDQM_cfg.py @@ -15,7 +15,7 @@ # load the full reconstraction configuration, to make sure we're getting all needed dependencies process.load("Configuration.StandardSequences.MagneticField_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") #old one, to use for old releases +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #old one, to use for old releases process.load("Configuration.Geometry.GeometryIdeal_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/DQM/Physics/test/ewkMuDQM_cfg.py b/DQM/Physics/test/ewkMuDQM_cfg.py index c03384ddbd862..e2ce4df9dcf95 100644 --- a/DQM/Physics/test/ewkMuDQM_cfg.py +++ b/DQM/Physics/test/ewkMuDQM_cfg.py @@ -14,7 +14,7 @@ # load the full reconstraction configuration, to make sure we're getting all needed dependencies process.load("Configuration.StandardSequences.MagneticField_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") #old one, to use for old releases +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #old one, to use for old releases process.load("Configuration.Geometry.GeometryIdeal_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/DQM/Physics/test/qcdPhotonsDQM_cfg.py b/DQM/Physics/test/qcdPhotonsDQM_cfg.py index 80f4e31cbe3bb..63c0635b0d1a3 100644 --- a/DQM/Physics/test/qcdPhotonsDQM_cfg.py +++ b/DQM/Physics/test/qcdPhotonsDQM_cfg.py @@ -10,7 +10,7 @@ process.dqmSaver.workflow = cms.untracked.string('/My/Test/DataSet') ## Geometry and Detector Conditions (needed for spike removal code) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = cms.string('START38_V9::All') process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/DQM/Physics/test/topDQM_cfg.py b/DQM/Physics/test/topDQM_cfg.py index cf749391337d5..0c339cf61b209 100644 --- a/DQM/Physics/test/topDQM_cfg.py +++ b/DQM/Physics/test/topDQM_cfg.py @@ -23,7 +23,7 @@ ## apply VBTF electronID (needed for the current implementation ## of topSingleElectronDQMLoose and topSingleElectronDQMMedium) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/DQM/Physics/test/topDQM_production_PU_cfg.py b/DQM/Physics/test/topDQM_production_PU_cfg.py index f46af9e84b14d..029938cbcebd3 100644 --- a/DQM/Physics/test/topDQM_production_PU_cfg.py +++ b/DQM/Physics/test/topDQM_production_PU_cfg.py @@ -152,7 +152,7 @@ ## apply VBTF electronID (needed for the current implementation ## of topSingleElectronDQMLoose and topSingleElectronDQMMedium) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/DQM/Physics/test/topDQM_production_cfg.py b/DQM/Physics/test/topDQM_production_cfg.py index 1a5731495b71f..6d1238a485c20 100644 --- a/DQM/Physics/test/topDQM_production_cfg.py +++ b/DQM/Physics/test/topDQM_production_cfg.py @@ -45,7 +45,7 @@ ## apply VBTF electronID (needed for the current implementation ## of topSingleElectronDQMLoose and topSingleElectronDQMMedium) -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.Geometry.GeometryIdeal_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py b/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py index c9e33e9f922d4..dcd55b90420e3 100644 --- a/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py +++ b/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py @@ -43,7 +43,7 @@ #process.load("Geometry.DTGeometry.dtGeometry_cfi") #process.load("Configuration.StandardSequences.MagneticField_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ############ RAW to DIGI ################### ## process.rpcunpacker = cms.EDFilter("RPCUnpackingModule", diff --git a/DQM/SiPixelCommon/test/client_template_physics_cfg.py b/DQM/SiPixelCommon/test/client_template_physics_cfg.py index f4f51449ebb02..c3cb10bc0b8fe 100644 --- a/DQM/SiPixelCommon/test/client_template_physics_cfg.py +++ b/DQM/SiPixelCommon/test/client_template_physics_cfg.py @@ -5,7 +5,7 @@ process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi") process.siPixelDigis.InputLabel = 'source' process.siPixelDigis.IncludeErrors = True diff --git a/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py b/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py index 0fc69bf271213..700ddb4246b3e 100644 --- a/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py +++ b/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("SIPIXELDQM") ##----## Geometry and other global parameters: -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') ###process.load("DQM.Integration.test.FrontierCondition_GT_cfi") diff --git a/DQM/SiPixelMonitorDigi/python/sipixel_dqm_source_example_cfg.py b/DQM/SiPixelMonitorDigi/python/sipixel_dqm_source_example_cfg.py index e280969e71e90..2db6074dd59f8 100644 --- a/DQM/SiPixelMonitorDigi/python/sipixel_dqm_source_example_cfg.py +++ b/DQM/SiPixelMonitorDigi/python/sipixel_dqm_source_example_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("SiPixelMonitorDigiProcess") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("DQMServices.Core.DQM_cfg") diff --git a/DQM/SiPixelMonitorDigi/test/sipixel_dqm_source_example_cfg.py b/DQM/SiPixelMonitorDigi/test/sipixel_dqm_source_example_cfg.py index 0609b9896a61e..2b168134849a8 100644 --- a/DQM/SiPixelMonitorDigi/test/sipixel_dqm_source_example_cfg.py +++ b/DQM/SiPixelMonitorDigi/test/sipixel_dqm_source_example_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("SiPixelMonitorDigiProcess") ##----## Geometry and other global parameters: -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("DQM.SiPixelMonitorDigi.SiPixelMonitorDigi_cfi") process.load("DQMServices.Core.DQM_cfg") diff --git a/DQM/SiPixelMonitorRawData/python/sipixel_dqm_HLTsource_example_cfg.py b/DQM/SiPixelMonitorRawData/python/sipixel_dqm_HLTsource_example_cfg.py index 1955cbc5c6356..45e9fe07dba89 100644 --- a/DQM/SiPixelMonitorRawData/python/sipixel_dqm_HLTsource_example_cfg.py +++ b/DQM/SiPixelMonitorRawData/python/sipixel_dqm_HLTsource_example_cfg.py @@ -11,7 +11,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") # conditions -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR10_P_V4::All" process.es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag') diff --git a/DQM/SiPixelMonitorRawData/python/sipixel_dqm_source_example_cfg.py b/DQM/SiPixelMonitorRawData/python/sipixel_dqm_source_example_cfg.py index 452a789dafb7d..275130d77852b 100644 --- a/DQM/SiPixelMonitorRawData/python/sipixel_dqm_source_example_cfg.py +++ b/DQM/SiPixelMonitorRawData/python/sipixel_dqm_source_example_cfg.py @@ -11,7 +11,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") # conditions -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR10_P_V4::All" process.es_prefer_GlobalTag = cms.ESPrefer('PoolDBESSource','GlobalTag') diff --git a/DQM/SiPixelMonitorRecHit/python/SiRecHits_dqm_source_example_cfg.py b/DQM/SiPixelMonitorRecHit/python/SiRecHits_dqm_source_example_cfg.py index 302cf33680590..c82fd8465cccb 100644 --- a/DQM/SiPixelMonitorRecHit/python/SiRecHits_dqm_source_example_cfg.py +++ b/DQM/SiPixelMonitorRecHit/python/SiRecHits_dqm_source_example_cfg.py @@ -12,7 +12,7 @@ process.load("DQMServices.Core.DQM_cfg") process.load("DQMServices.Components.DQMEnvironment_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.GlobalTag.connect ="sqlite_file:/afs/cern.ch/user/m/malgeri/public/globtag/CRUZET3_V7.db" diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py index 87f651a3e8ebe..4ebffe555c9cf 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py @@ -9,7 +9,7 @@ #process.load("Configuration.GlobalRuns.ForceZeroTeslaField_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ### process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py index 00ceaf8fc2bfc..b6aa8a8cbff87 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.GlobalRuns.ForceZeroTeslaField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ### process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_mc_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_mc_cfg.py index 5ab04eb694ba6..69444405355fa 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_mc_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_mc_cfg.py @@ -70,7 +70,7 @@ process.load("Configuration.StandardSequences.MagneticField_0T_cff") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi ##process.load("Configuration.StandardSequences.RawToDigi_Data_cff") diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py index 388bfbbb033fc..7fc402bf2c04b 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py @@ -6,7 +6,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FakeConditions_cff") diff --git a/DQM/SiStripCommissioningAnalysis/test/finedelayAnalysis_cfg.template b/DQM/SiStripCommissioningAnalysis/test/finedelayAnalysis_cfg.template index d4d417fe942d5..f87c5a983657b 100644 --- a/DQM/SiStripCommissioningAnalysis/test/finedelayAnalysis_cfg.template +++ b/DQM/SiStripCommissioningAnalysis/test/finedelayAnalysis_cfg.template @@ -27,7 +27,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cf #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #-------------------------- # Global tag diff --git a/DQM/SiStripCommissioningSources/python/P5Geometry_cff.py b/DQM/SiStripCommissioningSources/python/P5Geometry_cff.py index 7535bac9bdf43..6f73126510002 100644 --- a/DQM/SiStripCommissioningSources/python/P5Geometry_cff.py +++ b/DQM/SiStripCommissioningSources/python/P5Geometry_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Geometry_cff import * +from Configuration.StandardSequences.GeometryRecoDB_cff import * diff --git a/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_cfg.py b/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_cfg.py index bee8a5957eadf..e4232359964c7 100644 --- a/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_cfg.py @@ -37,7 +37,7 @@ # Magnetic fiels # process.load( "Configuration.StandardSequences.MagneticField_38T_cff" ) # Geometry # -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) # Calibration process.load( "Configuration.StandardSequences.FrontierConditions_GlobalTag_cff" ) # process.GlobalTag.connect = 'frontier://FrontierProd/CMS_COND_21X_GLOBALTAG' diff --git a/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_template_cfg.py b/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_template_cfg.py index 044a606c22bf0..70ecaef827e9c 100644 --- a/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_template_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripCAFHarvest_template_cfg.py @@ -24,7 +24,7 @@ # Magnetic fiels # process.load( "Configuration.StandardSequences.MagneticField_xMAG_FIELDx_cff" ) # Geometry # -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) # Calibration process.load( "Configuration.StandardSequences.FrontierConditions_GlobalTag_cff" ) # process.GlobalTag.connect = 'frontier://FrontierProd/CMS_COND_21X_GLOBALTAG' diff --git a/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_cfg.py index 69e922111b8bd..3428bc59aea89 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_cfg.py @@ -36,7 +36,7 @@ # process.load( "Configuration.StandardSequences.MagneticField_0T_cff" ) process.load( "Configuration.StandardSequences.MagneticField_38T_cff" ) # Geometry # -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) # Calibration process.load( "Configuration.StandardSequences.FrontierConditions_GlobalTag_cff" ) # process.GlobalTag.connect = 'frontier://FrontierProd/CMS_COND_21X_GLOBALTAG' diff --git a/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_template_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_template_cfg.py index 7186bc90a1be2..f46b7c9122f89 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_template_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQMOfflineGlobalRunCAF_template_cfg.py @@ -19,7 +19,7 @@ process.load( "Configuration.StandardSequences.MagneticField_xMAG_FIELDx_cff" ) # Geometry -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) # Calibration process.load( "Configuration.StandardSequences.FrontierConditions_GlobalTag_cff" ) diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_HarvestTest_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_HarvestTest_cfg.py index b4a7ee7bab4d1..e7d65c6474b3f 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_HarvestTest_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_HarvestTest_cfg.py @@ -4,7 +4,7 @@ process.load("DQMServices.Components.EDMtoMEConverter_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # CRAFT08 diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py index 8afb2e7e42c30..e2fafc413cef0 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py @@ -23,7 +23,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py index e371b5f2205b6..ead43feed1643 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py @@ -35,7 +35,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py index 03f54f3fa42e2..7bb8b1b59d19c 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py @@ -25,7 +25,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # CALIBRATION diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py index fadbec170bb0d..f142ec9b2954e 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py @@ -25,7 +25,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # CALIBRATION diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_Tier0GlobalRun_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_Tier0GlobalRun_cfg.py index 600fb6a467bb7..dc247edaeeacb 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_Tier0GlobalRun_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_Tier0GlobalRun_cfg.py @@ -52,7 +52,7 @@ #------------------------------------------------- # GEOMETRY #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #-------------------------- # Calibration diff --git a/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py b/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py index a6e4abb57ff32..29835545f334b 100644 --- a/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py +++ b/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py @@ -35,7 +35,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py b/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py index b28df96f16d3b..c9913e2f56c9e 100644 --- a/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py +++ b/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py @@ -35,7 +35,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # CALIBRATION diff --git a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py index 0a4960a88fd71..89d0c035fb13e 100644 --- a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py +++ b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py @@ -33,7 +33,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQM/SiStripMonitorHardware/python/test/testSiStripCMMonitor_cfg.py b/DQM/SiStripMonitorHardware/python/test/testSiStripCMMonitor_cfg.py index de920bb1ff681..5589ed1bb1728 100644 --- a/DQM/SiStripMonitorHardware/python/test/testSiStripCMMonitor_cfg.py +++ b/DQM/SiStripMonitorHardware/python/test/testSiStripCMMonitor_cfg.py @@ -90,7 +90,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.ReconstructionCosmics_cff") diff --git a/DQM/SiStripMonitorHardware/python/test/testSiStripShotFilter_cfg.py b/DQM/SiStripMonitorHardware/python/test/testSiStripShotFilter_cfg.py index a0fe013df9a89..cbb2540a67b20 100644 --- a/DQM/SiStripMonitorHardware/python/test/testSiStripShotFilter_cfg.py +++ b/DQM/SiStripMonitorHardware/python/test/testSiStripShotFilter_cfg.py @@ -25,7 +25,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # Real data raw to digi process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("Configuration.StandardSequences.ReconstructionCosmics_cff") diff --git a/DQM/SiStripMonitorPedestals/test/PedsMonWithDB_cfg.py b/DQM/SiStripMonitorPedestals/test/PedsMonWithDB_cfg.py index 36887f8dc04ae..99ec9c2637d5e 100644 --- a/DQM/SiStripMonitorPedestals/test/PedsMonWithDB_cfg.py +++ b/DQM/SiStripMonitorPedestals/test/PedsMonWithDB_cfg.py @@ -12,7 +12,7 @@ ) # geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # tracker numbering process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") diff --git a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_RealData_cfg.py b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_RealData_cfg.py index 9ebed0195ec40..925636ba613f4 100644 --- a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_RealData_cfg.py +++ b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_RealData_cfg.py @@ -22,7 +22,7 @@ #------------------------------------------------- # CMS Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # TkDetMap for TkHistoMap diff --git a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py index 70e19b553fcc6..05ac0735f9388 100644 --- a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py +++ b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py @@ -21,7 +21,7 @@ #------------------------------------------------- # CMS Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- ## CALIBRATION diff --git a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py index 0479446ea9d59..b18893ae22975 100644 --- a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py +++ b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py @@ -21,7 +21,7 @@ #------------------------------------------------- # CMS Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- ## CALIBRATION diff --git a/DQM/TrackerMonitorTrack/test/monitortrackresiduals_cfg.py b/DQM/TrackerMonitorTrack/test/monitortrackresiduals_cfg.py index dd3fbf7ec98bf..18d7144da3055 100644 --- a/DQM/TrackerMonitorTrack/test/monitortrackresiduals_cfg.py +++ b/DQM/TrackerMonitorTrack/test/monitortrackresiduals_cfg.py @@ -31,7 +31,7 @@ ## ## Geometry ## -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ## diff --git a/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py b/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py index 8b8fd7b52e268..2bba2d0cfb9f2 100644 --- a/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py +++ b/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py @@ -19,7 +19,7 @@ process.load("Configuration.StandardSequences.MagneticField_38T_cff") #process.load("Configuration.GlobalRuns.ForceZeroTeslaField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("RecoMuon.DetLayers.muonDetLayerGeometry_cfi") diff --git a/DQM/TrackingMonitor/test/TrackingMonitor_AllTrackingSequences_cfg.py b/DQM/TrackingMonitor/test/TrackingMonitor_AllTrackingSequences_cfg.py index 17b9fb45d39e2..5f6f7b3183686 100644 --- a/DQM/TrackingMonitor/test/TrackingMonitor_AllTrackingSequences_cfg.py +++ b/DQM/TrackingMonitor/test/TrackingMonitor_AllTrackingSequences_cfg.py @@ -27,7 +27,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR_R_43_V3::All" process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("RecoLocalTracker.Configuration.RecoLocalTracker_cff") diff --git a/DQM/TrackingMonitor/test/TrackingMonitor_SeedMonitor_cfg.py b/DQM/TrackingMonitor/test/TrackingMonitor_SeedMonitor_cfg.py index ee56fc79a3a12..9b7847542f64c 100644 --- a/DQM/TrackingMonitor/test/TrackingMonitor_SeedMonitor_cfg.py +++ b/DQM/TrackingMonitor/test/TrackingMonitor_SeedMonitor_cfg.py @@ -50,7 +50,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR_R_43_V3::All" process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") diff --git a/DQM/TrackingMonitor/test/TrackingMonitor_StandAlone_cfg.py b/DQM/TrackingMonitor/test/TrackingMonitor_StandAlone_cfg.py index b55a2d984b7f6..c0d1f92340233 100644 --- a/DQM/TrackingMonitor/test/TrackingMonitor_StandAlone_cfg.py +++ b/DQM/TrackingMonitor/test/TrackingMonitor_StandAlone_cfg.py @@ -50,7 +50,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR_R_43_V3::All" process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.RawToDigi_Data_cff") process.load("RecoTracker.Configuration.RecoTracker_cff") diff --git a/DQM/TrigXMonitor/python/hlt_scaler_cfg.py b/DQM/TrigXMonitor/python/hlt_scaler_cfg.py index 9585d2ad390b1..9381b9eb8586d 100644 --- a/DQM/TrigXMonitor/python/hlt_scaler_cfg.py +++ b/DQM/TrigXMonitor/python/hlt_scaler_cfg.py @@ -9,7 +9,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") diff --git a/DQM/TrigXMonitor/test/hltSeed_l1Logic_file_cfg.py b/DQM/TrigXMonitor/test/hltSeed_l1Logic_file_cfg.py index 89ad9b4fa072b..78f59c394fa23 100644 --- a/DQM/TrigXMonitor/test/hltSeed_l1Logic_file_cfg.py +++ b/DQM/TrigXMonitor/test/hltSeed_l1Logic_file_cfg.py @@ -15,7 +15,7 @@ # DQM SOURCES # process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Components.DQMEnvironment_cfi") diff --git a/DQM/TrigXMonitorClient/python/test/hlt_scalerclient_cfg.py b/DQM/TrigXMonitorClient/python/test/hlt_scalerclient_cfg.py index 5b04440f8f474..dc4e4b2b2d06e 100644 --- a/DQM/TrigXMonitorClient/python/test/hlt_scalerclient_cfg.py +++ b/DQM/TrigXMonitorClient/python/test/hlt_scalerclient_cfg.py @@ -27,7 +27,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") diff --git a/DQM/TrigXMonitorClient/python/test/l1t_scalerclient_cfg.py b/DQM/TrigXMonitorClient/python/test/l1t_scalerclient_cfg.py index bde19bf5e95e0..d329875519493 100644 --- a/DQM/TrigXMonitorClient/python/test/l1t_scalerclient_cfg.py +++ b/DQM/TrigXMonitorClient/python/test/l1t_scalerclient_cfg.py @@ -15,7 +15,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.MuonCommonData.muonIdealGeometryXML_cfi") diff --git a/DQMOffline/Alignment/test/testMuAlDQM.py b/DQMOffline/Alignment/test/testMuAlDQM.py index dafae5c403d9e..b4eb55ef4990d 100644 --- a/DQMOffline/Alignment/test/testMuAlDQM.py +++ b/DQMOffline/Alignment/test/testMuAlDQM.py @@ -10,7 +10,7 @@ process.load("DQMServices.Components.MEtoEDMConverter_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/DQMOffline/CalibCalo/test/Pi0_test.py b/DQMOffline/CalibCalo/test/Pi0_test.py index 17db26a300dab..80b0d44ecedfd 100644 --- a/DQMOffline/CalibCalo/test/Pi0_test.py +++ b/DQMOffline/CalibCalo/test/Pi0_test.py @@ -6,7 +6,7 @@ process.load("Geometry.CaloEventSetup.CaloTopology_cfi") process.load("Configuration.StandardSequences.MagneticField_40T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi") process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") diff --git a/DQMOffline/CalibMuon/python/dtNoiseDBValidation_cfg.py b/DQMOffline/CalibMuon/python/dtNoiseDBValidation_cfg.py index f7d988f04560d..df47571dea201 100644 --- a/DQMOffline/CalibMuon/python/dtNoiseDBValidation_cfg.py +++ b/DQMOffline/CalibMuon/python/dtNoiseDBValidation_cfg.py @@ -30,7 +30,7 @@ class config: pass ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQMOffline/CalibMuon/python/dtT0DBValidation_cfg.py b/DQMOffline/CalibMuon/python/dtT0DBValidation_cfg.py index 2fcdcf6732d87..88860cc8f3867 100644 --- a/DQMOffline/CalibMuon/python/dtT0DBValidation_cfg.py +++ b/DQMOffline/CalibMuon/python/dtT0DBValidation_cfg.py @@ -29,7 +29,7 @@ class config: pass destinations = cms.untracked.vstring('cerr') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQMOffline/CalibMuon/python/dtTTrigDBValidation_cfg.py b/DQMOffline/CalibMuon/python/dtTTrigDBValidation_cfg.py index 4f56a7f4f2ea7..8f8aed7e3776f 100644 --- a/DQMOffline/CalibMuon/python/dtTTrigDBValidation_cfg.py +++ b/DQMOffline/CalibMuon/python/dtTTrigDBValidation_cfg.py @@ -29,7 +29,7 @@ class config: pass destinations = cms.untracked.vstring('cerr') ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQMOffline/CalibMuon/test/DTPreCalibTask_cfg.py b/DQMOffline/CalibMuon/test/DTPreCalibTask_cfg.py index 76d81f2033e26..538c389619e30 100644 --- a/DQMOffline/CalibMuon/test/DTPreCalibTask_cfg.py +++ b/DQMOffline/CalibMuon/test/DTPreCalibTask_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("TTrigPreCalibProc") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/DQMOffline/CalibMuon/test/DTt0DBValidation_ORCONsqlite_cfg.py b/DQMOffline/CalibMuon/test/DTt0DBValidation_ORCONsqlite_cfg.py index 6c294c5bfd7cd..65a9243f7dd37 100644 --- a/DQMOffline/CalibMuon/test/DTt0DBValidation_ORCONsqlite_cfg.py +++ b/DQMOffline/CalibMuon/test/DTt0DBValidation_ORCONsqlite_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQMOffline/CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py b/DQMOffline/CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py index 8418a44c664ce..eb2becf11bcf7 100644 --- a/DQMOffline/CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py +++ b/DQMOffline/CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQMOffline/CalibMuon/test/DTt0DBValidation_cfg.py b/DQMOffline/CalibMuon/test/DTt0DBValidation_cfg.py index bfa1e9b81a09e..b329f811b0a14 100644 --- a/DQMOffline/CalibMuon/test/DTt0DBValidation_cfg.py +++ b/DQMOffline/CalibMuon/test/DTt0DBValidation_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False diff --git a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py index 7a6458f2edb39..e0b1898db9f52 100644 --- a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py +++ b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_cfg.py b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_cfg.py index b6fdaa82b917e..57f0ff91b8f8b 100644 --- a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_cfg.py +++ b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_ORCONsqlite_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_TEMPL_cfg.py b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_TEMPL_cfg.py index 64295f1e40453..1c24bb6e66114 100644 --- a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_TEMPL_cfg.py +++ b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_TEMPL_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_cfg.py b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_cfg.py index 2b92ff10809b3..40df8b4eec232 100644 --- a/DQMOffline/CalibMuon/test/DTtTrigDBValidation_cfg.py +++ b/DQMOffline/CalibMuon/test/DTtTrigDBValidation_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("CALIB") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") process.DTGeometryESModule.applyAlignment = False process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidationReReco_cfg.py b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidationReReco_cfg.py index 72dc9c4c42f5c..6212304e4a01d 100644 --- a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidationReReco_cfg.py +++ b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidationReReco_cfg.py @@ -34,7 +34,7 @@ ## Geometry ## -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) ## Calibration ## diff --git a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidation_cfg.py b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidation_cfg.py index b1888642ff51c..e33312af27c8a 100644 --- a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidation_cfg.py +++ b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStripsValidation_cfg.py @@ -34,7 +34,7 @@ ## Geometry ## -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) ## Calibration ## diff --git a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStrips_cfg.py b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStrips_cfg.py index 72891d9c1696b..1f14fc5200028 100644 --- a/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStrips_cfg.py +++ b/DQMOffline/CalibTracker/test/CRAFTCalib/SiStripDQMBadStrips_cfg.py @@ -34,7 +34,7 @@ ## Geometry ## -process.load( "Configuration.StandardSequences.Geometry_cff" ) +process.load( "Configuration.StandardSequences.GeometryRecoDB_cff" ) ## Calibration ## diff --git a/DQMOffline/CalibTracker/test/SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py b/DQMOffline/CalibTracker/test/SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py index aa432dc5073f0..20f1e0d65c524 100644 --- a/DQMOffline/CalibTracker/test/SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py +++ b/DQMOffline/CalibTracker/test/SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py @@ -22,7 +22,7 @@ input = cms.untracked.int32(1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR_E_V13::All" #GR09_R_34X_V2 diff --git a/DQMOffline/CalibTracker/test/example_QualityCalibration_cfg.py b/DQMOffline/CalibTracker/test/example_QualityCalibration_cfg.py index 5292b8c5e25fc..0822c8a19f3df 100644 --- a/DQMOffline/CalibTracker/test/example_QualityCalibration_cfg.py +++ b/DQMOffline/CalibTracker/test/example_QualityCalibration_cfg.py @@ -13,7 +13,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQMOffline/CalibTracker/test/example_QualityValidation_cfg.py b/DQMOffline/CalibTracker/test/example_QualityValidation_cfg.py index b66fbfc1548e8..d4d77af7fb9a5 100644 --- a/DQMOffline/CalibTracker/test/example_QualityValidation_cfg.py +++ b/DQMOffline/CalibTracker/test/example_QualityValidation_cfg.py @@ -13,7 +13,7 @@ #------------------------------------------------- # Geometry #------------------------------------------------- -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #------------------------------------------------- # Calibration diff --git a/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVIdentifierRoot_cfg.py b/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVIdentifierRoot_cfg.py index 0393573ae1714..5447819324bb4 100644 --- a/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVIdentifierRoot_cfg.py +++ b/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVIdentifierRoot_cfg.py @@ -22,7 +22,7 @@ input = cms.untracked.int32(1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR09_R_34X_V2::All" diff --git a/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py b/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py index 9850166d334fb..de8248628c7bc 100644 --- a/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py +++ b/DQMOffline/CalibTracker/test/template_SiStripQualityBadAPVandHotStripIdentifierRoot_cfg.py @@ -22,7 +22,7 @@ input = cms.untracked.int32(1) ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR_E_V13::All" #GR09_R_34X_V2 diff --git a/DQMOffline/CalibTracker/test/template_SiStripQualityHotStripIdentifierRoot_cfg.py b/DQMOffline/CalibTracker/test/template_SiStripQualityHotStripIdentifierRoot_cfg.py index 0d04c3e9e8368..99e7230716d23 100644 --- a/DQMOffline/CalibTracker/test/template_SiStripQualityHotStripIdentifierRoot_cfg.py +++ b/DQMOffline/CalibTracker/test/template_SiStripQualityHotStripIdentifierRoot_cfg.py @@ -23,7 +23,7 @@ ) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_noesprefer_cff") #process.GlobalTag.connect = "frontier://FrontierProd/CMS_COND_21X_GLOBALTAG" diff --git a/DQMOffline/EGamma/test/EgammaAnalyzers_cfg.py b/DQMOffline/EGamma/test/EgammaAnalyzers_cfg.py index 206a1221a07e4..feaf822d474ef 100644 --- a/DQMOffline/EGamma/test/EgammaAnalyzers_cfg.py +++ b/DQMOffline/EGamma/test/EgammaAnalyzers_cfg.py @@ -15,7 +15,7 @@ process.source = cms.Source ("PoolSource",fileNames = cms.untracked.vstring(),secondaryFileNames = cms.untracked.vstring()) process.source.fileNames.extend(electronDbsDiscovery.search()) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMOffline.EGamma.egammaDQMOffline_cff") process.dqmElectronTagProbeAnalysis.OutputFile = cms.string(os.environ['TEST_HISTOS_FILE']) diff --git a/DQMOffline/EGamma/test/EgammaDQMOffline_cfg.py b/DQMOffline/EGamma/test/EgammaDQMOffline_cfg.py index 58d9bdef0c859..b8141f3a0f017 100644 --- a/DQMOffline/EGamma/test/EgammaDQMOffline_cfg.py +++ b/DQMOffline/EGamma/test/EgammaDQMOffline_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("photonAnalysis") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMOffline.EGamma.egammaDQMOffline_cff") process.load("DQMServices.Components.MEtoEDMConverter_cff") diff --git a/DQMOffline/EGamma/test/PhotonOfflineClient_cfg.py b/DQMOffline/EGamma/test/PhotonOfflineClient_cfg.py index 6a9ed7c9d276f..4bafa9e51d3d7 100644 --- a/DQMOffline/EGamma/test/PhotonOfflineClient_cfg.py +++ b/DQMOffline/EGamma/test/PhotonOfflineClient_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("photonOfflineClient") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMOffline.EGamma.photonOfflineClient_cfi") diff --git a/DQMOffline/EGamma/test/PiZeroAnalyzer_cfg.py b/DQMOffline/EGamma/test/PiZeroAnalyzer_cfg.py index 47f72ef20c56d..725637447d286 100644 --- a/DQMOffline/EGamma/test/PiZeroAnalyzer_cfg.py +++ b/DQMOffline/EGamma/test/PiZeroAnalyzer_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("piZeroAnalysis") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMOffline.EGamma.piZeroAnalyzer_cfi") process.load("DQMServices.Components.MEtoEDMConverter_cff") diff --git a/DQMOffline/EGamma/test/cosmicPhotonAnalyzer_cfg.py b/DQMOffline/EGamma/test/cosmicPhotonAnalyzer_cfg.py index 30998a2b05a12..e75943f9f348f 100644 --- a/DQMOffline/EGamma/test/cosmicPhotonAnalyzer_cfg.py +++ b/DQMOffline/EGamma/test/cosmicPhotonAnalyzer_cfg.py @@ -4,7 +4,7 @@ process.load("Geometry.CaloEventSetup.CaloTopology_cfi") process.load("DQMOffline.EGamma.cosmicPhotonAnalyzer_cfi") process.load("DQMServices.Components.MEtoEDMConverter_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") DQMStore = cms.Service("DQMStore") diff --git a/DQMOffline/Hcal/test/run_onRelVal_cfg.py b/DQMOffline/Hcal/test/run_onRelVal_cfg.py index 0d6f6a24ecf17..cd1d04508da41 100644 --- a/DQMOffline/Hcal/test/run_onRelVal_cfg.py +++ b/DQMOffline/Hcal/test/run_onRelVal_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("hcalval") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond diff --git a/DQMOffline/JetMET/test/BeamHaloAnalyzer_cfg.py b/DQMOffline/JetMET/test/BeamHaloAnalyzer_cfg.py index 990bf40a9b722..84c324edb64bb 100644 --- a/DQMOffline/JetMET/test/BeamHaloAnalyzer_cfg.py +++ b/DQMOffline/JetMET/test/BeamHaloAnalyzer_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("TEST") -process.load("Configuration/StandardSequences/Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration/StandardSequences/MagneticField_cff") process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff") process.load("Configuration/StandardSequences/RawToDigi_Data_cff") diff --git a/DQMOffline/JetMET/test/cruzet4.py b/DQMOffline/JetMET/test/cruzet4.py index 5769d1c096633..7cb60a8f3032e 100644 --- a/DQMOffline/JetMET/test/cruzet4.py +++ b/DQMOffline/JetMET/test/cruzet4.py @@ -18,7 +18,7 @@ process = cms.Process("Reco") process.load("CondCore.DBCommon.CondDBSetup_cfi") process = cms.Process("JetMETAnalysis") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") # # diff --git a/DQMOffline/JetMET/test/run_PromptAna.py b/DQMOffline/JetMET/test/run_PromptAna.py index a1c3298039ed2..b3babc7480013 100644 --- a/DQMOffline/JetMET/test/run_PromptAna.py +++ b/DQMOffline/JetMET/test/run_PromptAna.py @@ -5,9 +5,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -from Configuration.Geometry.GeometryRecoDB_cff import * -### process.load("Configuration/StandardSequences/Geometry_cff") ### Deprecated -process.load("Configuration.StandardSequences.GeometryRecoDB_cff") +from Configuration.StandardSequences.GeometryRecoDB_cff import * +process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration/StandardSequences/MagneticField_cff") process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff") diff --git a/DQMOffline/JetMET/test/run_PromptAna33X.py b/DQMOffline/JetMET/test/run_PromptAna33X.py index 8b5b7d9844285..603ae25ab6b9f 100644 --- a/DQMOffline/JetMET/test/run_PromptAna33X.py +++ b/DQMOffline/JetMET/test/run_PromptAna33X.py @@ -66,7 +66,7 @@ process = cms.Process("test") process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageLogger.MessageLogger_cfi") @@ -88,7 +88,7 @@ # # BeamHaloData producer # -process.load("Configuration/StandardSequences/Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration/StandardSequences/MagneticField_cff") process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff") process.load("RecoMET/Configuration/RecoMET_BeamHaloId_cff") diff --git a/DQMOffline/JetMET/test/run_PromptAnaHI.py b/DQMOffline/JetMET/test/run_PromptAnaHI.py index 0fd0db97f73b0..64e0b8599a2bd 100644 --- a/DQMOffline/JetMET/test/run_PromptAnaHI.py +++ b/DQMOffline/JetMET/test/run_PromptAnaHI.py @@ -77,7 +77,7 @@ ###for HI running #process.load('Configuration.StandardSequences.MagneticField_38T_cff') -process.load('Configuration.StandardSequences.Geometry_cff') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('RecoJets.JetAssociationProducers.trackExtrapolator_cfi') process.load('RecoJets.JetAssociationProducers.ak7JTA_cff') diff --git a/DQMOffline/JetMET/test/run_PromptAna_CAF.py b/DQMOffline/JetMET/test/run_PromptAna_CAF.py index 286cbf00110b5..ec27bd5ff00a3 100644 --- a/DQMOffline/JetMET/test/run_PromptAna_CAF.py +++ b/DQMOffline/JetMET/test/run_PromptAna_CAF.py @@ -25,7 +25,7 @@ process = cms.Process("test") process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageLogger.MessageLogger_cfi") @@ -40,7 +40,7 @@ # # BeamHaloData producer # -process.load("Configuration/StandardSequences/Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration/StandardSequences/MagneticField_cff") process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff") diff --git a/DQMOffline/JetMET/test/run_PromptAna_CAF33x.py b/DQMOffline/JetMET/test/run_PromptAna_CAF33x.py index 666c62b18a09c..d721bbb4bb33d 100644 --- a/DQMOffline/JetMET/test/run_PromptAna_CAF33x.py +++ b/DQMOffline/JetMET/test/run_PromptAna_CAF33x.py @@ -25,7 +25,7 @@ process = cms.Process("test") process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageLogger.MessageLogger_cfi") @@ -47,7 +47,7 @@ # # BeamHaloData producer # -process.load("Configuration/StandardSequences/Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration/StandardSequences/MagneticField_cff") process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff") process.load("RecoMET/Configuration/RecoMET_BeamHaloId_cff") diff --git a/DQMOffline/JetMET/test/simJetMETAnalyzer_cfg.py b/DQMOffline/JetMET/test/simJetMETAnalyzer_cfg.py index 8e72aa99ebe45..12895d34f1540 100644 --- a/DQMOffline/JetMET/test/simJetMETAnalyzer_cfg.py +++ b/DQMOffline/JetMET/test/simJetMETAnalyzer_cfg.py @@ -17,7 +17,7 @@ process = cms.Process("Reco") process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") # diff --git a/DQMOffline/Muon/test/muonMonitors_cfg.py b/DQMOffline/Muon/test/muonMonitors_cfg.py index dcd4845d604e6..7344c02710427 100644 --- a/DQMOffline/Muon/test/muonMonitors_cfg.py +++ b/DQMOffline/Muon/test/muonMonitors_cfg.py @@ -16,7 +16,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # Magnetic fiuld: force mag field to be 0.0 tesla -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_0T_cff") diff --git a/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py b/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py index 73bf44cc2af3d..c34f3bbfe6a9d 100644 --- a/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py +++ b/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py @@ -20,7 +20,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 process.MessageLogger.categories.append("HLTTauDQMOffline") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.CaloEventSetup.CaloTopology_cfi") # # remember to compile with USER_CXXFLAGS="-DEDM_ML_DEBUG" diff --git a/DQMOffline/Trigger/test/egHLTOffDQMClientTest_cfg.py b/DQMOffline/Trigger/test/egHLTOffDQMClientTest_cfg.py index 4bd0dc35fa6ed..ee6a54e1dbf70 100644 --- a/DQMOffline/Trigger/test/egHLTOffDQMClientTest_cfg.py +++ b/DQMOffline/Trigger/test/egHLTOffDQMClientTest_cfg.py @@ -10,7 +10,7 @@ process.load("DQMOffline.Trigger.EgHLTOfflineClient_cfi") process.load("DQMOffline.Trigger.EgHLTOfflineSummaryClient_cfi") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Geometry.CaloEventSetup.CaloGeometry_cfi") #process.load("Geometry.CaloEventSetup.CaloTopology_cfi") #process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") diff --git a/DQMOffline/Trigger/test/egHLTOffDQMSourceTest_cfg.py b/DQMOffline/Trigger/test/egHLTOffDQMSourceTest_cfg.py index 8cf845e5a2456..dc5c5155b4c20 100644 --- a/DQMOffline/Trigger/test/egHLTOffDQMSourceTest_cfg.py +++ b/DQMOffline/Trigger/test/egHLTOffDQMSourceTest_cfg.py @@ -11,7 +11,7 @@ #load and setup E/g HLT Offline DQM module process.load("DQMOffline.Trigger.EgHLTOfflineSource_cfi") #load calo geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.CaloEventSetup.CaloGeometry_cfi") process.load("Geometry.CaloEventSetup.CaloTopology_cfi") diff --git a/DQMOffline/Trigger/test/egHLTOffDQMTest_cfg.py b/DQMOffline/Trigger/test/egHLTOffDQMTest_cfg.py index b5760791759c2..b14676332ff56 100644 --- a/DQMOffline/Trigger/test/egHLTOffDQMTest_cfg.py +++ b/DQMOffline/Trigger/test/egHLTOffDQMTest_cfg.py @@ -13,7 +13,7 @@ #load calo geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.CaloEventSetup.CaloGeometry_cfi") process.load("Geometry.CaloEventSetup.CaloTopology_cfi") diff --git a/DQMOffline/Trigger/test/fv_dqmoffline_sourceclient-file_cfg.py b/DQMOffline/Trigger/test/fv_dqmoffline_sourceclient-file_cfg.py index 734dba2d94131..8afe5ba992acd 100644 --- a/DQMOffline/Trigger/test/fv_dqmoffline_sourceclient-file_cfg.py +++ b/DQMOffline/Trigger/test/fv_dqmoffline_sourceclient-file_cfg.py @@ -12,7 +12,7 @@ # process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Components.DQMEnvironment_cfi") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_cfg.py index 0e3b4d013eb56..feec62a4889ba 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_cfg.py @@ -16,7 +16,7 @@ #process.load("Configuration.GlobalRuns.ReconstructionGR_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Components.DQMEnvironment_cfi") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_inclusiveVBFParking_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_inclusiveVBFParking_cfg.py index 700d8a85194fa..42f1bb755b011 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_inclusiveVBFParking_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_inclusiveVBFParking_cfg.py @@ -10,7 +10,7 @@ ############## process.load("DQMServices.Core.DQM_cfg") process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Components.DQMEnvironment_cfi") process.load("DQMOffline.Trigger.HLTInclusiveVBFSource_cfi") process.load("DQMOffline.Trigger.HLTInclusiveVBFClient_cfi") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_data_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_data_cfg.py index 955f0cfa75a2a..105a526f4e274 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_data_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_data_cfg.py @@ -1,7 +1,7 @@ ##-- Starting import FWCore.ParameterSet.Config as cms process = cms.Process("DQM") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.EventContent.EventContent_cff') diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_relval-file_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_relval-file_cfg.py index a958f0e4552db..ff0cd61c0548c 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_relval-file_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_jetmet_relval-file_cfg.py @@ -13,7 +13,7 @@ # process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Components.DQMEnvironment_cfi") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient-file_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient-file_cfg.py index 73829b6927820..e591ff2193cc1 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient-file_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient-file_cfg.py @@ -15,7 +15,7 @@ #process.load("Configuration.GlobalRuns.ReconstructionGR_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("L1Trigger.Configuration.L1Config_cff") process.load("L1TriggerConfig.L1ScalesProducers.L1MuTriggerScalesConfig_cff") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_CRUZET_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_CRUZET_cfg.py index e5d30b49f2898..7c47d63102626 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_CRUZET_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_CRUZET_cfg.py @@ -15,7 +15,7 @@ #process.load("Configuration.GlobalRuns.ReconstructionGR_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("L1Trigger.Configuration.L1Config_cff") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_relval-file_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_relval-file_cfg.py index 89a6b14d92cc4..b558313ac22cc 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_relval-file_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_sourceclient_relval-file_cfg.py @@ -16,7 +16,7 @@ #process.load("Configuration.GlobalRuns.ReconstructionGR_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("L1Trigger.Configuration.L1Config_cff") #process.load("L1TriggerConfig.L1ScalesProducers.L1MuTriggerScalesConfig_cff") diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_step2_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_step2_cfg.py index 04c1fad5d74eb..27cc990e84094 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_step2_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_step2_cfg.py @@ -7,7 +7,7 @@ # process.load("DQMServices.Core.DQM_cfg") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # # ME to EDM diff --git a/DQMOffline/Trigger/test/trigger_dqmoffline_step3_cfg.py b/DQMOffline/Trigger/test/trigger_dqmoffline_step3_cfg.py index f086ff4906de2..813e5938ea548 100644 --- a/DQMOffline/Trigger/test/trigger_dqmoffline_step3_cfg.py +++ b/DQMOffline/Trigger/test/trigger_dqmoffline_step3_cfg.py @@ -4,7 +4,7 @@ process.load("DQMServices.Components.EDMtoMEConverter_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # # DQMOffline # diff --git a/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py b/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py index b48cb79c2fbba..c4ae47a334e43 100644 --- a/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py +++ b/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py @@ -39,7 +39,7 @@ ## apply VBTF electronID (needed for the current implementation ## of b2gSingleElectronDQMLoose and b2gSingleElectronDQMMedium) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/HLTriggerOffline/Btag/test/test.py b/HLTriggerOffline/Btag/test/test.py index 3589d182c3204..7c656b66df992 100644 --- a/HLTriggerOffline/Btag/test/test.py +++ b/HLTriggerOffline/Btag/test/test.py @@ -3,7 +3,7 @@ from PhysicsTools.PatAlgos.tools.coreTools import * process.load('FWCore.MessageService.MessageLogger_cfi') -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.Services_cff') process.load("DQMServices.Components.EDMtoMEConverter_cff") process.load("L1TriggerConfig.L1GtConfigProducers.L1GtConfig_cff") diff --git a/HLTriggerOffline/Common/test/hltHarvesting_cfg.py b/HLTriggerOffline/Common/test/hltHarvesting_cfg.py index 0616b4225d989..e7ba9119c58f7 100644 --- a/HLTriggerOffline/Common/test/hltHarvesting_cfg.py +++ b/HLTriggerOffline/Common/test/hltHarvesting_cfg.py @@ -55,7 +55,7 @@ #extra config needed in standalone process.load("L1TriggerConfig.L1GtConfigProducers.L1GtConfig_cff") process.load("Configuration.StandardSequences.L1TriggerDefaultMenu_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.validation = cms.Path( process.hltvalidation diff --git a/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py b/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py index 1e5709cb61f56..9b2b32817293d 100644 --- a/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py +++ b/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py @@ -8,7 +8,7 @@ process.load("L1TriggerConfig.L1GtConfigProducers.L1GtConfig_cff") process.load("Configuration.StandardSequences.L1TriggerDefaultMenu_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration/StandardSequences/Services_cff') process.load('FWCore/MessageService/MessageLogger_cfi') diff --git a/HLTriggerOffline/Common/test/hltriggeroffline_common_sourceclient-file_cfg.py b/HLTriggerOffline/Common/test/hltriggeroffline_common_sourceclient-file_cfg.py index 29e801513282c..718bb5a11352c 100644 --- a/HLTriggerOffline/Common/test/hltriggeroffline_common_sourceclient-file_cfg.py +++ b/HLTriggerOffline/Common/test/hltriggeroffline_common_sourceclient-file_cfg.py @@ -9,7 +9,7 @@ process.load("CondCore.DBCommon.CondDBSetup_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # # DQM SERVICES # diff --git a/HLTriggerOffline/Egamma/test/testPatRecoElectrons.py b/HLTriggerOffline/Egamma/test/testPatRecoElectrons.py index 1f15991efce31..56fd0abb54d18 100644 --- a/HLTriggerOffline/Egamma/test/testPatRecoElectrons.py +++ b/HLTriggerOffline/Egamma/test/testPatRecoElectrons.py @@ -62,7 +62,7 @@ process.load("PhysicsTools.PatAlgos.patSequences_cff") process.load("ElectroWeakAnalysis.WENu.simpleEleIdSequence_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load('Configuration.StandardSequences.MagneticField_38T_cff') diff --git a/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py b/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py index 5a5e98c9a1fb1..79220b00d6ba3 100644 --- a/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py +++ b/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py @@ -185,7 +185,7 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string(autoCond['startup']) diff --git a/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py b/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py index 8fc0031c03f38..14464a3e94e28 100644 --- a/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py +++ b/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py @@ -25,7 +25,7 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string(autoCond['startup']) diff --git a/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py b/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py index 98da5b63af2b1..9c165b852e96d 100644 --- a/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py +++ b/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py @@ -18,7 +18,7 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string(autoCond['startup']) diff --git a/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py b/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py index be8e87fd61a41..1a6e2dd928bb8 100644 --- a/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py +++ b/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py @@ -10,7 +10,7 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string(autoCond['startup']) diff --git a/HLTriggerOffline/SUSYBSM/test/SUSYBSM_triggerValidation.py b/HLTriggerOffline/SUSYBSM/test/SUSYBSM_triggerValidation.py index 490f833296d65..97a52a29bc1bd 100644 --- a/HLTriggerOffline/SUSYBSM/test/SUSYBSM_triggerValidation.py +++ b/HLTriggerOffline/SUSYBSM/test/SUSYBSM_triggerValidation.py @@ -17,7 +17,7 @@ #process.load("Configuration.GlobalRuns.ReconstructionGR_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("L1Trigger.Configuration.L1Config_cff") process.load("L1TriggerConfig.L1ScalesProducers.L1MuTriggerScalesConfig_cff") diff --git a/HLTriggerOffline/Top/test/topHLTDQM_production_cfg.py b/HLTriggerOffline/Top/test/topHLTDQM_production_cfg.py index aa2a9905bf396..abdff28d1ce4c 100644 --- a/HLTriggerOffline/Top/test/topHLTDQM_production_cfg.py +++ b/HLTriggerOffline/Top/test/topHLTDQM_production_cfg.py @@ -39,7 +39,7 @@ ## apply VBTF electronID (needed for the current implementation ## of topSingleElectronDQMLoose and topSingleElectronDQMMedium) -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("DQM.Physics.topElectronID_cff") diff --git a/Validation/CaloTowers/test/client_cfg.py b/Validation/CaloTowers/test/client_cfg.py index aab801024bcd5..969231db89542 100644 --- a/Validation/CaloTowers/test/client_cfg.py +++ b/Validation/CaloTowers/test/client_cfg.py @@ -16,7 +16,7 @@ process = cms.Process("CONV") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond diff --git a/Validation/CaloTowers/test/run_onRelVal_cfg.py b/Validation/CaloTowers/test/run_onRelVal_cfg.py index c49efabf43d75..6bd17de8ea758 100644 --- a/Validation/CaloTowers/test/run_onRelVal_cfg.py +++ b/Validation/CaloTowers/test/run_onRelVal_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("hcalval") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond diff --git a/Validation/CaloTowers/test/single_pi_merging_cfg.py b/Validation/CaloTowers/test/single_pi_merging_cfg.py index ddbb224486037..9a6ec6c5a42fc 100644 --- a/Validation/CaloTowers/test/single_pi_merging_cfg.py +++ b/Validation/CaloTowers/test/single_pi_merging_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("CONV") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond diff --git a/Validation/CaloTowers/test/source_cfg.py b/Validation/CaloTowers/test/source_cfg.py index 2a93306fe415c..859eb86e2c038 100644 --- a/Validation/CaloTowers/test/source_cfg.py +++ b/Validation/CaloTowers/test/source_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("RelValValidation") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond diff --git a/Validation/Configuration/test/SingleMuPt10_valid_cfg.py b/Validation/Configuration/test/SingleMuPt10_valid_cfg.py index 1bb90c3173376..ead0d856dcdc1 100644 --- a/Validation/Configuration/test/SingleMuPt10_valid_cfg.py +++ b/Validation/Configuration/test/SingleMuPt10_valid_cfg.py @@ -7,7 +7,7 @@ # Geometry master configuration # -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Services_cff") diff --git a/Validation/DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py b/Validation/DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py index 40a2e31782090..b665ce91af9da 100644 --- a/Validation/DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py +++ b/Validation/DTRecHits/test/DTValidation_RelVal_fromDIGI_cfg.py @@ -29,7 +29,7 @@ #process.prefer = cms.ESPrefer("PoolDBESSource","calibDB") # Geometry related -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ## DT local Reco process.load("RecoLocalMuon.Configuration.RecoLocalMuon_cff") diff --git a/Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py b/Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py index 1b9a0c4cd4b2a..80054dede62a1 100644 --- a/Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py +++ b/Validation/DTRecHits/test/DTValidation_RelVal_fromHLT_cfg.py @@ -11,7 +11,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # DQM services process.load("DQMServices.Core.DQMStore_cfg") diff --git a/Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py b/Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py index 677ce4e0ce430..9f40677751d07 100644 --- a/Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py +++ b/Validation/DTRecHits/test/DTValidation_RelVal_fromRAW_cfg.py @@ -29,7 +29,7 @@ #process.prefer = cms.ESPrefer("PoolDBESSource","calibDB") #Geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") ## DT unpacker process.load("EventFilter.DTRawToDigi.dtunpacker_cfi") diff --git a/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py b/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py index 5cdd16645bf2a..76ca8d1811bcf 100644 --- a/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py +++ b/Validation/DTRecHits/test/DTValidation_RelVal_fromRECO_cfg.py @@ -9,7 +9,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # DQM services process.load("DQMServices.Core.DQMStore_cfg") diff --git a/Validation/HcalRecHits/test/runALL_onRelVal_cfg.py b/Validation/HcalRecHits/test/runALL_onRelVal_cfg.py index 2c6c661180b29..9ee78fc3d84b2 100644 --- a/Validation/HcalRecHits/test/runALL_onRelVal_cfg.py +++ b/Validation/HcalRecHits/test/runALL_onRelVal_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("RecHitsValidationRelVal") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("DQMServices.Core.DQM_cfg") diff --git a/Validation/MuonCSCDigis/test/cscTiming.py b/Validation/MuonCSCDigis/test/cscTiming.py index 0a343ce4eea37..424c192dab8ec 100644 --- a/Validation/MuonCSCDigis/test/cscTiming.py +++ b/Validation/MuonCSCDigis/test/cscTiming.py @@ -4,7 +4,7 @@ #process.load("Configuration.StandardSequences.GeometryPilot2_cff") process.load("Configuration.StandardSequences.Sim_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Services_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/Validation/MuonDTDigis/test/DTDigiAnalyzer_singlemu.py b/Validation/MuonDTDigis/test/DTDigiAnalyzer_singlemu.py index ba2ca8940b107..363e2082c39e3 100644 --- a/Validation/MuonDTDigis/test/DTDigiAnalyzer_singlemu.py +++ b/Validation/MuonDTDigis/test/DTDigiAnalyzer_singlemu.py @@ -3,7 +3,7 @@ process = cms.Process("DTDigiAnalyzerFromDigi") # geometry -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") process.load("Geometry.DTGeometryBuilder.dtGeometry_cfi") #process.load("Configuration.StandardSequences.FakeConditions_cff") diff --git a/Validation/MuonHits/test/muonhits_valid_analyzer.py b/Validation/MuonHits/test/muonhits_valid_analyzer.py index 98662fbeaae44..c8a459508b559 100644 --- a/Validation/MuonHits/test/muonhits_valid_analyzer.py +++ b/Validation/MuonHits/test/muonhits_valid_analyzer.py @@ -9,7 +9,7 @@ # geometry #process.load("Geometry.EcalCommonData.EcalOnly_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.GeometryPilot2_cff") #process.load("Alignment.CommonAlignmentProducer.test.GlobalPositionRcd_read_cfg.py") process.load("Geometry.MuonNumbering.muonNumberingInitialization_cfi") diff --git a/Validation/MuonIdentification/test/MuonIdValToEDM_cfg.py b/Validation/MuonIdentification/test/MuonIdValToEDM_cfg.py index 5865b18ca8046..a9a6094e88216 100644 --- a/Validation/MuonIdentification/test/MuonIdValToEDM_cfg.py +++ b/Validation/MuonIdentification/test/MuonIdValToEDM_cfg.py @@ -13,7 +13,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = 'MC_3XY_V15::All' -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.CommonDetUnit.globalTrackingGeometry_cfi") process.load("Validation.MuonIdentification.muonIdVal_cff") diff --git a/Validation/RPCRecHits/test/rpcRecHitValidation_cfg.py b/Validation/RPCRecHits/test/rpcRecHitValidation_cfg.py index fcaa6a637fc0f..5ac35eeb72275 100644 --- a/Validation/RPCRecHits/test/rpcRecHitValidation_cfg.py +++ b/Validation/RPCRecHits/test/rpcRecHitValidation_cfg.py @@ -6,7 +6,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.EventContent.EventContent_cff") process.load("Configuration.StandardSequences.Services_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration.StandardSequences.GeometryDB_cff') process.load("Configuration.StandardSequences.MagneticField_38T_cff") process.load("Configuration.StandardSequences.RawToDigi_cff") diff --git a/Validation/RecoB/test/GridValidation/validation_FirstStepOnGrid.py b/Validation/RecoB/test/GridValidation/validation_FirstStepOnGrid.py index 8d536309918b1..b3bddb3a09437 100644 --- a/Validation/RecoB/test/GridValidation/validation_FirstStepOnGrid.py +++ b/Validation/RecoB/test/GridValidation/validation_FirstStepOnGrid.py @@ -24,7 +24,7 @@ # load the full reconstraction configuration, to make sure we're getting all needed dependencies process.load("Configuration.StandardSequences.MagneticField_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") #old one, to use for old releases +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #old one, to use for old releases process.load("Configuration.Geometry.GeometryIdeal_cff") #process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') #process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') diff --git a/Validation/RecoB/test/validation_customJet_cfg.py b/Validation/RecoB/test/validation_customJet_cfg.py index 47a1725e7fe73..8dadb1ffec7ee 100644 --- a/Validation/RecoB/test/validation_customJet_cfg.py +++ b/Validation/RecoB/test/validation_customJet_cfg.py @@ -35,7 +35,7 @@ # load the full reconstraction configuration, to make sure we're getting all needed dependencies process.load("Configuration.StandardSequences.MagneticField_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") #old one, to use for old releases +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #old one, to use for old releases process.load("Configuration.Geometry.GeometryIdeal_cff") #process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') #process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') diff --git a/Validation/RecoEgamma/test/ElectronRedoFromCore_cfg.py b/Validation/RecoEgamma/test/ElectronRedoFromCore_cfg.py index fe81377f3607c..44bc85e8240d5 100644 --- a/Validation/RecoEgamma/test/ElectronRedoFromCore_cfg.py +++ b/Validation/RecoEgamma/test/ElectronRedoFromCore_cfg.py @@ -11,7 +11,7 @@ process = cms.Process("electrons") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageService.MessageLogger_cfi") diff --git a/Validation/RecoEgamma/test/ElectronRedoFromTrackSeeds_cfg.py b/Validation/RecoEgamma/test/ElectronRedoFromTrackSeeds_cfg.py index ccd4221657ce9..aa225c2556b51 100644 --- a/Validation/RecoEgamma/test/ElectronRedoFromTrackSeeds_cfg.py +++ b/Validation/RecoEgamma/test/ElectronRedoFromTrackSeeds_cfg.py @@ -11,7 +11,7 @@ process = cms.Process("electronRedoFromTrackSeeds") process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.RawToDigi_cff") diff --git a/Validation/RecoEgamma/test/PhotonPostprocessing_cfg.py b/Validation/RecoEgamma/test/PhotonPostprocessing_cfg.py index cc53b748a195c..ce0fd9f2dd983 100644 --- a/Validation/RecoEgamma/test/PhotonPostprocessing_cfg.py +++ b/Validation/RecoEgamma/test/PhotonPostprocessing_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("photonPostprocessing") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Validation.RecoEgamma.photonPostprocessing_cfi") diff --git a/Validation/RecoEgamma/test/PhotonValidatorCrab_cfg.py b/Validation/RecoEgamma/test/PhotonValidatorCrab_cfg.py index 47be2beadb419..de38c9bdef51a 100644 --- a/Validation/RecoEgamma/test/PhotonValidatorCrab_cfg.py +++ b/Validation/RecoEgamma/test/PhotonValidatorCrab_cfg.py @@ -5,7 +5,7 @@ process.load('Configuration/StandardSequences/MixingNoPileUp_cff') process.load('Configuration/StandardSequences/EndOfProcess_cff') process.load('Configuration/StandardSequences/MagneticField_38T_cff') -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load('Configuration/EventContent/EventContent_cff') process.load('Configuration/StandardSequences/Reconstruction_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/Validation/RecoJets/test/sequence_validation_cfg.py b/Validation/RecoJets/test/sequence_validation_cfg.py index 4307e34bc1a05..327792e3ccc42 100644 --- a/Validation/RecoJets/test/sequence_validation_cfg.py +++ b/Validation/RecoJets/test/sequence_validation_cfg.py @@ -20,7 +20,7 @@ #process.load("Configuration.StandardSequences.Simulation_cff") #process.load("Configuration.StandardSequences.MixingNoPileUp_cff") #process.load("Configuration.StandardSequences.VtxSmearedGauss_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.MagneticField_cff") process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 1000 diff --git a/Validation/RecoMET/test/sequence_validation_cfg.py b/Validation/RecoMET/test/sequence_validation_cfg.py index 4a5599ac868c8..20e8ba4f97640 100644 --- a/Validation/RecoMET/test/sequence_validation_cfg.py +++ b/Validation/RecoMET/test/sequence_validation_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("METVALIDATION") process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.Geometry_cff") +#process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.Geometry.GeometryIdeal_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("Configuration/StandardSequences/MagneticField_cff") diff --git a/Validation/RecoMuon/test/muonValidation_cfg.py b/Validation/RecoMuon/test/muonValidation_cfg.py index 5d2bd1f12ffb7..c89d0ebaab6a7 100644 --- a/Validation/RecoMuon/test/muonValidation_cfg.py +++ b/Validation/RecoMuon/test/muonValidation_cfg.py @@ -52,7 +52,7 @@ process.MEtoEDMConverter_step = cms.Path(process.MEtoEDMConverter) process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "IDEAL_V9::All" diff --git a/Validation/RecoParticleFlow/test/QCDForPFFull_cfg.py b/Validation/RecoParticleFlow/test/QCDForPFFull_cfg.py index ee300ae146344..495d99c46c8f2 100644 --- a/Validation/RecoParticleFlow/test/QCDForPFFull_cfg.py +++ b/Validation/RecoParticleFlow/test/QCDForPFFull_cfg.py @@ -24,7 +24,7 @@ # process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") diff --git a/Validation/RecoParticleFlow/test/SingleParticle_cfg.py b/Validation/RecoParticleFlow/test/SingleParticle_cfg.py index a9eeba7c503fc..359dfc64f258e 100644 --- a/Validation/RecoParticleFlow/test/SingleParticle_cfg.py +++ b/Validation/RecoParticleFlow/test/SingleParticle_cfg.py @@ -50,7 +50,7 @@ # process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.MagneticField_40T_cff") diff --git a/Validation/RecoParticleFlow/test/ZTTFullSim_cfg.py b/Validation/RecoParticleFlow/test/ZTTFullSim_cfg.py index 3ec12beda88ac..20321308dc5cd 100644 --- a/Validation/RecoParticleFlow/test/ZTTFullSim_cfg.py +++ b/Validation/RecoParticleFlow/test/ZTTFullSim_cfg.py @@ -22,7 +22,7 @@ # process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") diff --git a/Validation/RecoParticleFlow/test/pflowValidationStep1_Template_cfg.py b/Validation/RecoParticleFlow/test/pflowValidationStep1_Template_cfg.py index 2982c89308eaf..7d583be652f14 100644 --- a/Validation/RecoParticleFlow/test/pflowValidationStep1_Template_cfg.py +++ b/Validation/RecoParticleFlow/test/pflowValidationStep1_Template_cfg.py @@ -75,7 +75,7 @@ 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.GeometryRecoDB_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['startup'] #'mc' diff --git a/Validation/RecoParticleFlow/test/pflowValidationStep1_test_cfg.py b/Validation/RecoParticleFlow/test/pflowValidationStep1_test_cfg.py index 671eb1a34c2ea..a283e83953ffa 100644 --- a/Validation/RecoParticleFlow/test/pflowValidationStep1_test_cfg.py +++ b/Validation/RecoParticleFlow/test/pflowValidationStep1_test_cfg.py @@ -97,7 +97,7 @@ 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.GeometryRecoDB_cff") from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['startup'] #'mc' diff --git a/Validation/RecoParticleFlow/test/ttbarFullSim_cfg.py b/Validation/RecoParticleFlow/test/ttbarFullSim_cfg.py index 49fc7f140737a..e08d58b05c546 100644 --- a/Validation/RecoParticleFlow/test/ttbarFullSim_cfg.py +++ b/Validation/RecoParticleFlow/test/ttbarFullSim_cfg.py @@ -24,7 +24,7 @@ # process.load("Configuration.StandardSequences.Services_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") #process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.MagneticField_40T_cff") diff --git a/Validation/RecoTau/test/RunValidation_VtXCutScan.py b/Validation/RecoTau/test/RunValidation_VtXCutScan.py index ec32fef832e7b..4b0118e002447 100755 --- a/Validation/RecoTau/test/RunValidation_VtXCutScan.py +++ b/Validation/RecoTau/test/RunValidation_VtXCutScan.py @@ -99,7 +99,7 @@ def LoadDataCffFile(theFile): #myFile = os.path.join(ReleaseBase, "Validation/RecoTau/test", "EventSource_%s_RECO_cff.py" % options.eventType) LoadDataCffFile(myFile) #Reruns PFTau -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("RecoTauTag.Configuration.RecoPFTauTag_cff") diff --git a/Validation/RecoTau/test/RunValidation_cfg.py b/Validation/RecoTau/test/RunValidation_cfg.py index 387dddcc4b79b..2d3cd62d64c03 100755 --- a/Validation/RecoTau/test/RunValidation_cfg.py +++ b/Validation/RecoTau/test/RunValidation_cfg.py @@ -123,14 +123,14 @@ def LoadDataCffFile(theFile): print process.source # check if we want to rerun PFTau if options.dataSource.find('PFTau') != -1: - process.load("Configuration.StandardSequences.Geometry_cff") + process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("RecoTauTag.Configuration.RecoPFTauTag_cff") process.runPFTau = cms.Path(process.PFTau) process.schedule.append(process.runPFTau) if options.dataSource.find('CaloTau') != -1: - process.load("Configuration.StandardSequences.Geometry_cff") + process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("RecoTauTag.Configuration.RecoTauTag_cff") diff --git a/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py b/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py index f69f5eeebf5fd..a451ff0f4e3c9 100644 --- a/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py +++ b/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py @@ -48,7 +48,7 @@ ### standard includes process.load('Configuration/StandardSequences/Services_cff') -process.load('Configuration.StandardSequences.Geometry_cff') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load("Configuration.StandardSequences.RawToDigi_cff") process.load("Configuration.EventContent.EventContent_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/Validation/RecoTrack/test/MultiTrackValidator_cfg.py b/Validation/RecoTrack/test/MultiTrackValidator_cfg.py index 57ee4892df00d..7cbf4cc9bf548 100644 --- a/Validation/RecoTrack/test/MultiTrackValidator_cfg.py +++ b/Validation/RecoTrack/test/MultiTrackValidator_cfg.py @@ -85,7 +85,7 @@ ### standard includes process.load('Configuration/StandardSequences/Services_cff') -process.load('Configuration.StandardSequences.Geometry_cff') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load("Configuration.StandardSequences.RawToDigi_cff") process.load("Configuration.EventContent.EventContent_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/Validation/RecoTrack/test/SeedValidator_cfg.py b/Validation/RecoTrack/test/SeedValidator_cfg.py index 10c027e4ac63e..5b2f8f1997ba3 100644 --- a/Validation/RecoTrack/test/SeedValidator_cfg.py +++ b/Validation/RecoTrack/test/SeedValidator_cfg.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("SEEDVALIDATOR") -process.load("Configuration/StandardSequences/Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") process.load("FWCore.MessageService.MessageLogger_cfi") diff --git a/Validation/RecoTrack/test/cosmictrackingPerformanceValidation_cfg.py b/Validation/RecoTrack/test/cosmictrackingPerformanceValidation_cfg.py index e573396867686..5d7356b22e7be 100644 --- a/Validation/RecoTrack/test/cosmictrackingPerformanceValidation_cfg.py +++ b/Validation/RecoTrack/test/cosmictrackingPerformanceValidation_cfg.py @@ -4,7 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") ### standard includes -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.RawToDigi_cff") process.load("Configuration.EventContent.EventContentCosmics_cff") process.load("Configuration.StandardSequences.ReconstructionCosmics_cff") diff --git a/Validation/RecoTrack/test/seedPerformanceValidation_cfg.py b/Validation/RecoTrack/test/seedPerformanceValidation_cfg.py index 5dadbf8741169..b8f2516ade75d 100644 --- a/Validation/RecoTrack/test/seedPerformanceValidation_cfg.py +++ b/Validation/RecoTrack/test/seedPerformanceValidation_cfg.py @@ -4,7 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") ### standard includes -process.load('Configuration/StandardSequences/Geometry_cff') +process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load("Configuration.StandardSequences.RawToDigi_cff") process.load("Configuration.EventContent.EventContent_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/Validation/RecoVertex/python/pvRecoSequence_cff.py b/Validation/RecoVertex/python/pvRecoSequence_cff.py index 3e4b9a2d77a1a..5ba2d1a8d17d2 100644 --- a/Validation/RecoVertex/python/pvRecoSequence_cff.py +++ b/Validation/RecoVertex/python/pvRecoSequence_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.Geometry_cff import * +from Configuration.StandardSequences.GeometryRecoDB_cff import * from Configuration.StandardSequences.Reconstruction_cff import * #from RecoVertex.PrimaryVertexProducer.OfflinePrimaryVertices_cfi import * diff --git a/Validation/RecoVertex/test/demoProducePrimaryVertex_cfg.py b/Validation/RecoVertex/test/demoProducePrimaryVertex_cfg.py index 6c7cb65a2b2e6..e59a82763fdfa 100644 --- a/Validation/RecoVertex/test/demoProducePrimaryVertex_cfg.py +++ b/Validation/RecoVertex/test/demoProducePrimaryVertex_cfg.py @@ -6,7 +6,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.GlobalTag.globaltag= "START3X_V25B::All" process.load("Configuration.EventContent.EventContent_cff") diff --git a/Validation/RecoVertex/test/produceAndAnalyzePrimaryVertex_cfg.py b/Validation/RecoVertex/test/produceAndAnalyzePrimaryVertex_cfg.py index c4e1d592ea8e8..7611f1a47e50d 100644 --- a/Validation/RecoVertex/test/produceAndAnalyzePrimaryVertex_cfg.py +++ b/Validation/RecoVertex/test/produceAndAnalyzePrimaryVertex_cfg.py @@ -5,7 +5,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.GlobalTag.globaltag= "START3X_V25B::All" process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") diff --git a/Validation/RecoVertex/test/redoPV_cfg.py b/Validation/RecoVertex/test/redoPV_cfg.py index e369a78b33804..88a1065bdcdac 100644 --- a/Validation/RecoVertex/test/redoPV_cfg.py +++ b/Validation/RecoVertex/test/redoPV_cfg.py @@ -13,7 +13,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.GlobalTag.globaltag= "START3X_V25B::All" process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi") diff --git a/Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py b/Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py index 3844635fba19b..ac07933abbb29 100644 --- a/Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py +++ b/Validation/TrackerConfiguration/test/Muon_FullChain_cfg.py @@ -28,7 +28,7 @@ process = cms.Process("TrackerValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerConfiguration/test/SimHits_Validation_cfg.py b/Validation/TrackerConfiguration/test/SimHits_Validation_cfg.py index ebcabb6f02389..ec35e37f9124a 100644 --- a/Validation/TrackerConfiguration/test/SimHits_Validation_cfg.py +++ b/Validation/TrackerConfiguration/test/SimHits_Validation_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("TrackerValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerConfiguration/test/ValidationChainOnly_cfg.py b/Validation/TrackerConfiguration/test/ValidationChainOnly_cfg.py index d2e9bc43ef109..28d4b8136d7f7 100644 --- a/Validation/TrackerConfiguration/test/ValidationChainOnly_cfg.py +++ b/Validation/TrackerConfiguration/test/ValidationChainOnly_cfg.py @@ -15,7 +15,7 @@ process = cms.Process("TrackerValidationOnly") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerDigis/test/trackerdigivalid_cfg.py b/Validation/TrackerDigis/test/trackerdigivalid_cfg.py index b63132e5a3eb0..6c83e1afdc749 100644 --- a/Validation/TrackerDigis/test/trackerdigivalid_cfg.py +++ b/Validation/TrackerDigis/test/trackerdigivalid_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("DigiValidationOnly") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerDigis/test/trackerdigivalid_frontier_cfg.py b/Validation/TrackerDigis/test/trackerdigivalid_frontier_cfg.py index 745a9396ebbb4..4d65d88383a6a 100644 --- a/Validation/TrackerDigis/test/trackerdigivalid_frontier_cfg.py +++ b/Validation/TrackerDigis/test/trackerdigivalid_frontier_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("DigiValidationOnly") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerHits/test/TrackerHitValid_cfg.py b/Validation/TrackerHits/test/TrackerHitValid_cfg.py index 2dd188fe95d32..43985c540b205 100644 --- a/Validation/TrackerHits/test/TrackerHitValid_cfg.py +++ b/Validation/TrackerHits/test/TrackerHitValid_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("TrackerValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/Validation/TrackerRecHits/test/SiPixelRecHitsValid_cfg.py b/Validation/TrackerRecHits/test/SiPixelRecHitsValid_cfg.py index 40fc132b304c1..713ac837c1edb 100644 --- a/Validation/TrackerRecHits/test/SiPixelRecHitsValid_cfg.py +++ b/Validation/TrackerRecHits/test/SiPixelRecHitsValid_cfg.py @@ -11,7 +11,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/Validation/TrackerRecHits/test/SiStripRecHitsValid_cfg.py b/Validation/TrackerRecHits/test/SiStripRecHitsValid_cfg.py index 0233aaf310937..f5bd094085df7 100644 --- a/Validation/TrackerRecHits/test/SiStripRecHitsValid_cfg.py +++ b/Validation/TrackerRecHits/test/SiStripRecHitsValid_cfg.py @@ -11,7 +11,7 @@ process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.Geometry_cff") +process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff")