Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Deprecated Cond DB Configuration #21198

Merged
merged 1 commit into from Nov 8, 2017
Merged

Replace Deprecated Cond DB Configuration #21198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 4 additions & 10 deletions Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDB_cfg.py
View file
Open in desktop
Expand Up @@ -2,17 +2,11 @@

process = cms.Process("DDFilteredViewTest")
process.load("Configuration.Geometry.GeometryDB_cff")
process.XMLFromDBSource.label=''
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']

process.PoolDBESSourceGeometry = cms.ESSource("PoolDBESSource",
process.CondDBSetup,
timetype = cms.string('runnumber'),
toGet = cms.VPSet(cms.PSet(record = cms.string('GeometryFileRcd'),tag = cms.string('XMLFILE_Geometry_75YV4_Extended_mc')),
cms.PSet(record = cms.string('IdealGeometryRecord'),tag = cms.string('TKRECO_Geometry_75YV4'))
),
connect = cms.string('sqlite_file:myfile.db')
)
process.source = cms.Source("EmptySource")

process.maxEvents = cms.untracked.PSet(
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CSCGeometry/test/testCSCGeometryFromDB_cfg.py
View file
Open in desktop
Expand Up @@ -4,10 +4,10 @@

process = cms.Process("GeometryTest")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
process.XMLFromDBSource.label = cms.string('Extended')
process.GlobalTag.globaltag = 'PRE_MC62_V8::All'
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']

process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi")
process.preferFakeAlign = cms.ESPrefer("FakeAlignmentSource")
Expand Down
2 changes: 1 addition & 1 deletion Geometry/CaloEventSetup/test/ali2Screen_cfg.py
View file
Open in desktop
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("read")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CaloEventSetup/test/aliFile2Screen_cfg.py
View file
Open in desktop
@@ -1,17 +1,17 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("read")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
)

process.source = cms.Source("EmptySource")

process.CondDB.connect = cms.string('sqlite_file:myfile.db')
process.PoolDBESSource = cms.ESSource("PoolDBESSource",
process.CondDBSetup,
connect = cms.string('sqlite_file:myfile.db'),
process.CondDB,
toGet = cms.VPSet(
cms.PSet(
record = cms.string('EBAlignmentRcd'),
Expand Down
15 changes: 5 additions & 10 deletions Geometry/CaloEventSetup/test/runTestCaloGeometryAlign_cfg.py
View file
Open in desktop
Expand Up @@ -3,12 +3,11 @@

process = cms.Process("GeometryTest")

process.load("Configuration.StandardSequences.MagneticField_38T_cff")

process.load('Configuration/StandardSequences/GeometryDB_cff')

process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
process.GlobalTag.globaltag = 'GR_R_38X_V4::All'
process.load('Configuration.StandardSequences.GeometryDB_cff')
process.load('CondCore.CondDB.CondDB_cfi')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']

process.load("FWCore.MessageLogger.MessageLogger_cfi")

Expand All @@ -26,10 +25,6 @@

process.mfa = cms.EDAnalyzer("testMagneticField")

process.load("CondCore.DBCommon.CondDBSetup_cfi")



process.Timing = cms.Service("Timing")

process.SimpleMemoryCheck = cms.Service("SimpleMemoryCheck")
Expand Down
8 changes: 2 additions & 6 deletions Geometry/CaloEventSetup/test/runTestCaloGeometryXMLDB_cfg.py
View file
Open in desktop
Expand Up @@ -2,12 +2,8 @@

process = cms.Process("GeometryTest")
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.load("Configuration.StandardSequences.MagneticField_38T_cff")
process.load("GeometryReaders.XMLIdealGeometryESSource.cmsGeometryDB_cff")
process.load("Geometry.CaloEventSetup.CaloGeometry_cff")
process.load("Geometry.CaloEventSetup.CaloTopology_cfi")
process.load("Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('Configuration.StandardSequences.GeometryDB_cff')
process.load('CondCore.CondDB.CondDB_cfi')
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']
Expand Down
8 changes: 4 additions & 4 deletions Geometry/CaloEventSetup/test/testAli2File_cfg.py
View file
Open in desktop
@@ -1,18 +1,18 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("read")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
)

process.source = cms.Source("EmptySource")

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:testEcalAlignments.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
process.CondDBSetup,
timetype = cms.untracked.string('runnumber'),
connect = cms.string('sqlite_file:testEcalAlignments.db'),
process.CondDB,
toPut = cms.VPSet(
cms.PSet(
record = cms.string('EBAlignmentRcd'),
Expand Down
8 changes: 4 additions & 4 deletions Geometry/CaloEventSetup/test/testWriteESAlignments_cfg.py
View file
Open in desktop
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("read")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
Expand All @@ -16,10 +16,10 @@

process.source = cms.Source("EmptySource")

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:testESAlignments.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
process.CondDBSetup,
timetype = cms.untracked.string('runnumber'),
connect = cms.string('sqlite_file:testESAlignments.db'),
process.CondDB,
toPut = cms.VPSet(
cms.PSet(
record = cms.string('EBAlignmentRcd'),
Expand Down
8 changes: 4 additions & 4 deletions Geometry/CaloEventSetup/test/zeroAli2File_cfg.py
View file
Open in desktop
@@ -1,18 +1,18 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("read")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
)

process.source = cms.Source("EmptySource")

process.CondDB.timetype = cms.untracked.string('runnumber')
process.CondDB.connect = cms.string('sqlite_file:zeroEcalAlignments.db')
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
process.CondDBSetup,
timetype = cms.untracked.string('runnumber'),
connect = cms.string('sqlite_file:zeroEcalAlignments.db'),
process.CondDB,
toPut = cms.VPSet(
cms.PSet(
record = cms.string('EBAlignmentRcd'),
Expand Down
2 changes: 1 addition & 1 deletion Geometry/DTGeometry/test/testDTGeometryFromDB_cfg.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("GeometryTest")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("CondCore.DBCommon.CondDBSetup_cfi")
process.load('CondCore.CondDB.CondDB_cfi')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']
Expand Down
3 changes: 1 addition & 2 deletions Geometry/TrackerGeometryBuilder/test/trackerMap_cfg.py
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@
process.load("FWCore.MessageLogger.MessageLogger_cfi")

process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
process.load("Geometry.TrackerNumberingBuilder.trackerTopology_cfi")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.trackerParameters_cfi")

Expand All @@ -13,8 +14,6 @@
process.load("Alignment.CommonAlignmentProducer.FakeAlignmentSource_cfi")
process.load("Alignment.OfflineValidation.TrackerGeometryCompare_cfi")

process.load("CondCore.DBCommon.CondDBSetup_cfi")

process.maxEvents = cms.untracked.PSet(
input = cms.untracked.int32(1)
)
Expand Down
19 changes: 6 additions & 13 deletions Geometry/TrackerGeometryBuilder/test/trackerModuleInfoDB_cfg.py
View file
Open in desktop
@@ -1,23 +1,16 @@
import FWCore.ParameterSet.Config as cms

process = cms.Process("GeometryTest")
# empty input service, fire 10 events
process.load("FWCore.MessageLogger.MessageLogger_cfi")
process.load('Configuration.StandardSequences.GeometrySimDB_cff')
process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
process.load("CondCore.DBCommon.CondDBSetup_cfi")

process.load('FWCore.MessageLogger.MessageLogger_cfi')
process.load('Configuration.StandardSequences.GeometryDB_cff')
process.load('CondCore.CondDB.CondDB_cfi')
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']

process.source = cms.Source("EmptySource")

#the following may not need the connect string if the global tag includes the extra.
#process.GlobalTag.toGet = cms.VPSet(
# cms.PSet(record = cms.string("PGeometricDetExtraRcd"),
# tag = cms.string("TKExtra_Geometry_38YV0"),
# connect = cms.untracked.string("frontier://FrontierPrep/CMS_COND_GEOMETRY")
# )
# )

#this is always needed if users want access to the vector<GeometricDetExtra>
process.TrackerGeometricDetExtraESModule = cms.ESProducer( "TrackerGeometricDetExtraESModule",
fromDDD = cms.bool( False )
Expand Down