Merge pull request #47587 from srimanob/151_ProtectNonExistingGeometry

Add protection if non-existent geometry is used

Author: cmsbuild

Configuration/Applications/python/ConfigBuilder.py

@@ -821,6 +821,8 @@ def addStandardSequences(self):
         try:
             if len(self.stepMap):
                 self.loadAndRemember(self.GeometryCFF)
+                if (self.GeometryCFF == 'Configuration/StandardSequences/GeometryRecoDB_cff' and not self.geometryDBLabel):
+                    print("Warning: The default GeometryRecoDB_cff is being used; however, the DB geometry is not applied. You may need to verify your cmsDriver.")
                 if ('SIM' in self.stepMap or 'reSIM' in self.stepMap) and not self._options.fast:
                     self.loadAndRemember(self.SimGeometryCFF)
                     if self.geometryDBLabel:
@@ -1159,7 +1161,10 @@ def inGeometryKeys(opt):
                 if opt in GeometryConf:
                     return GeometryConf[opt]
                 else:
-                    return opt
+                    if (opt=='SimDB' or opt.startswith('DB:')):
+                        return opt
+                    else:
+                        raise Exception("Geometry "+opt+" does not exist!")
 
             geoms=self._options.geometry.split(',')
             if len(geoms)==1: geoms=inGeometryKeys(geoms[0]).split(',')