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

Change Geometry_cff to GeometryDB_cff in AlCaDB related config files #35278

Merged
merged 2 commits into from Sep 22, 2021
Merged

Change Geometry_cff to GeometryDB_cff in AlCaDB related config files #35278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbe9ce6
Change Geometry_cff to GeometryDB_cff
tvami Sep 15, 2021
e31dff6
Remove commented out line
tvami Sep 15, 2021
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
2 changes: 1 addition & 1 deletion Alignment/LaserAlignmentSimulation/test/LaserSimulation_cfg.py
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
# include default services, like RandomNumberGenerator
process.load("Configuration.StandardSequences.Services_cff")

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")

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

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/test/make_SVGtemplates_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.source = cms.Source("EmptySource")
process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1))

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
Copy link
Contributor

@mmusich mmusich Sep 15, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I am not mistaken a Global Tag (or at least an ESSource providing the geometry records in the ES) is needed in order for GeometryDB_cff to work.
As far as I can see, that is not included in this file (and in many others of this PR).

process.MuonGeometrySVGTemplate = cms.EDAnalyzer("MuonGeometrySVGTemplate",
wheelTemplateName = cms.string("wheel_template.svg"))

Expand Down
2 changes: 1 addition & 1 deletion Alignment/MuonAlignment/test/test_sanityCheck_cfg.py
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = "MC_36Y_V10::All"
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")

from Alignment.MuonAlignment.MuonGeometrySanityCheck_cfi import *
process.MuonGeometrySanityCheck = MuonGeometrySanityCheck.clone()
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/scripts/TkAlCaRecoPrescaling.ALCARECOTkAlCosmics0T.tpl
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ process.source = cms.Source("PoolSource",
from CondCore.DBCommon.CondDBSetup_cfi import *

process.load('Configuration.EventContent.EventContent_cff')
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/scripts/TkAlCaRecoPrescaling.ALCARECOTkAlMinBias.tpl
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ process.source = cms.Source("PoolSource",
from CondCore.DBCommon.CondDBSetup_cfi import *

process.load('Configuration.EventContent.EventContent_cff')
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/scripts/TkAlCaRecoSkimming.ALCARECOTkAlCosmics0T.tpl
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ process.source = cms.Source("PoolSource",
from CondCore.DBCommon.CondDBSetup_cfi import *

process.load('Configuration.EventContent.EventContent_cff')
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion Alignment/TrackerAlignment/scripts/TkAlCaRecoSkimming.ALCARECOTkAlMinBias.tpl
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ process.source = cms.Source("PoolSource",
from CondCore.DBCommon.CondDBSetup_cfi import *

process.load('Configuration.EventContent.EventContent_cff')
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/test/testNewCalibConstants_global_cfg.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
process = cms.Process("TEST")

# Standard stuff needed for the unpacking and local reco
process.load("Configuration/StandardSequences/Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration/StandardSequences/MagneticField_cff")
process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff")
process.load("Configuration/StandardSequences/RawToDigi_Data_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibMuon/CSCCalibration/test/testNewCalibConstants_sim_cfg.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("TEST")

process.load("Configuration/StandardSequences/Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration/StandardSequences/MagneticField_cff")
process.load("Configuration/StandardSequences/FrontierConditions_GlobalTag_cff")
# for Beam
Expand Down
1 change: 0 additions & 1 deletion CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter_cfg.py
View file
Open in desktop
Expand Up @@ -3,7 +3,6 @@
process = cms.Process("MapWriter")
process.load("CondCore.DBCommon.CondDBCommon_cfi")

#process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngleCosmic_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

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

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")

process.load("Configuration.StandardSequences.MagneticField_38T_cff")
process.load("Configuration.StandardSequences.ReconstructionCosmics_cff")
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiPixelLorentzAngle/test/SiPixelLorentzAngle_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

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

#process.load("Configuration.StandardSequences.Geometry_cff")
#process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load('Configuration/StandardSequences/GeometryExtended_cff')

process.load('Configuration.StandardSequences.MagneticField_cff')
Expand Down
2 changes: 1 addition & 1 deletion CalibTracker/SiStripChannelGain/test/SSTGain_PCL_Config_cfg.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("APVGAIN")

process.load('Configuration.StandardSequences.Geometry_cff')
process.load('Configuration.StandardSequences.GeometryDB_cff')
process.load('Configuration.StandardSequences.MagneticField_cff')
process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
Expand Down
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/test/AlCaDoubleElectrons_cfg.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
process = cms.Process("AlCaElectronsProduction")
process.load("FWCore.MessageLogger.MessageLogger_cfi")

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = cms.string('GR_R_52_V7::All')
process.load("Configuration.StandardSequences.MagneticField_cff")
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalAlCaRecoProducers/test/di_cfg.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
process = cms.Process("DIJETS")


process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")

process.maxEvents = cms.untracked.PSet(
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalAlCaRecoProducers/test/phi_sym_cfg.py
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
process = cms.Process("PHISYM")


process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")

process.maxEvents = cms.untracked.PSet(
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalCalibAlgos/test/batchjob_analisotrk.csh
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = 'MC_31X_V5::All'

process.load("Configuration.StandardSequences.Reconstruction_cff")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")

process.load("Configuration.StandardSequences.VtxSmearedBetafuncEarlyCollision_cff")
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalCalibAlgos/test/batchjob_calib_valid.csh
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ process.prefer("GlobalTag")

process.load("Configuration.StandardSequences.VtxSmearedBetafuncEarlyCollision_cff")
process.load("Configuration.StandardSequences.Generator_cff")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load("Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalIsoTrk_cff")
process.load("Calibration.HcalAlCaRecoProducers.ALCARECOHcalCalIsoTrkNoHLT_cff")
Expand Down
2 changes: 1 addition & 1 deletion Calibration/HcalCalibAlgos/test/batchjob_pf_corrs.csh
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ import FWCore.ParameterSet.Config as cms

process = cms.Process("HcalPFCorrsCulculation")
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Configuration.StandardSequences.Services_cff")
process.load("Configuration.StandardSequences.Reconstruction_cff")

Expand Down
2 changes: 1 addition & 1 deletion Calibration/TkAlCaRecoProducers/test/Alca_BeamFit_Workflow.py
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@
process.load("Configuration.StandardSequences.MagneticField_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
process.GlobalTag.globaltag = 'GR_R_38X_V9::All' #'GR_R_35X_V8::All'
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")


## reco PV
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjForHLTBuilder_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.load("Configuration.StandardSequences.MagneticField_cff")

#process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjForHLTReader_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.load("FWCore.MessageService.MessageLogger_cfi")

#process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjOfflineBuilder_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.load("Configuration.StandardSequences.MagneticField_cff")

#process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjOfflineReader_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.load("FWCore.MessageService.MessageLogger_cfi")

#process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelCondObjReader_cfg.py
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
process.load("FWCore.MessageService.MessageLogger_cfi")

#process.load("Geometry.TrackerSimData.trackerSimGeometryXML_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelGainCalibrationReadDQMFile_cfg.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("test")
process.load("CondTools.SiPixel.SiPixelGainCalibrationService_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/SiPixelGainCalibrationRejectNoisyAndDead_cfg.py
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@

process = cms.Process("test")
process.load("CondTools.SiPixel.SiPixelGainCalibrationService_cfi")
process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi")
process.load("Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff")
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiStrip/test/SiStripDetVOffFakeBuilder_cfg.py
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@
))
)

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.TrackerDigiGeometryESModule.applyAlignment = False

process.prod = cms.EDAnalyzer("SiStripDetVOffFakeBuilder")
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiStrip/test/SiStripFedCablingBuilder_cfg.py
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@
))
)

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.TrackerDigiGeometryESModule.applyAlignment = False
process.SiStripConnectivity = cms.ESProducer("SiStripConnectivity")
process.SiStripRegionConnectivity = cms.ESProducer("SiStripRegionConnectivity",
Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiStrip/test/SiStripFedCablingReader_cfg.py
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@
))
)

process.load("Configuration.StandardSequences.Geometry_cff")
process.load("Configuration.StandardSequences.GeometryDB_cff")
process.TrackerDigiGeometryESModule.applyAlignment = False
process.SiStripConnectivity = cms.ESProducer("SiStripConnectivity")
process.SiStripRegionConnectivity = cms.ESProducer("SiStripRegionConnectivity",
Expand Down