drop optional xml file when read DB payload

cms-sw · Jun 17, 2021 · ed19c93 · ed19c93
1 parent af81128
commit ed19c93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc b/DetectorDescription/DDCMS/plugins/DDDetectorESProducer.cc
@@ -66,7 +66,9 @@ 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_(iConfig.existsAs<FileInPath>("confGeomXMLFiles")
+                            ? iConfig.getParameter<FileInPath>("confGeomXMLFiles").fullPath()
+                            : "none"),
       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),