Merge pull request #31127 from fwyzard/drop_obsolete_autoCond_condDBv2

Drop obsolete condDBv2 files
cms-sw · Aug 26, 2020 · 3c9563b · 3c9563b
2 parents c532e1c + 148f4ff
commit 3c9563b
Show file tree

Hide file tree

Showing 183 changed files with 295 additions and 312 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...r/SiStripChannelGain/test/UsefullCode/PayloadFromASCIIfile/ProducePayloadFromASCII_cfg.py b/...r/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
@@ -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
@@ -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
@@ -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' ]