Merge pull request #34167 from ianna/dd4hep-detector-fromDB

[DD4hep] DDDetector ES producer from DB
cms-sw · Jun 23, 2021 · 39a5001 · 39a5001
2 parents 5adce1b + e8c5905
commit 39a5001
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
@@ -66,7 +66,7 @@ class DDDetectorESProducer : public ESProducer, public EventSetupRecordIntervalF
 DDDetectorESProducer::DDDetectorESProducer(const ParameterSet& iConfig)
     : fromDB_(iConfig.getParameter<bool>("fromDB")),
       appendToDataLabel_(iConfig.getParameter<string>("appendToDataLabel")),
-      confGeomXMLFiles_(iConfig.getParameter<FileInPath>("confGeomXMLFiles").fullPath()),
+      confGeomXMLFiles_(fromDB_ ? "none" : iConfig.getParameter<FileInPath>("confGeomXMLFiles").fullPath()),
       rootDDName_(iConfig.getParameter<string>("rootDDName")),
       label_(iConfig.getParameter<string>("label")) {
   usesResources({edm::ESSharedResourceNames::kDD4Hep});

diff --git a/DetectorDescription/DDCMS/test/python/testGeometry2021FromDB.py b/DetectorDescription/DDCMS/test/python/testGeometry2021FromDB.py
@@ -12,7 +12,6 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml'),
                                             rootDDName = cms.string('cms:OCMS'),
                                             label = cms.string('Extended'),
                                             fromDB = cms.bool(True),