diff --git a/Alignment/APEEstimation/python/TrackRefitter_38T_cff.py b/Alignment/APEEstimation/python/TrackRefitter_38T_cff.py index c4d44bbdb40a6..cd014aca9226b 100644 --- a/Alignment/APEEstimation/python/TrackRefitter_38T_cff.py +++ b/Alignment/APEEstimation/python/TrackRefitter_38T_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Geometry.GeometryRecoDB_cff import * -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag from Configuration.StandardSequences.MagneticField_cff import * from RecoVertex.BeamSpotProducer.BeamSpot_cfi import * diff --git a/Alignment/APEEstimation/test/testApeestimator_cfg.py b/Alignment/APEEstimation/test/testApeestimator_cfg.py index e1797da3f9051..7f9a029ca5958 100644 --- a/Alignment/APEEstimation/test/testApeestimator_cfg.py +++ b/Alignment/APEEstimation/test/testApeestimator_cfg.py @@ -144,8 +144,8 @@ ## process.load("Alignment.APEEstimation.TrackRefitter_38T_cff") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_design', '') diff --git a/CalibCalorimetry/EcalTPGTools/test/produceTPGParameters_beamv6_2021_235fb.py b/CalibCalorimetry/EcalTPGTools/test/produceTPGParameters_beamv6_2021_235fb.py index 02719876f143d..c6fb751a526a7 100644 --- a/CalibCalorimetry/EcalTPGTools/test/produceTPGParameters_beamv6_2021_235fb.py +++ b/CalibCalorimetry/EcalTPGTools/test/produceTPGParameters_beamv6_2021_235fb.py @@ -17,7 +17,7 @@ ) process.load("CondCore.CondDB.CondDB_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '101X_postLS2_realistic_v6', '') diff --git a/CalibMuon/DTCalibration/python/dtDQMClientAlca_cfg.py b/CalibMuon/DTCalibration/python/dtDQMClientAlca_cfg.py index 45e3bbfb23e7a..d80cf3a265a7d 100644 --- a/CalibMuon/DTCalibration/python/dtDQMClientAlca_cfg.py +++ b/CalibMuon/DTCalibration/python/dtDQMClientAlca_cfg.py @@ -11,7 +11,7 @@ class config: pass process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "" process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py b/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py index 7da46f463ef0a..3ad9e77effd51 100644 --- a/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py +++ b/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py @@ -27,7 +27,7 @@ class config: pass fileMode = cms.untracked.string(config.fileMode) ) -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CalibMuon/DTCalibration/python/dtNoiseCalibration_cfg.py b/CalibMuon/DTCalibration/python/dtNoiseCalibration_cfg.py index 211730cb07a02..caa20f1e39155 100644 --- a/CalibMuon/DTCalibration/python/dtNoiseCalibration_cfg.py +++ b/CalibMuon/DTCalibration/python/dtNoiseCalibration_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtT0AbsoluteReferenceCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0AbsoluteReferenceCorrection_cfg.py index d6f8657071f8b..df27749ccbf8f 100644 --- a/CalibMuon/DTCalibration/python/dtT0AbsoluteReferenceCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0AbsoluteReferenceCorrection_cfg.py @@ -5,11 +5,11 @@ process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff") process.MessageLogger.debugModules = cms.untracked.vstring('dtT0AbsoluteReferenceCorrection') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' #process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") diff --git a/CalibMuon/DTCalibration/python/dtT0Analyzer_cfg.py b/CalibMuon/DTCalibration/python/dtT0Analyzer_cfg.py index 04bd150aeb39f..29ffebbe41465 100644 --- a/CalibMuon/DTCalibration/python/dtT0Analyzer_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0Analyzer_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("DTT0Analyzer") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py index a66d2bbd759d3..928d272612040 100644 --- a/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0FEBPathCorrection_cfg.py @@ -5,11 +5,11 @@ process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff") process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FEBPathCorrection') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' #process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") diff --git a/CalibMuon/DTCalibration/python/dtT0FillChamberFromDBCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0FillChamberFromDBCorrection_cfg.py index 875588e9d6c93..46c06cdab40c5 100644 --- a/CalibMuon/DTCalibration/python/dtT0FillChamberFromDBCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0FillChamberFromDBCorrection_cfg.py @@ -5,12 +5,8 @@ process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff") process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FillChamberFromDBCorrection') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' - -#process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -#process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") diff --git a/CalibMuon/DTCalibration/python/dtT0FillDefaultFromDBCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0FillDefaultFromDBCorrection_cfg.py index 51f4772e2f30d..8c5e4b35c2069 100644 --- a/CalibMuon/DTCalibration/python/dtT0FillDefaultFromDBCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0FillDefaultFromDBCorrection_cfg.py @@ -5,12 +5,8 @@ process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff") process.MessageLogger.debugModules = cms.untracked.vstring('dtT0FillDefaultFromDBCorrection') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' - -#process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -#process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") process.load("Geometry.DTGeometry.dtGeometry_cfi") diff --git a/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py b/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py index f73c9e65fda97..d947fd0beca30 100644 --- a/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py @@ -20,7 +20,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "" process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtT0WireInChamberReferenceCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtT0WireInChamberReferenceCorrection_cfg.py index 9db7bc346efdd..cd0dcdb3701df 100644 --- a/CalibMuon/DTCalibration/python/dtT0WireInChamberReferenceCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0WireInChamberReferenceCorrection_cfg.py @@ -5,11 +5,11 @@ process.load("CalibMuon.DTCalibration.messageLoggerDebug_cff") process.MessageLogger.debugModules = cms.untracked.vstring('dtT0WireInChamberReferenceCorrection') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' #process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") diff --git a/CalibMuon/DTCalibration/python/dtTPAnalyzer_cfg.py b/CalibMuon/DTCalibration/python/dtTPAnalyzer_cfg.py index 33c4fba763445..b7f1a517a5e35 100644 --- a/CalibMuon/DTCalibration/python/dtTPAnalyzer_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTPAnalyzer_cfg.py @@ -6,7 +6,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "" process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py b/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py index 1fdc8aac9d00b..95741876d7d9d 100644 --- a/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py @@ -16,7 +16,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "" process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtTPDeadWriter_cfg.py b/CalibMuon/DTCalibration/python/dtTPDeadWriter_cfg.py index 988b4fb0444ce..a95951489a3b2 100644 --- a/CalibMuon/DTCalibration/python/dtTPDeadWriter_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTPDeadWriter_cfg.py @@ -3,10 +3,10 @@ process = cms.Process("DTTPDeadWriter") #process.load("Configuration.StandardSequences.GeometryDB_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.GlobalTag.globaltag = '' -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CalibMuon/DTCalibration/python/dtTTrigConstantShiftCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigConstantShiftCorrection_cfg.py index 38a0928ede2ad..9d2e883579f00 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigConstantShiftCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigConstantShiftCorrection_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtTTrigCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigCorrection_cfg.py index 4231ba5102ea6..c0b942a219f97 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigCorrection_cfg.py @@ -4,7 +4,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtTTrigResidualCorrection_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigResidualCorrection_cfg.py index 147d5af3e2f30..d418c5a9c4a13 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigResidualCorrection_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigResidualCorrection_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py index 153b4b6231ece..f9d78cc397b29 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py @@ -14,7 +14,7 @@ resolution = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CalibMuon/DTCalibration/python/dtTTrigWriter_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigWriter_cfg.py index cb6a00c4b8ee6..c34e76a1fbc1c 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigWriter_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigWriter_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("PROD") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CalibMuon/DTCalibration/python/dtVDriftMeanTimerWriter_cfg.py b/CalibMuon/DTCalibration/python/dtVDriftMeanTimerWriter_cfg.py index b0e140cc925ed..84c15c2da1928 100644 --- a/CalibMuon/DTCalibration/python/dtVDriftMeanTimerWriter_cfg.py +++ b/CalibMuon/DTCalibration/python/dtVDriftMeanTimerWriter_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dtVDriftSegmentWriter_cfg.py b/CalibMuon/DTCalibration/python/dtVDriftSegmentWriter_cfg.py index b7a58eff7d7f9..104ffaf1b8752 100644 --- a/CalibMuon/DTCalibration/python/dtVDriftSegmentWriter_cfg.py +++ b/CalibMuon/DTCalibration/python/dtVDriftSegmentWriter_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cff.py b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cff.py index 9e26b169c877f..1e3f1d947d7cc 100644 --- a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cff.py +++ b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cff.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.GeometryDB_cff import * from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * +from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * from CondCore.CondDB.CondDB_cfi import * from RecoLocalMuon.Configuration.RecoLocalMuon_cff import * diff --git a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_cff.py b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_cff.py index d458e66a05e22..c9a836319c7a7 100644 --- a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_cff.py +++ b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_cff.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.GeometryDB_cff import * from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * +from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * from CondCore.CondDB.CondDB_cfi import * from RecoLocalMuon.Configuration.RecoLocalMuonCosmics_cff import * diff --git a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_vDriftSeg_cff.py b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_vDriftSeg_cff.py index cf11ee90fca18..a90f1d3c26f49 100644 --- a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_vDriftSeg_cff.py +++ b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_cosmics_vDriftSeg_cff.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.GeometryDB_cff import * from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * +from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * from CondCore.CondDB.CondDB_cfi import * from RecoLocalMuon.Configuration.RecoLocalMuonCosmics_cff import * diff --git a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_t0Seg_cff.py b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_t0Seg_cff.py index f998611025b5b..55ab01f3c6a6e 100644 --- a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_t0Seg_cff.py +++ b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_t0Seg_cff.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.GeometryDB_cff import * from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * +from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * from CondCore.CondDB.CondDB_cfi import * from RecoLocalMuon.Configuration.RecoLocalMuon_cff import * diff --git a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_vDriftSeg_cff.py b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_vDriftSeg_cff.py index 0e896035d8e7d..a97b24fe0147c 100644 --- a/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_vDriftSeg_cff.py +++ b/CalibMuon/DTCalibration/python/dt_offlineAnalysis_common_vDriftSeg_cff.py @@ -2,7 +2,7 @@ from Configuration.StandardSequences.GeometryDB_cff import * from Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff import * -from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * +from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * from CondCore.CondDB.CondDB_cfi import * from RecoLocalMuon.Configuration.RecoLocalMuon_cff import * diff --git a/CalibMuon/DTCalibration/python/dumpDBToFile_GT_ttrig_cfg.py b/CalibMuon/DTCalibration/python/dumpDBToFile_GT_ttrig_cfg.py index da8dc0c173809..f7a6c34607fa1 100644 --- a/CalibMuon/DTCalibration/python/dumpDBToFile_GT_ttrig_cfg.py +++ b/CalibMuon/DTCalibration/python/dumpDBToFile_GT_ttrig_cfg.py @@ -4,7 +4,7 @@ process.load("CondCore.CondDB.CondDB_cfi") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/python/dumpDBToFile_GT_vdrift_cfg.py b/CalibMuon/DTCalibration/python/dumpDBToFile_GT_vdrift_cfg.py index 2fe9c45db2ab2..d264b41d0f8a4 100644 --- a/CalibMuon/DTCalibration/python/dumpDBToFile_GT_vdrift_cfg.py +++ b/CalibMuon/DTCalibration/python/dumpDBToFile_GT_vdrift_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("DumpDBToFile") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '' process.load("CondCore.CondDB.CondDB_cfi") diff --git a/CalibMuon/DTCalibration/test/DumpFileToDB_diffMode_cfg.py b/CalibMuon/DTCalibration/test/DumpFileToDB_diffMode_cfg.py index 21b0b65dc104b..8245def422017 100644 --- a/CalibMuon/DTCalibration/test/DumpFileToDB_diffMode_cfg.py +++ b/CalibMuon/DTCalibration/test/DumpFileToDB_diffMode_cfg.py @@ -14,7 +14,7 @@ ) -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = "GR10_P_V5::All" #process.GlobalTag.pfnPrefix = cms.untracked.string('frontier://FrontierProd/') diff --git a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_cfg.py b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_cfg.py index eaf04136bcf38..eafb2be175997 100644 --- a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_cfg.py +++ b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_cfg.py @@ -7,7 +7,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_data'] process.source = cms.Source("EmptyIOVSource", diff --git a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_phase1.py b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_phase1.py index 51e440ebeaa4b..0087828c21398 100644 --- a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_phase1.py +++ b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_phase1.py @@ -7,7 +7,7 @@ process.load("Configuration.Geometry.GeometryExtended2017Reco_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase1_2017_design'] #process.GlobalTag = GlobalTag(process.GlobalTag, 'phase1_2017_design', '') #process.GlobalTag = GlobalTag(process.GlobalTag, '76X_upgrade2017_design_v8', '') diff --git a/CalibTracker/SiPixelConnectivity/test/read_cfg.py b/CalibTracker/SiPixelConnectivity/test/read_cfg.py index 9eb4783f7a637..d4d64e828b165 100644 --- a/CalibTracker/SiPixelConnectivity/test/read_cfg.py +++ b/CalibTracker/SiPixelConnectivity/test/read_cfg.py @@ -6,7 +6,7 @@ process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_design'] process.MessageLogger = cms.Service("MessageLogger", diff --git a/CalibTracker/SiStripChannelGain/test/7TeVData/Gains_Compute_cfg.py b/CalibTracker/SiStripChannelGain/test/7TeVData/Gains_Compute_cfg.py index 8889ec512a6ce..03dd803d7d2d0 100644 --- a/CalibTracker/SiStripChannelGain/test/7TeVData/Gains_Compute_cfg.py +++ b/CalibTracker/SiStripChannelGain/test/7TeVData/Gains_Compute_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("APVGAIN") process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #this block is there to solve issue related to SiStripQualityRcd process.load("CalibTracker.SiStripESProducers.SiStripQualityESProducer_cfi") diff --git a/CalibTracker/SiStripChannelGain/test/7TeVData/Validation_Compute_cfg.py b/CalibTracker/SiStripChannelGain/test/7TeVData/Validation_Compute_cfg.py index 07618bf3d997b..d55b5cdc36c61 100644 --- a/CalibTracker/SiStripChannelGain/test/7TeVData/Validation_Compute_cfg.py +++ b/CalibTracker/SiStripChannelGain/test/7TeVData/Validation_Compute_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("APVGAIN") process.load('Configuration.StandardSequences.GeometryRecoDB_cff') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #this block is there to solve issue related to SiStripQualityRcd process.load("CalibTracker.SiStripESProducers.SiStripQualityESProducer_cfi") diff --git a/CalibTracker/SiStripChannelGain/test/UsefullCode/PayloadFromASCIIfile/ProducePayloadFromASCII_cfg.py b/CalibTracker/SiStripChannelGain/test/UsefullCode/PayloadFromASCIIfile/ProducePayloadFromASCII_cfg.py index 1355dc97d606a..f54cd8ef047a3 100644 --- a/CalibTracker/SiStripChannelGain/test/UsefullCode/PayloadFromASCIIfile/ProducePayloadFromASCII_cfg.py +++ b/CalibTracker/SiStripChannelGain/test/UsefullCode/PayloadFromASCIIfile/ProducePayloadFromASCII_cfg.py @@ -12,7 +12,7 @@ input = cms.untracked.int32(1) ) -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'GR_P_V53', '') diff --git a/CalibTracker/SiStripQuality/test/cfg/SiStripQualityStatistics_cfg.py b/CalibTracker/SiStripQuality/test/cfg/SiStripQualityStatistics_cfg.py index 68b5d296721d1..db6b7e1eee696 100644 --- a/CalibTracker/SiStripQuality/test/cfg/SiStripQualityStatistics_cfg.py +++ b/CalibTracker/SiStripQuality/test/cfg/SiStripQualityStatistics_cfg.py @@ -47,8 +47,8 @@ # You can get the bad channel records from a GlobalTag or from specific tags using a PoolDBESSource and an ESPrefer -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') # process.poolDBESSource = cms.ESSource("PoolDBESSource", diff --git a/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py b/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py index d64e63996a0e9..5cd29d7e52e34 100644 --- a/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py +++ b/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py @@ -60,8 +60,8 @@ # You can get the bad channel records from a GlobalTag or from specific tags using a PoolDBESSource and an ESPrefer -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.load("Configuration.Geometry.GeometryRecoDB_cff") diff --git a/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py b/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py index 8e8dd1bba5ff4..8ec43403557ab 100644 --- a/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py +++ b/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py @@ -298,7 +298,7 @@ print("[INFO] Using GT POSTLS162_V5::All") process.GlobalTag.globaltag = 'POSTLS162_V5::All' else: - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') if(options.files==""): process.source.fileNames=[ 'root://cms-xrd-global.cern.ch//store/data/Run2012D/DoubleElectron/AOD/15Apr2014-v1/00000/0EA11D35-0CD5-E311-862E-0025905A6070.root' ] diff --git a/Calibration/HcalAlCaRecoProducers/test/AlCaIterativePhiSym_cfg.py b/Calibration/HcalAlCaRecoProducers/test/AlCaIterativePhiSym_cfg.py index df2123e74634b..17bd9662a826d 100644 --- a/Calibration/HcalAlCaRecoProducers/test/AlCaIterativePhiSym_cfg.py +++ b/Calibration/HcalAlCaRecoProducers/test/AlCaIterativePhiSym_cfg.py @@ -5,7 +5,7 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag=autoCond['run2_mc'] process.options = cms.untracked.PSet( diff --git a/Calibration/HcalAlCaRecoProducers/test/HCalCalPedestal_ALCA_run251252_Run2015B_data.py b/Calibration/HcalAlCaRecoProducers/test/HCalCalPedestal_ALCA_run251252_Run2015B_data.py index d9526b1db6858..33ed0dd428db8 100644 --- a/Calibration/HcalAlCaRecoProducers/test/HCalCalPedestal_ALCA_run251252_Run2015B_data.py +++ b/Calibration/HcalAlCaRecoProducers/test/HCalCalPedestal_ALCA_run251252_Run2015B_data.py @@ -16,7 +16,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.AlCaRecoStreams_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) @@ -62,7 +62,7 @@ # Other statements process.ALCARECOEventContent.outputCommands.extend(process.OutALCARECOHcalCalPedestal_noDrop.outputCommands) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data_FULL', '') # Path and EndPath definitions diff --git a/Calibration/HcalAlCaRecoProducers/test/RelVal_ALCA2013.py b/Calibration/HcalAlCaRecoProducers/test/RelVal_ALCA2013.py index 96f9fae8d679b..ea60957774dd2 100644 --- a/Calibration/HcalAlCaRecoProducers/test/RelVal_ALCA2013.py +++ b/Calibration/HcalAlCaRecoProducers/test/RelVal_ALCA2013.py @@ -16,7 +16,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.AlCaRecoStreams_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100000) @@ -89,7 +89,7 @@ ) # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data_FULL', '') # Path and EndPath definitions diff --git a/Calibration/HcalCalibAlgos/test/python/test_hosignal_collision_cfg.py b/Calibration/HcalCalibAlgos/test/python/test_hosignal_collision_cfg.py index 2bab124fe5cc0..b49b167fcea9c 100644 --- a/Calibration/HcalCalibAlgos/test/python/test_hosignal_collision_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/test_hosignal_collision_cfg.py @@ -17,7 +17,7 @@ process.load('Configuration.StandardSequences.RawToDigi_Data_cff') process.load('Configuration.StandardSequences.L1Reco_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.MessageLogger = cms.Service("MessageLogger", cout = cms.untracked.PSet( diff --git a/CondCore/ESSources/python/CondDBESSource_condDBv2_cfi.py b/CondCore/ESSources/python/CondDBESSource_condDBv2_cfi.py deleted file mode 100644 index 9586931d00c75..0000000000000 --- a/CondCore/ESSources/python/CondDBESSource_condDBv2_cfi.py +++ /dev/null @@ -1 +0,0 @@ -from CondCore.ESSources.CondDBESSource_cfi import * diff --git a/CondFormats/MFObjects/test/writeMagFieldConfigDB.py b/CondFormats/MFObjects/test/writeMagFieldConfigDB.py index 4d3c38e24ddde..33b534293d8b3 100644 --- a/CondFormats/MFObjects/test/writeMagFieldConfigDB.py +++ b/CondFormats/MFObjects/test/writeMagFieldConfigDB.py @@ -35,8 +35,8 @@ input = cms.untracked.int32(1) ) -#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -#from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +#from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/CondTools/Hcal/test/runDumpHcalCond_cfg.py b/CondTools/Hcal/test/runDumpHcalCond_cfg.py index 72074be879b63..ad691ce9a3831 100644 --- a/CondTools/Hcal/test/runDumpHcalCond_cfg.py +++ b/CondTools/Hcal/test/runDumpHcalCond_cfg.py @@ -83,8 +83,8 @@ process.load('Configuration.StandardSequences.Services_cff') if options.globaltag: - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globaltag, '') # extracted from Configuration/Applications/python/ConfigBuilder.py diff --git a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py index f1a94ef511d9d..d8241988294ad 100644 --- a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py @@ -13,8 +13,8 @@ process.load("Configuration.StandardSequences.MagneticField_cff") #hptopo -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_design'] print(process.GlobalTag.globaltag) process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader_cfg.py b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader_cfg.py index 15b10b146ea05..94261d534bd63 100644 --- a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader_cfg.py +++ b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyReader_cfg.py @@ -27,8 +27,8 @@ process.Timing = cms.Service("Timing") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_design'] #In case you of conditions missing, or if you want to test a specific GT #process.GlobalTag.globaltag = 'PRE_DES72_V6' diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectReader_cfg.py b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectReader_cfg.py index 657ead71772f1..8fbbbe7752783 100644 --- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectReader_cfg.py +++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectReader_cfg.py @@ -25,7 +25,7 @@ # process.GlobalTag.globaltag = "START72_V3::All" #use GTs without ::All with the next line - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond #use autocond, see: #https://github.com/cms-sw/cmssw/blob/CMSSW_7_3_X/Configuration/AlCa/python/autoCond.py diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py b/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py index 40b9ed4d5e84f..df601781acba9 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py @@ -16,8 +16,8 @@ #hptopo #process.load("Configuration.StandardSequences.GeometryIdeal_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_design'] print(process.GlobalTag.globaltag) process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py b/CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py index 799578640c174..0a053ad8c5c97 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleReader_cfg.py @@ -27,8 +27,8 @@ process.Timing = cms.Service("Timing") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_design'] #In case you of conditions missing, or if you want to test a specific GT #process.GlobalTag.globaltag = 'PRE_DES72_V6' diff --git a/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py b/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py index 5311c7d05a3d5..edc4379312887 100755 --- a/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py @@ -19,7 +19,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.GeometryDB_cff") #process.load("Configuration.StandardSequences.GeometryIdeal_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.load("CalibTracker.Configuration.TrackerAlignment.TrackerAlignment_Fake_cff") #process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi") @@ -31,7 +31,7 @@ # GLOBAL TAG from Configuration.AlCa.GlobalTag import GlobalTag -#from Configuration.AlCa.autoCond_condDBv2 import autoCond +#from Configuration.AlCa.autoCond import autoCond #from Configuration.AlCa.autoCond import autoCond #process.GlobalTag.globaltag = "auto:run2_data" #process.GlobalTag.globaltag = autoCond['run2_design'] diff --git a/CondTools/SiPixel/test/SiPixelVCalReader_cfg.py b/CondTools/SiPixel/test/SiPixelVCalReader_cfg.py index 2da8e76a61e88..3fa3bd2ac6853 100755 --- a/CondTools/SiPixel/test/SiPixelVCalReader_cfg.py +++ b/CondTools/SiPixel/test/SiPixelVCalReader_cfg.py @@ -16,7 +16,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Configuration.StandardSequences.GeometryDB_cff") #process.load("Configuration.StandardSequences.GeometryIdeal_cff") -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") #process.load("CondTools.SiPixel.SiPixelGainCalibrationService_cfi") process.load("CondCore.CondDB.CondDB_cfi") @@ -41,7 +41,7 @@ # GLOBAL TAG from Configuration.AlCa.GlobalTag import GlobalTag -#from Configuration.AlCa.autoCond_condDBv2 import autoCond +#from Configuration.AlCa.autoCond import autoCond #process.GlobalTag.globaltag = "auto:run2_data'" #autoCond['run2_design'] # In case you of conditions missing, or if you want to test a specific GT #process.GlobalTag.globaltag = 'PRE_DES72_V6' diff --git a/Configuration/AlCa/python/GlobalTag_condDBv2.py b/Configuration/AlCa/python/GlobalTag_condDBv2.py deleted file mode 100644 index 9845a762afb8d..0000000000000 --- a/Configuration/AlCa/python/GlobalTag_condDBv2.py +++ /dev/null @@ -1 +0,0 @@ -from Configuration.AlCa.GlobalTag import * diff --git a/Configuration/AlCa/python/autoCond_condDBv2.py b/Configuration/AlCa/python/autoCond_condDBv2.py deleted file mode 100644 index 39e1051b27a47..0000000000000 --- a/Configuration/AlCa/python/autoCond_condDBv2.py +++ /dev/null @@ -1 +0,0 @@ -from Configuration.AlCa.autoCond import * diff --git a/Configuration/StandardSequences/python/FrontierConditions_GlobalTag_condDBv2_cff.py b/Configuration/StandardSequences/python/FrontierConditions_GlobalTag_condDBv2_cff.py deleted file mode 100644 index 16ff31880832b..0000000000000 --- a/Configuration/StandardSequences/python/FrontierConditions_GlobalTag_condDBv2_cff.py +++ /dev/null @@ -1 +0,0 @@ -from Configuration.StandardSequences.FrontierConditions_GlobalTag_cff import * diff --git a/DPGAnalysis/HcalTools/scripts/cmt/a.py.end b/DPGAnalysis/HcalTools/scripts/cmt/a.py.end index 4b9bd223126ef..a10f7f1981de9 100644 --- a/DPGAnalysis/HcalTools/scripts/cmt/a.py.end +++ b/DPGAnalysis/HcalTools/scripts/cmt/a.py.end @@ -439,8 +439,8 @@ process.es_hardcode = cms.ESSource("HcalHardcodeCalibrations", 'RespCorrs') ) ############################################################################ GlobalTag : -#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -#from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +#from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, '101X_dataRun2_HLT_v7', '') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") diff --git a/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py b/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py index 6a24f8335aeac..2fee83c465c25 100644 --- a/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py +++ b/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py @@ -128,8 +128,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') #process.GlobalTag.toGet = cms.VPSet( diff --git a/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py b/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py index 20b5949f63ee6..6ac7768c70427 100644 --- a/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py @@ -205,8 +205,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/ClusterMultiplicityRegionSelector_cfg.py b/DPGAnalysis/SiStripTools/test/ClusterMultiplicityRegionSelector_cfg.py index 11b3760572683..341e59ce5da6e 100644 --- a/DPGAnalysis/SiStripTools/test/ClusterMultiplicityRegionSelector_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ClusterMultiplicityRegionSelector_cfg.py @@ -118,9 +118,9 @@ process.eventtimedistributionAfter= process.eventtimedistribution.clone() -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag,options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py index 57adea5799e7e..3fce6d6a6e28b 100644 --- a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py @@ -466,8 +466,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') if options.testTag==1: diff --git a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py index b7198d673be3b..c9fef01538e2b 100644 --- a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py @@ -556,8 +556,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') if options.testTag==1: diff --git a/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py b/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py index d04420b520c6a..16a296cc3c76b 100644 --- a/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py @@ -231,8 +231,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.pzerobias = cms.Path(process.hltZeroBias diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py index 527c299c946d6..8f4f20d1ec671 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py @@ -255,8 +255,8 @@ from SLHCUpgradeSimulations.Configuration.phase2TkCustomsBE5DPixel10D import * -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') #from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '') diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py index b4ded53cf304b..344dd1c53c2df 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py @@ -258,8 +258,8 @@ process.load('Configuration.StandardSequences.MagneticField_cff') process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') from SLHCUpgradeSimulations.Configuration.phase1TkCustoms import * diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py index 23f0033b16fd4..cefea5bae631c 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py @@ -192,8 +192,8 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.Reconstruction_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py index 5231a99cfac0e..1dc0a119788ea 100644 --- a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py @@ -52,8 +52,8 @@ # numberEventsInRun = cms.untracked.uint32(10) # ) -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') #process.GlobalTag.toGet = cms.VPSet( #cms.PSet(record = cms.string("SiStripConfObjectRcd"), diff --git a/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py b/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py index ccd84f46f1d74..bf9ed53020b3d 100644 --- a/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py @@ -318,8 +318,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') #------------------------------------------------------------------------- #process.poolDBESSource = cms.ESSource("PoolDBESSource", diff --git a/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py b/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py index d6d68f5d6232f..1c874ac23d1c9 100644 --- a/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py @@ -136,8 +136,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py b/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py index 9d3d449f2e37c..39cbeec4b498f 100644 --- a/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py +++ b/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py @@ -123,8 +123,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.load("Configuration.StandardSequences.GeometryDB_cff") diff --git a/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py b/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py index c9a961b4d9980..672d8ed6f8ce5 100644 --- a/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py +++ b/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py @@ -108,8 +108,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') # diff --git a/DPGAnalysis/SiStripTools/test/detidselectortest_cfg.py b/DPGAnalysis/SiStripTools/test/detidselectortest_cfg.py index f40f186399b42..cacfd3cb1617e 100644 --- a/DPGAnalysis/SiStripTools/test/detidselectortest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/detidselectortest_cfg.py @@ -69,8 +69,8 @@ # Conditions (Global Tag is used here): -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True)) diff --git a/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py b/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py index aae0396f500c2..98d59ce97eab7 100644 --- a/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py @@ -95,8 +95,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py b/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py index dc88b7192af2b..52be321e92ca6 100644 --- a/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py +++ b/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py @@ -288,8 +288,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_ALCAZmumu_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_ALCAZmumu_cfg.py index c051ef0a1d5e6..dc833a633164c 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_ALCAZmumu_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_ALCAZmumu_cfg.py @@ -60,8 +60,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py index 085ec1370ac9e..0943e7937fe0c 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py @@ -223,8 +223,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '') diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_SingleMu_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_SingleMu_cfg.py index d54e0f277f558..3dd26e32efcaa 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_SingleMu_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_SingleMu_cfg.py @@ -59,8 +59,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_cfg.py index 85ac3ebbcbe92..459bad36ad017 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_cfg.py @@ -59,8 +59,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py index c73dee740bae3..21a2574654302 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py @@ -96,8 +96,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py index e60f4a476c11d..27b72b67cdb49 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py @@ -106,8 +106,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py index 62cc38dc4bc67..0d54a6195a4a4 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py @@ -131,8 +131,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py index b8643742c8a7b..d14bf0a308de8 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py @@ -120,8 +120,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py b/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py index 9abab225b2ce3..ed0855ad61a22 100644 --- a/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py @@ -101,8 +101,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') # diff --git a/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py b/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py index 68ede52f1fb32..a71489f2b2c28 100644 --- a/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py @@ -114,8 +114,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') # diff --git a/DQM/HLTEvF/test/triggerBxMonitor.py b/DQM/HLTEvF/test/triggerBxMonitor.py index 6f475c78b5d6f..1a5ecce0e02fd 100644 --- a/DQM/HLTEvF/test/triggerBxMonitor.py +++ b/DQM/HLTEvF/test/triggerBxMonitor.py @@ -10,7 +10,7 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 1000 # Global Tag -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag as customiseGlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(globaltag = '80X_dataRun2_HLT_v12') process.GlobalTag.connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS') diff --git a/DQM/HLTEvF/test/triggerBxVsOrbitMonitor.py b/DQM/HLTEvF/test/triggerBxVsOrbitMonitor.py index 1434609c912fd..dd8134c81a872 100644 --- a/DQM/HLTEvF/test/triggerBxVsOrbitMonitor.py +++ b/DQM/HLTEvF/test/triggerBxVsOrbitMonitor.py @@ -10,7 +10,7 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 1000 # Global Tag -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag as customiseGlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(globaltag = '80X_dataRun2_HLT_v12') process.GlobalTag.connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS') diff --git a/DQM/HLTEvF/test/triggerRatesMonitor.py b/DQM/HLTEvF/test/triggerRatesMonitor.py index dcf8444ed235f..fbdfa2012e896 100644 --- a/DQM/HLTEvF/test/triggerRatesMonitor.py +++ b/DQM/HLTEvF/test/triggerRatesMonitor.py @@ -10,7 +10,7 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 1000 # Global Tag -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag as customiseGlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(globaltag = '80X_dataRun2_HLT_v12') process.GlobalTag.connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS') diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py index aecd025050d13..bb346d02e1873 100644 --- a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py @@ -32,7 +32,7 @@ #------------------------------------- from DQM.Integration.config.online_customizations_cfi import * if useOfflineGT: - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16' #process.GlobalTag.globaltag = '106X_dataRun2_PromptLike_Candidate_2019_05_04_08_47_47' #process.GlobalTag.globaltag = '100X_dataRun2_HLT_Candidate_2018_01_31_16_04_35' diff --git a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py index a9bb01df7ee0b..f87cde4be8e63 100644 --- a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py @@ -27,7 +27,7 @@ #------------------------------------- from DQM.Integration.config.online_customizations_cfi import * if useOfflineGT: - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16' #process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1' else: diff --git a/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py index 36ae2ccf1d931..d874209a32693 100644 --- a/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/hcalreco_dqm_sourceclient-live_cfg.py @@ -41,7 +41,7 @@ #------------------------------------- from DQM.Integration.config.online_customizations_cfi import * if useOfflineGT: - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '106X_dataRun3_HLT_Candidate_2019_11_26_14_48_16' #process.GlobalTag.globaltag = '100X_dataRun2_HLT_Candidate_2018_01_31_16_04_35' #process.GlobalTag.globaltag = '100X_dataRun2_HLT_v1' diff --git a/DQM/SiStripMonitorSummary/test/DBReader_conddbmonitoring_singlemodule_cfg.py b/DQM/SiStripMonitorSummary/test/DBReader_conddbmonitoring_singlemodule_cfg.py index 15fd8ea6b724a..a281f9f7cc1ab 100644 --- a/DQM/SiStripMonitorSummary/test/DBReader_conddbmonitoring_singlemodule_cfg.py +++ b/DQM/SiStripMonitorSummary/test/DBReader_conddbmonitoring_singlemodule_cfg.py @@ -120,10 +120,10 @@ ) else: process.load("Configuration.StandardSequences.GeometryDB_cff") - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') - + process.DQMStore = cms.Service("DQMStore", verbose = cms.untracked.int32(1) ) diff --git a/DQMOffline/L1Trigger/test/runDQMOffline_L1TMuonEfficiency_cfg.py b/DQMOffline/L1Trigger/test/runDQMOffline_L1TMuonEfficiency_cfg.py index 369720d97e846..3cbd699ae0338 100644 --- a/DQMOffline/L1Trigger/test/runDQMOffline_L1TMuonEfficiency_cfg.py +++ b/DQMOffline/L1Trigger/test/runDQMOffline_L1TMuonEfficiency_cfg.py @@ -83,8 +83,8 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load("TrackingTools.Configuration.TrackingTools_cff") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '80X_dataRun2_ICHEP16_repro_v0', '') process.load('DQMOffline.L1Trigger.L1TMuonDQMOffline_cfi') process.dumpES = cms.EDAnalyzer("PrintEventSetupContent") diff --git a/DQMOffline/Lumi/test/ZCounting_cfg.py b/DQMOffline/Lumi/test/ZCounting_cfg.py index eab82745ca89f..d90edd57d3cea 100644 --- a/DQMOffline/Lumi/test/ZCounting_cfg.py +++ b/DQMOffline/Lumi/test/ZCounting_cfg.py @@ -9,7 +9,7 @@ process.load('Configuration/StandardSequences/GeometryDB_cff') process.load('Configuration/StandardSequences/MagneticField_38T_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_condDBv2_cff') +#process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') process.load('Configuration/EventContent/EventContent_cff') process.load('TrackingTools/TransientTrack/TransientTrackBuilder_cfi') process.load('Configuration.StandardSequences.EDMtoMEAtRunEnd_cff') diff --git a/EgammaAnalysis/ElectronTools/test/getGBRForest_cfg.py b/EgammaAnalysis/ElectronTools/test/getGBRForest_cfg.py index 548f638c2fdd6..414c8a9456247 100644 --- a/EgammaAnalysis/ElectronTools/test/getGBRForest_cfg.py +++ b/EgammaAnalysis/ElectronTools/test/getGBRForest_cfg.py @@ -7,7 +7,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) @@ -18,7 +18,7 @@ fileNames = cms.untracked.vstring('/store/data/Run2015D/DoubleEG/MINIAOD/PromptReco-v4/000/258/159/00000/027612B0-306C-E511-BD47-02163E014496.root'), ) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '74X_dataRun2_Prompt_v4', '') process.getGBR25ns = cms.EDAnalyzer("GBRForestGetterFromDB", diff --git a/EgammaAnalysis/ElectronTools/test/testCalibratedPatElectronProducerRun2_cfg.py b/EgammaAnalysis/ElectronTools/test/testCalibratedPatElectronProducerRun2_cfg.py index 8536a453929f5..42aa6ed659eca 100644 --- a/EgammaAnalysis/ElectronTools/test/testCalibratedPatElectronProducerRun2_cfg.py +++ b/EgammaAnalysis/ElectronTools/test/testCalibratedPatElectronProducerRun2_cfg.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.MessageLogger.cerr.threshold = '' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 @@ -61,7 +61,7 @@ ) ) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, '74X_dataRun2_Prompt_v4', '') if varOptions.isMC: diff --git a/EgammaAnalysis/ElectronTools/test/testCalibratedPatPhotonProducerRun2_cfg.py b/EgammaAnalysis/ElectronTools/test/testCalibratedPatPhotonProducerRun2_cfg.py index 1a92e107a0ace..77cd76f89288f 100644 --- a/EgammaAnalysis/ElectronTools/test/testCalibratedPatPhotonProducerRun2_cfg.py +++ b/EgammaAnalysis/ElectronTools/test/testCalibratedPatPhotonProducerRun2_cfg.py @@ -7,7 +7,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) @@ -18,7 +18,7 @@ fileNames = cms.untracked.vstring('/store/data/Run2015D/DoubleEG/MINIAOD/PromptReco-v4/000/258/159/00000/027612B0-306C-E511-BD47-02163E014496.root'), ) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '74X_dataRun2_Prompt_v4', '') process.selectedPhotons = cms.EDFilter("PATPhotonSelector", diff --git a/EventFilter/L1TRawToDigi/test/test_EMTF_DatToRoot_v0.py b/EventFilter/L1TRawToDigi/test/test_EMTF_DatToRoot_v0.py index d87b02314e836..24432cf8130ce 100644 --- a/EventFilter/L1TRawToDigi/test/test_EMTF_DatToRoot_v0.py +++ b/EventFilter/L1TRawToDigi/test/test_EMTF_DatToRoot_v0.py @@ -64,8 +64,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # ## Debug / error / warning message output diff --git a/EventFilter/L1TXRawToDigi/test/testL1TCaloLayer1RawToDigi.py b/EventFilter/L1TXRawToDigi/test/testL1TCaloLayer1RawToDigi.py index 8782ff249fde4..ab2c737fc5a85 100644 --- a/EventFilter/L1TXRawToDigi/test/testL1TCaloLayer1RawToDigi.py +++ b/EventFilter/L1TXRawToDigi/test/testL1TCaloLayer1RawToDigi.py @@ -50,7 +50,7 @@ def formatLumis(lumistring, run) : outputCommands = cms.untracked.vstring('drop *', 'keep *_*_*_L1TCaloLayer1Test') ) -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') process.GlobalTag.globaltag = '74X_dataRun2_Express_v1' process.p = cms.Path(process.l1tCaloLayer1Digis) diff --git a/FastSimulation/Validation/test/MultiTrackValidator_cfg.py b/FastSimulation/Validation/test/MultiTrackValidator_cfg.py index 740df17918952..8272772e981ae 100644 --- a/FastSimulation/Validation/test/MultiTrackValidator_cfg.py +++ b/FastSimulation/Validation/test/MultiTrackValidator_cfg.py @@ -92,8 +92,8 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(400) ) ### conditions -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') ### standard includes diff --git a/FastSimulation/Validation/test/TrackRecoAndValidation_FullSim_cfg.py b/FastSimulation/Validation/test/TrackRecoAndValidation_FullSim_cfg.py index b1bfd0bf1737b..282710dcfc497 100644 --- a/FastSimulation/Validation/test/TrackRecoAndValidation_FullSim_cfg.py +++ b/FastSimulation/Validation/test/TrackRecoAndValidation_FullSim_cfg.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') process.load('Configuration.StandardSequences.Validation_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) @@ -72,7 +72,7 @@ process.mix.digitizers = cms.PSet() for a in process.aliases: delattr(process, a) process.RandomNumberGeneratorService.restoreStateLabel=cms.untracked.string("randomEngineStateProducer") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Path and EndPath definitions diff --git a/FastSimulation/Validation/test/TrackRecoAndValidation_HARVESTING.py b/FastSimulation/Validation/test/TrackRecoAndValidation_HARVESTING.py index 36a72fb19f0d1..baf5f4e3d7378 100644 --- a/FastSimulation/Validation/test/TrackRecoAndValidation_HARVESTING.py +++ b/FastSimulation/Validation/test/TrackRecoAndValidation_HARVESTING.py @@ -17,7 +17,7 @@ process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.EDMtoMEAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) @@ -45,7 +45,7 @@ # Additional output definition # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Path and EndPath definitions diff --git a/FastSimulation/Validation/test/TrackRecoAndValidation_cfg.py b/FastSimulation/Validation/test/TrackRecoAndValidation_cfg.py index 58a94dbd651a1..069044d22aae6 100644 --- a/FastSimulation/Validation/test/TrackRecoAndValidation_cfg.py +++ b/FastSimulation/Validation/test/TrackRecoAndValidation_cfg.py @@ -27,7 +27,7 @@ process.load('FastSimulation.Configuration.Reconstruction_BefMix_cff') process.load('FastSimulation.Configuration.Digi_cff') process.load('FastSimulation.Configuration.Validation_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) @@ -84,7 +84,7 @@ # Other statements process.mix.digitizers = cms.PSet(process.theDigitizersValid) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Path and EndPath definitions diff --git a/GeneratorInterface/Core/test/Hadronizer_MgmMatchTune4C_ZJetsNoPSb_13TeV_madgraph_pythia8_Tauola_cfg.py b/GeneratorInterface/Core/test/Hadronizer_MgmMatchTune4C_ZJetsNoPSb_13TeV_madgraph_pythia8_Tauola_cfg.py index 3b8ef2f6fea52..b442fd926f463 100755 --- a/GeneratorInterface/Core/test/Hadronizer_MgmMatchTune4C_ZJetsNoPSb_13TeV_madgraph_pythia8_Tauola_cfg.py +++ b/GeneratorInterface/Core/test/Hadronizer_MgmMatchTune4C_ZJetsNoPSb_13TeV_madgraph_pythia8_Tauola_cfg.py @@ -21,7 +21,7 @@ process.load('GeneratorInterface.Core.genFilterSummary_cff') process.load('Configuration.StandardSequences.SimIdeal_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) @@ -94,7 +94,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:mc', '') process.generator = cms.EDFilter("Pythia8HadronizerFilter", diff --git a/HLTrigger/Configuration/python/customizeHLTforALL.py b/HLTrigger/Configuration/python/customizeHLTforALL.py index 6899d3f77f7ed..d4ad3bbe875dd 100644 --- a/HLTrigger/Configuration/python/customizeHLTforALL.py +++ b/HLTrigger/Configuration/python/customizeHLTforALL.py @@ -40,7 +40,7 @@ def customizeHLTforAll(process, menuType = "GRun", _customInfo = None): _globalTag = _customInfo['globalTags'][_realData] if _globalTag != "": if hasattr(process,'GlobalTag'): - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, _globalTag, '') # process.GlobalTag.snapshotTime = cms.string("9999-12-31 23:59:59.000") diff --git a/HLTrigger/HLTfilters/test/triggerResultsFilter.py b/HLTrigger/HLTfilters/test/triggerResultsFilter.py index c730d20f9eda4..ac487849ef887 100644 --- a/HLTrigger/HLTfilters/test/triggerResultsFilter.py +++ b/HLTrigger/HLTfilters/test/triggerResultsFilter.py @@ -14,8 +14,8 @@ #process.MessageLogger.cerr_stats.threshold = 'INFO' # also info in statistics # load conditions from the global tag -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # read back the trigger decisions diff --git a/HLTrigger/HLTfilters/test/triggerResultsFilter_producer.py b/HLTrigger/HLTfilters/test/triggerResultsFilter_producer.py index 7c34b13b0176b..03b3b42bb431a 100644 --- a/HLTrigger/HLTfilters/test/triggerResultsFilter_producer.py +++ b/HLTrigger/HLTfilters/test/triggerResultsFilter_producer.py @@ -23,8 +23,8 @@ ) # load conditions from the global tag -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # define an empty source, and ask for 100 events diff --git a/HeavyFlavorAnalysis/RecoDecay/test/cfg_full.py b/HeavyFlavorAnalysis/RecoDecay/test/cfg_full.py index cc846f4f9bc32..393b1bb1b5b26 100644 --- a/HeavyFlavorAnalysis/RecoDecay/test/cfg_full.py +++ b/HeavyFlavorAnalysis/RecoDecay/test/cfg_full.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -37,7 +37,7 @@ # 'file:/...complete_file_path.../D0D90725-1D61-E511-B812-0025907277CE.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.load('PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff') diff --git a/HeavyFlavorAnalysis/RecoDecay/test/cfg_mini.py b/HeavyFlavorAnalysis/RecoDecay/test/cfg_mini.py index b5f8bb66a814f..83b41815d1e64 100644 --- a/HeavyFlavorAnalysis/RecoDecay/test/cfg_mini.py +++ b/HeavyFlavorAnalysis/RecoDecay/test/cfg_mini.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -37,7 +37,7 @@ # 'file:/...complete_file_path.../0E685515-8661-E511-8274-00259073E3B6.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.testBPHRecoDecay = cms.EDAnalyzer('TestBPHRecoDecay', diff --git a/HeavyFlavorAnalysis/RecoDecay/test/cfg_skim.py b/HeavyFlavorAnalysis/RecoDecay/test/cfg_skim.py index 9636ecc2fd624..1364542c602be 100644 --- a/HeavyFlavorAnalysis/RecoDecay/test/cfg_skim.py +++ b/HeavyFlavorAnalysis/RecoDecay/test/cfg_skim.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.CandidateSelectedTracks = cms.EDProducer( "ConcreteChargedCandidateProducer", @@ -47,7 +47,7 @@ # 'file:/...complete_file_path.../XXXX.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') process.testBPHRecoDecay = cms.EDAnalyzer('TestBPHRecoDecay', diff --git a/HeavyFlavorAnalysis/Skimming/python/CompactSkim_cff.py b/HeavyFlavorAnalysis/Skimming/python/CompactSkim_cff.py index f82b7b5f2df94..1a072842e0137 100644 --- a/HeavyFlavorAnalysis/Skimming/python/CompactSkim_cff.py +++ b/HeavyFlavorAnalysis/Skimming/python/CompactSkim_cff.py @@ -13,14 +13,14 @@ def CompactSkim(process,inFileNames,outFileName,Global_Tag='auto:run2_mc',MC=Tru process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.MessageLogger.cerr.FwkReport.reportEvery = 100 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(False) ) process.source = cms.Source('PoolSource', fileNames = cms.untracked.vstring(inFileNames)) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, Global_Tag, '') # make patCandidates, select and clean them diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_full.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_full.py index 7f006f7103e7b..01da2657e8a0b 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_full.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_full.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -37,7 +37,7 @@ # 'file:/...complete_file_path.../D0D90725-1D61-E511-B812-0025907277CE.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.load('PhysicsTools.PatAlgos.producersLayer1.patCandidates_cff') diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_mini.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_mini.py index 82036aa2190f5..7e5e4ee53790d 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_mini.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_mini.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -37,7 +37,7 @@ # 'file:/...complete_file_path.../0E685515-8661-E511-8274-00259073E3B6.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.testBPHSpecificDecay = cms.EDAnalyzer('TestBPHSpecificDecay', diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoCheck.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoCheck.py index ace6f1a0c9dc2..2b22094115fb4 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoCheck.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoCheck.py @@ -13,7 +13,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -22,7 +22,7 @@ 'file:reco.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') process.checkBPHWriteDecay = cms.EDAnalyzer('CheckBPHWriteDecay', diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoHisto.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoHisto.py index 31f86d7e09231..454e775aa5518 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoHisto.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoHisto.py @@ -13,7 +13,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 @@ -22,7 +22,7 @@ 'file:reco.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') process.TFileService = cms.Service('TFileService', diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoWrite.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoWrite.py index b49db2d0bff4c..f0b5ce6ae7763 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoWrite.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_recoWrite.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.CandidateSelectedTracks = cms.EDProducer( "ConcreteChargedCandidateProducer", @@ -47,7 +47,7 @@ # 'file:/...complete_file_path.../XXXX.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') from HeavyFlavorAnalysis.SpecificDecay.recoSelectForWrite_cfi import recoSelect diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_skim.py b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_skim.py index dbdb32fa59f4b..6cbf8a8c67234 100644 --- a/HeavyFlavorAnalysis/SpecificDecay/test/cfg_skim.py +++ b/HeavyFlavorAnalysis/SpecificDecay/test/cfg_skim.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') patAlgosToolsTask.add(process.MEtoEDMConverter) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("TrackingTools/TransientTrack/TransientTrackBuilder_cfi") process.CandidateSelectedTracks = cms.EDProducer( "ConcreteChargedCandidateProducer", @@ -47,7 +47,7 @@ # 'file:/...complete_file_path.../XXXX.root' )) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_data', '') process.testBPHSpecificDecay = cms.EDAnalyzer('TestBPHSpecificDecay', diff --git a/L1Trigger/GlobalTriggerAnalyzer/python/UserOptions_cff.py b/L1Trigger/GlobalTriggerAnalyzer/python/UserOptions_cff.py index 15d8300dc3610..b1363f23463ad 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/python/UserOptions_cff.py +++ b/L1Trigger/GlobalTriggerAnalyzer/python/UserOptions_cff.py @@ -392,7 +392,7 @@ globalTag = myGlobalTag if globalTag.count('auto') : - from Configuration.AlCa.autoCond_condDBv2 import autoCond + from Configuration.AlCa.autoCond import autoCond useGlobalTag = autoCond[globalTag.replace('auto:', '')] else : useGlobalTag = globalTag diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py index b9b7631480937..8b82e169a5011 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py @@ -42,7 +42,7 @@ # https://twiki.cern.ch/twiki/bin/view/CMS/SWGuideFrontierConditions process.load('Configuration.StandardSequences.GeometryDB_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.GlobalTag.globaltag = useGlobalTag diff --git a/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorOnSpy.py b/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorOnSpy.py index 903d9ce0de925..4628719823363 100644 --- a/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorOnSpy.py +++ b/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorOnSpy.py @@ -4,7 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') process.GlobalTag.globaltag = '74X_dataRun2_Express_v1' process.load('L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Digis_cfi') diff --git a/L1Trigger/L1TCalorimeter/test/SimL1Emulator_Stage1.py b/L1Trigger/L1TCalorimeter/test/SimL1Emulator_Stage1.py index c13d7c829e8d9..1f287e6a4935e 100644 --- a/L1Trigger/L1TCalorimeter/test/SimL1Emulator_Stage1.py +++ b/L1Trigger/L1TCalorimeter/test/SimL1Emulator_Stage1.py @@ -5,7 +5,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') ## process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.Geometry.GeometryIdeal_cff') @@ -43,7 +43,7 @@ # Other statements ## from Configuration.AlCa.GlobalTag import GlobalTag ## process.GlobalTag.connect = cms.string('frontier://FrontierProd/CMS_COND_31X_GLOBALTAG') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag.globaltag = cms.string('MCRUN2_75_V1') process.load('L1Trigger.L1TCalorimeter.caloConfigStage1PP_cfi') diff --git a/L1Trigger/L1TCalorimeter/test/writeStage1CaloLuts_cfg.py b/L1Trigger/L1TCalorimeter/test/writeStage1CaloLuts_cfg.py index 755ef2d5b237b..f9a844a129622 100644 --- a/L1Trigger/L1TCalorimeter/test/writeStage1CaloLuts_cfg.py +++ b/L1Trigger/L1TCalorimeter/test/writeStage1CaloLuts_cfg.py @@ -5,8 +5,8 @@ # process.load("FWCore.MessageLogger.MessageLogger_cfi") process.load("Configuration.StandardSequences.Services_cff") -## process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -## from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +## process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +## from Configuration.AlCa.GlobalTag import GlobalTag ## process.GlobalTag.globaltag = cms.string('GR_H_V44') process.source = cms.Source("EmptySource") diff --git a/L1Trigger/L1TCommon/test/dump_l1t_configs.py b/L1Trigger/L1TCommon/test/dump_l1t_configs.py index 5c62ec58c2343..8993547327db5 100644 --- a/L1Trigger/L1TCommon/test/dump_l1t_configs.py +++ b/L1Trigger/L1TCommon/test/dump_l1t_configs.py @@ -16,8 +16,8 @@ firstRun = cms.untracked.uint32(248518) ) -process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'GR_P_V56') process.GlobalTag.DumpStat = cms.untracked.bool(True) diff --git a/L1Trigger/L1TCommon/test/reEmul.py b/L1Trigger/L1TCommon/test/reEmul.py index 59db1a70aff92..43e7ebca9fa0f 100644 --- a/L1Trigger/L1TCommon/test/reEmul.py +++ b/L1Trigger/L1TCommon/test/reEmul.py @@ -81,8 +81,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag # For stage-1, we are re-emulating L1T based on the conditions in the GT, so # best for now to use MC GT, even when running over a data file, and just diff --git a/L1Trigger/L1TCommon/test/runL1T.py b/L1Trigger/L1TCommon/test/runL1T.py index 8e2c0e4db653c..8954c5608c262 100644 --- a/L1Trigger/L1TCommon/test/runL1T.py +++ b/L1Trigger/L1TCommon/test/runL1T.py @@ -21,8 +21,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') #### Sim L1 Emulator Sequence: diff --git a/L1Trigger/L1TMuon/test/runMuon.py b/L1Trigger/L1TMuon/test/runMuon.py index 22370bede1e4c..1e91175abf21e 100644 --- a/L1Trigger/L1TMuon/test/runMuon.py +++ b/L1Trigger/L1TMuon/test/runMuon.py @@ -20,8 +20,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc') process.load('L1Trigger.L1TMuon.hackConditions_cff') diff --git a/L1Trigger/L1TMuonBarrel/test/runMuonBarrel.py b/L1Trigger/L1TMuonBarrel/test/runMuonBarrel.py index e3ebe0c8c5d7d..ee17d0968a816 100644 --- a/L1Trigger/L1TMuonBarrel/test/runMuonBarrel.py +++ b/L1Trigger/L1TMuonBarrel/test/runMuonBarrel.py @@ -23,8 +23,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1Trigger/L1TMuonBarrel/test/runMuonBarrel_o2o.py b/L1Trigger/L1TMuonBarrel/test/runMuonBarrel_o2o.py index 54d6b162e9b04..acae41cd55be2 100644 --- a/L1Trigger/L1TMuonBarrel/test/runMuonBarrel_o2o.py +++ b/L1Trigger/L1TMuonBarrel/test/runMuonBarrel_o2o.py @@ -20,8 +20,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -#from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +#from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1Trigger/L1TMuonOverlap/test/expert/mergeGPsXMLFiles.py b/L1Trigger/L1TMuonOverlap/test/expert/mergeGPsXMLFiles.py index 43dd3350c0213..31e63bd21e8bc 100644 --- a/L1Trigger/L1TMuonOverlap/test/expert/mergeGPsXMLFiles.py +++ b/L1Trigger/L1TMuonOverlap/test/expert/mergeGPsXMLFiles.py @@ -19,8 +19,8 @@ process.load('Configuration.Geometry.GeometryExtended2015_cff') process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') path = "/home/akalinow/scratch/CMS/OverlapTrackFinder/Emulator/job_3_pat/8_0_9_20_06_2016/" diff --git a/L1Trigger/L1TMuonOverlap/test/expert/runOMTFPatternMaker.py b/L1Trigger/L1TMuonOverlap/test/expert/runOMTFPatternMaker.py index 72f66cd2f5125..6b435c8d289fa 100644 --- a/L1Trigger/L1TMuonOverlap/test/expert/runOMTFPatternMaker.py +++ b/L1Trigger/L1TMuonOverlap/test/expert/runOMTFPatternMaker.py @@ -96,8 +96,8 @@ process.load('Configuration.Geometry.GeometryExtended2015_cff') process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') ####Event Setup Producer diff --git a/L1Trigger/L1TMuonOverlap/test/runMuonOverlap.py b/L1Trigger/L1TMuonOverlap/test/runMuonOverlap.py index 84ab3c45c5fa0..aeba4bfbd0a24 100644 --- a/L1Trigger/L1TMuonOverlap/test/runMuonOverlap.py +++ b/L1Trigger/L1TMuonOverlap/test/runMuonOverlap.py @@ -20,8 +20,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1Trigger/L1TNtuples/test/test_ExtraProducer.py b/L1Trigger/L1TNtuples/test/test_ExtraProducer.py index 086e3b790f0a0..7190aa3e2f863 100644 --- a/L1Trigger/L1TNtuples/test/test_ExtraProducer.py +++ b/L1Trigger/L1TNtuples/test/test_ExtraProducer.py @@ -5,7 +5,7 @@ # conditions process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TNtuples/test/test_JetRecoProducer.py b/L1Trigger/L1TNtuples/test/test_JetRecoProducer.py index 0411e8cb4cdfe..367a524243a96 100644 --- a/L1Trigger/L1TNtuples/test/test_JetRecoProducer.py +++ b/L1Trigger/L1TNtuples/test/test_JetRecoProducer.py @@ -21,7 +21,7 @@ # conditions -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TNtuples/test/test_MenuProducer.py b/L1Trigger/L1TNtuples/test/test_MenuProducer.py index 18664c5be3f99..205b2adb9c773 100644 --- a/L1Trigger/L1TNtuples/test/test_MenuProducer.py +++ b/L1Trigger/L1TNtuples/test/test_MenuProducer.py @@ -5,7 +5,7 @@ # conditions process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TNtuples/test/test_MuonRecoProducer.py b/L1Trigger/L1TNtuples/test/test_MuonRecoProducer.py index 78ef8372634cd..ef5bdc71a0933 100644 --- a/L1Trigger/L1TNtuples/test/test_MuonRecoProducer.py +++ b/L1Trigger/L1TNtuples/test/test_MuonRecoProducer.py @@ -22,7 +22,7 @@ # conditions -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TNtuples/test/test_NtupleProducer.py b/L1Trigger/L1TNtuples/test/test_NtupleProducer.py index dff48a1637541..2513f4415564e 100644 --- a/L1Trigger/L1TNtuples/test/test_NtupleProducer.py +++ b/L1Trigger/L1TNtuples/test/test_NtupleProducer.py @@ -17,7 +17,7 @@ # conditions -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TNtuples/test/test_UpgradeProducer.py b/L1Trigger/L1TNtuples/test/test_UpgradeProducer.py index 8bb9bf3aa2aeb..ca98a610c5893 100644 --- a/L1Trigger/L1TNtuples/test/test_UpgradeProducer.py +++ b/L1Trigger/L1TNtuples/test/test_UpgradeProducer.py @@ -5,7 +5,7 @@ # conditions process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.autoCond_condDBv2 import autoCond +from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = cms.string( autoCond['run2_mc'] ) # input file diff --git a/L1Trigger/L1TTwinMux/test/runMuonBarrel.py b/L1Trigger/L1TTwinMux/test/runMuonBarrel.py index 7545aba041495..459724920da43 100644 --- a/L1Trigger/L1TTwinMux/test/runMuonBarrel.py +++ b/L1Trigger/L1TTwinMux/test/runMuonBarrel.py @@ -22,8 +22,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1Trigger/L1TTwinMux/test/runMuonTwinMux.py b/L1Trigger/L1TTwinMux/test/runMuonTwinMux.py index 23229f9227f01..1a88b663b3241 100644 --- a/L1Trigger/L1TTwinMux/test/runMuonTwinMux.py +++ b/L1Trigger/L1TTwinMux/test/runMuonTwinMux.py @@ -18,8 +18,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1Trigger/L1TTwinMux/test/runUnpEmuTwinMux.py b/L1Trigger/L1TTwinMux/test/runUnpEmuTwinMux.py index ad6b67f9b8c96..d806907ecd504 100644 --- a/L1Trigger/L1TTwinMux/test/runUnpEmuTwinMux.py +++ b/L1Trigger/L1TTwinMux/test/runUnpEmuTwinMux.py @@ -35,8 +35,8 @@ process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') process.load('Configuration.Geometry.GeometryExtended2015_cff') ############################ -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/L1TriggerConfig/Utilities/test/fetchMenu.py b/L1TriggerConfig/Utilities/test/fetchMenu.py index 09e0a06c07411..97a42e0ac145e 100644 --- a/L1TriggerConfig/Utilities/test/fetchMenu.py +++ b/L1TriggerConfig/Utilities/test/fetchMenu.py @@ -20,8 +20,8 @@ ############ this block replaces one of the records in Global Tag ############## -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '80X_mcRun2cosmics_startup_peak_v1', '') process.GlobalTag.snapshotTime = cms.string("9999-12-31 23:59:59.000") diff --git a/L1TriggerConfig/Utilities/test/viewAll.py b/L1TriggerConfig/Utilities/test/viewAll.py index da5f6f5e579de..1b9e0dc47add2 100644 --- a/L1TriggerConfig/Utilities/test/viewAll.py +++ b/L1TriggerConfig/Utilities/test/viewAll.py @@ -13,8 +13,8 @@ #process.load("L1Trigger.L1TCalorimeter.caloStage2Params_2016_v2_2_cfi") # Constructing a Global Tag -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag.toGet = cms.VPSet( cms.PSet( record = cms.string("L1TUtmTriggerMenuRcd"), diff --git a/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py b/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py index 410f7acdca180..b2e3a79d5f904 100644 --- a/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py +++ b/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py @@ -46,10 +46,10 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 500 from CondCore.DBCommon.CondDBSetup_cfi import * -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") ############ DATABASE conditions ########################### -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') ########### FILES #################################### diff --git a/PhysicsTools/HepMCCandAlgos/test/testPDFWeightsTest.py b/PhysicsTools/HepMCCandAlgos/test/testPDFWeightsTest.py index 245def6411b35..fb554aad3ebed 100644 --- a/PhysicsTools/HepMCCandAlgos/test/testPDFWeightsTest.py +++ b/PhysicsTools/HepMCCandAlgos/test/testPDFWeightsTest.py @@ -11,7 +11,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1000) @@ -41,7 +41,7 @@ ) # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.testpdf = cms.EDAnalyzer("PDFWeightsTest", diff --git a/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py b/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py index fded6289c13d9..18c933c971117 100644 --- a/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py +++ b/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py @@ -38,10 +38,6 @@ ### External JECs ===================================================================================================== -#from Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff import * -#process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag from Configuration.AlCa.autoCond import autoCond if runOnData: process.GlobalTag.globaltag = autoCond['run2_data'] diff --git a/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_cfg.py b/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_cfg.py index 151df1dbfa1fd..cac624edb3ba6 100644 --- a/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_cfg.py +++ b/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_cfg.py @@ -11,7 +11,7 @@ ) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') # NOTE: the pick the right global tag! # for PHYS14 scenario PU4bx50 : global tag is ??? # for PHYS14 scenario PU20bx25: global tag is PHYS14_25_V1 diff --git a/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_miniAOD_cfg.py b/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_miniAOD_cfg.py index 26f122ce1ecaf..84cff711da725 100644 --- a/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_miniAOD_cfg.py +++ b/RecoEgamma/ElectronIdentification/test/runHEEPIDExample_miniAOD_cfg.py @@ -11,7 +11,7 @@ ) -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') # NOTE: the pick the right global tag! # for PHYS14 scenario PU4bx50 : global tag is ??? # for PHYS14 scenario PU20bx25: global tag is PHYS14_25_V1 diff --git a/RecoEgamma/PhotonIdentification/test/testPhotonMVA_cfg.py b/RecoEgamma/PhotonIdentification/test/testPhotonMVA_cfg.py index 6fd4cea2e94d4..cdffdfb980b1d 100644 --- a/RecoEgamma/PhotonIdentification/test/testPhotonMVA_cfg.py +++ b/RecoEgamma/PhotonIdentification/test/testPhotonMVA_cfg.py @@ -6,7 +6,7 @@ process.load("Configuration.StandardSequences.GeometryDB_cff") process.load("Configuration.StandardSequences.MagneticField_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py b/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py index f517571128820..0687c49e78f07 100644 --- a/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py +++ b/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py @@ -8,7 +8,7 @@ process.load('Configuration.Geometry.GeometrySimDB_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py index 147d272a54542..87960555c5dcf 100644 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py @@ -24,7 +24,7 @@ process.load('Configuration.StandardSequences.SimIdeal_cff') process.load('Configuration.StandardSequences.Digi_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) @@ -86,7 +86,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag # process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_design', '') diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py b/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py index 5a4aef8db4d4e..6c67175e20ca3 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py @@ -24,8 +24,8 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # works for MC & data process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_GRun', '') diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py index ea78d23270402..01388a378082f 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py @@ -24,8 +24,8 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # works for MC & data process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_GRun', '') diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py index 6287da59bce88..e469c58a3143e 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py @@ -24,8 +24,8 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # works for MC & data process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_GRun', '') diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py index f0fd5229f8b62..1050b807a004b 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py @@ -24,8 +24,8 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, '80X_mcRun2_asymptotic_v14', '') process.GlobalTag = GlobalTag(process.GlobalTag, '90X_upgrade2023_realistic_v1', '') diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py index a85bc500f295f..bdfecafed7be8 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py @@ -24,8 +24,8 @@ process.load("Configuration.StandardSequences.GeometryRecoDB_cff") # works for MC & data process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.GlobalTag = GlobalTag(process.GlobalTag, '90X_upgrade2023_realistic_v1', '') #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_hlt_GRun', '') diff --git a/RecoMET/METPUSubtraction/test/mvaMETOnMiniAOD_cfg.py b/RecoMET/METPUSubtraction/test/mvaMETOnMiniAOD_cfg.py index 1d6f834a5f06f..d9413eb590c36 100644 --- a/RecoMET/METPUSubtraction/test/mvaMETOnMiniAOD_cfg.py +++ b/RecoMET/METPUSubtraction/test/mvaMETOnMiniAOD_cfg.py @@ -14,7 +14,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( @@ -74,7 +74,7 @@ # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Path and EndPath definitions diff --git a/RecoMET/METPUSubtraction/test/testDeepMET_cfg.py b/RecoMET/METPUSubtraction/test/testDeepMET_cfg.py index 5bc88101e5afc..05383e1e809d8 100644 --- a/RecoMET/METPUSubtraction/test/testDeepMET_cfg.py +++ b/RecoMET/METPUSubtraction/test/testDeepMET_cfg.py @@ -9,8 +9,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load( - 'Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input=cms.untracked.int32(-1) diff --git a/RecoMET/METPUSubtraction/test/testMVAMetProducer.py b/RecoMET/METPUSubtraction/test/testMVAMetProducer.py index 4f4b7f4fff56b..f65b37c79e402 100644 --- a/RecoMET/METPUSubtraction/test/testMVAMetProducer.py +++ b/RecoMET/METPUSubtraction/test/testMVAMetProducer.py @@ -5,12 +5,12 @@ process.MessageLogger.cerr.FwkReport.reportEvery = cms.untracked.int32(10) process.load('Configuration.StandardSequences.Services_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('JetMETCorrections.Configuration.JetCorrectionProducers_cff') process.load('RecoMET.METPUSubtraction.mvaPFMET_cff') # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(20) ) diff --git a/RecoMuon/MuonIdentification/test/test_timing.py b/RecoMuon/MuonIdentification/test/test_timing.py index b4125158fc140..6e8a3d2411c5b 100644 --- a/RecoMuon/MuonIdentification/test/test_timing.py +++ b/RecoMuon/MuonIdentification/test/test_timing.py @@ -18,7 +18,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("Configuration.StandardSequences.Reconstruction_cff") from Configuration.StandardSequences.Reconstruction_cff import * @@ -44,7 +44,7 @@ ) process.prefer("GlobalTag") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, '80X_dataRun2_Prompt_v9', '') process.p = cms.Path(muontiming) diff --git a/RecoPixelVertexing/PixelTriplets/test/trip_cfg.py b/RecoPixelVertexing/PixelTriplets/test/trip_cfg.py index e0e67c995786c..a0603b9736c06 100644 --- a/RecoPixelVertexing/PixelTriplets/test/trip_cfg.py +++ b/RecoPixelVertexing/PixelTriplets/test/trip_cfg.py @@ -31,9 +31,9 @@ process.load('Configuration.StandardSequences.RawToDigi_cff') process.load('Configuration.StandardSequences.L1Reco_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py b/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py index d061ca72b9041..306019f1fb0fd 100644 --- a/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py +++ b/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py @@ -15,7 +15,7 @@ process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.Digi_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32( 100 ) @@ -29,7 +29,7 @@ secondaryFileNames = cms.untracked.vstring() ) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py b/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py index 704f6fbe86ed6..170c84289a0c5 100644 --- a/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py +++ b/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py @@ -15,7 +15,7 @@ process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.Digi_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32( 100 ) @@ -29,7 +29,7 @@ secondaryFileNames = cms.untracked.vstring() ) -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseI.py b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseI.py index 63cf2980b07df..60233eb7c78ff 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseI.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseI.py @@ -11,8 +11,8 @@ else: # GlobalTag and geometry via GT process.load('Configuration.Geometry.GeometrySimDB_cff') - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2017_realistic', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py index 63910db8bc60f..a69d047255e89 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py @@ -11,10 +11,10 @@ # geometry using the XMLIdealGeometryRecord. process.load('Configuration.Geometry.GeometryExtended2016Reco_cff') process.load("Configuration.StandardSequences.MagneticField_38T_cff") -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.load('FWCore.MessageService.MessageLogger_cfi') #Global Tag -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Add our custom detector grouping to DDD diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py index 17b96f68d9484..3b5fab62cf2e6 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py @@ -12,8 +12,8 @@ # geometry using the XMLIdealGeometryRecord. if readGeometryFromDB: # Global Tag and geometry via it - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') else: process.load('Configuration.Geometry.GeometryExtended2026D44Reco_cff') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py index ac1bce6ad439a..2e57e5f442388 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py @@ -12,8 +12,8 @@ # geometry using the XMLIdealGeometryRecord. if readGeometryFromDB: # Global Tag and geometry via it - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') else: process.load('Configuration.Geometry.GeometryExtended2026D46Reco_cff') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py index a92b43ee97023..215da51b9d3b0 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py @@ -14,8 +14,8 @@ process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') else: # GlobalTag and geometry via it - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2017_design', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py index 3e9fa58ed7014..27d74b3b45eac 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py @@ -15,8 +15,8 @@ else: # GlobalTag and geometry via GT process.load('Configuration.Geometry.GeometrySimDB_cff') - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py index 9594e5927cd8c..0314a4027a3e4 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py @@ -14,8 +14,8 @@ process.load('Configuration.Geometry.GeometryExtended2026D44_cff') else: # GlobalTag and geometry via GT - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py index 25c5d2884f351..3c86f58bc3ec6 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py @@ -14,8 +14,8 @@ process.load('Configuration.Geometry.GeometryExtended2026D46_cff') else: # GlobalTag and geometry via GT - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py index e6aa040cee4e3..7f79baa97baad 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py @@ -15,8 +15,8 @@ else: # GlobalTag and geometry via GT process.load('Configuration.Geometry.GeometrySimDB_cff') - process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2017_design', '') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py index a2fc50aaf2f16..437446c6efe7a 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py @@ -48,8 +48,8 @@ options.parseArguments() if options.fromDB : - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") - from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag + process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") + from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') else: process.load('Configuration.Geometry.GeometryExtended2026D49_cff') diff --git a/TrackPropagation/Geant4e/test/Geant4e_example_cfg.py b/TrackPropagation/Geant4e/test/Geant4e_example_cfg.py index 2f3b1d9dc3799..1b20a3bfd0304 100644 --- a/TrackPropagation/Geant4e/test/Geant4e_example_cfg.py +++ b/TrackPropagation/Geant4e/test/Geant4e_example_cfg.py @@ -9,10 +9,10 @@ process.load("Configuration.StandardSequences.Reconstruction_cff") process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.EndOfProcess_cff') -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') process.load("FWCore.MessageService.MessageLogger_cfi") diff --git a/Validation/CaloTowers/test/client_data_cfg.py b/Validation/CaloTowers/test/client_data_cfg.py index 9af726afc66bf..8c3b1acfbf698 100644 --- a/Validation/CaloTowers/test/client_data_cfg.py +++ b/Validation/CaloTowers/test/client_data_cfg.py @@ -37,7 +37,7 @@ class config: pass process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff') process.load('Configuration.StandardSequences.EDMtoMEAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load("DQMServices.Core.DQM_cfg") process.load("DQMServices.Components.DQMEnvironment_cfi") diff --git a/Validation/RecoJets/test/sequence_validation_cfg.py b/Validation/RecoJets/test/sequence_validation_cfg.py index 18221d17e7fe0..e5b40e707b7c9 100644 --- a/Validation/RecoJets/test/sequence_validation_cfg.py +++ b/Validation/RecoJets/test/sequence_validation_cfg.py @@ -6,7 +6,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #process.GlobalTag.globaltag = 'START42_V17::All' ##process.GlobalTag.globaltag = 'MC_38Y_V14::All' diff --git a/Validation/RecoMET/test/sequence_validation_cfg.py b/Validation/RecoMET/test/sequence_validation_cfg.py index 1de41fb8e8fea..ea9efb453e4fe 100644 --- a/Validation/RecoMET/test/sequence_validation_cfg.py +++ b/Validation/RecoMET/test/sequence_validation_cfg.py @@ -6,7 +6,7 @@ process.load('Configuration.StandardSequences.GeometryRecoDB_cff') process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') process.load('Configuration.StandardSequences.Reconstruction_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') #process.GlobalTag.globaltag = 'START42_V17::All' ##process.GlobalTag.globaltag = 'MC_38Y_V14::All' diff --git a/Validation/RecoTrack/test/MTV_HARVESTING.py b/Validation/RecoTrack/test/MTV_HARVESTING.py index 16c61fb734749..2b2b586414957 100644 --- a/Validation/RecoTrack/test/MTV_HARVESTING.py +++ b/Validation/RecoTrack/test/MTV_HARVESTING.py @@ -17,7 +17,7 @@ process.load('Configuration.StandardSequences.MagneticField_38T_cff') process.load('Configuration.StandardSequences.EDMtoMEAtRunEnd_cff') process.load('Configuration.StandardSequences.Harvesting_cff') -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) @@ -45,7 +45,7 @@ # Additional output definition # Other statements -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') # Path and EndPath definitions diff --git a/Validation/RecoTrack/test/MultiTrackValidator_cfg.py b/Validation/RecoTrack/test/MultiTrackValidator_cfg.py index 7e48dc14c9387..f2dd9013e2985 100644 --- a/Validation/RecoTrack/test/MultiTrackValidator_cfg.py +++ b/Validation/RecoTrack/test/MultiTrackValidator_cfg.py @@ -79,8 +79,8 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(400) ) ### conditions -process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff') -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') ### standard includes diff --git a/Validation/RecoVertex/test/allanalyzer_example_cfg.py b/Validation/RecoVertex/test/allanalyzer_example_cfg.py index 00d250e61a64d..9da97bb19ecd9 100644 --- a/Validation/RecoVertex/test/allanalyzer_example_cfg.py +++ b/Validation/RecoVertex/test/allanalyzer_example_cfg.py @@ -101,8 +101,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/Validation/RecoVertex/test/bspvanalyzer_cfg.py b/Validation/RecoVertex/test/bspvanalyzer_cfg.py index fe30b94236ea3..0a07d6a3f997b 100644 --- a/Validation/RecoVertex/test/bspvanalyzer_cfg.py +++ b/Validation/RecoVertex/test/bspvanalyzer_cfg.py @@ -98,8 +98,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py index 3a24d34a1ff2e..da00deac211fe 100644 --- a/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py @@ -166,8 +166,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py index 89681f77e8bd8..ebc3677931021 100644 --- a/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py @@ -82,8 +82,8 @@ #----GlobalTag ------------------------ -#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -#from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +#process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +#from Configuration.AlCa.GlobalTag import GlobalTag #process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') diff --git a/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py index 08440b7a701e9..c42532511844a 100644 --- a/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py @@ -112,8 +112,8 @@ #----GlobalTag ------------------------ -process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_condDBv2_cff") -from Configuration.AlCa.GlobalTag_condDBv2 import GlobalTag +process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") +from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, options.globalTag, '') process.TFileService = cms.Service('TFileService',