Merge pull request #8810 from ianna/geom-config-cleanup

Geometry Configuration Cleanup
cms-sw · Apr 22, 2015 · 9e4b0ee · 9e4b0ee
2 parents 992e7a3 + 67c8050
commit 9e4b0ee
Show file tree

Hide file tree

Showing 20 changed files with 4 additions and 112 deletions.
diff --git a/Configuration/Geometry/python/GeometryAll_cff.py b/Configuration/Geometry/python/GeometryAll_cff.py
diff --git a/Configuration/Geometry/python/GeometryExtended_cff.py b/Configuration/Geometry/python/GeometryExtended_cff.py
@@ -1,3 +1,6 @@
+import warnings
+warnings.warn('ATTENTION: This job uses Run 1 Geometry.')
+
 import FWCore.ParameterSet.Config as cms
 
 #

diff --git a/Configuration/StandardSequences/python/GeometryAll_cff.py b/Configuration/StandardSequences/python/GeometryAll_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryECALHCAL_cff.py b/Configuration/StandardSequences/python/GeometryECALHCAL_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtendedGFlash_cff.py b/Configuration/StandardSequences/python/GeometryExtendedGFlash_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtendedLiMax_cff.py b/Configuration/StandardSequences/python/GeometryExtendedLiMax_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtendedLiMin_cff.py b/Configuration/StandardSequences/python/GeometryExtendedLiMin_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtendedX0Max_cff.py b/Configuration/StandardSequences/python/GeometryExtendedX0Max_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtendedX0Min_cff.py b/Configuration/StandardSequences/python/GeometryExtendedX0Min_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryExtended_cff.py b/Configuration/StandardSequences/python/GeometryExtended_cff.py
@@ -1,6 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-# Ideal geometry, needed for simulation
-from Geometry.CMSCommonData.cmsExtendedGeometryXML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Configuration.Geometry.GeometryExtended_cff import *
 
diff --git a/Configuration/StandardSequences/python/GeometryHCAL_cff.py b/Configuration/StandardSequences/python/GeometryHCAL_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryIdealAPD1_cff.py b/Configuration/StandardSequences/python/GeometryIdealAPD1_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryIdealGFlash_cff.py b/Configuration/StandardSequences/python/GeometryIdealGFlash_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryIdealNoAPD_cff.py b/Configuration/StandardSequences/python/GeometryIdealNoAPD_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryIdeal_cff.py b/Configuration/StandardSequences/python/GeometryIdeal_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryNoCastor_cff.py b/Configuration/StandardSequences/python/GeometryNoCastor_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryPilot1_cff.py b/Configuration/StandardSequences/python/GeometryPilot1_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryPilot2_cff.py b/Configuration/StandardSequences/python/GeometryPilot2_cff.py
diff --git a/Configuration/StandardSequences/python/GeometryTrackerOnly_cff.py b/Configuration/StandardSequences/python/GeometryTrackerOnly_cff.py
diff --git a/Configuration/StandardSequences/python/Geometry_cff.py b/Configuration/StandardSequences/python/Geometry_cff.py