Geometry 2018 (updated Cavern and new shields)

cms-sw · Jan 23, 2019 · cf321fa · cf321fa
1 parent 5500bf2
commit cf321fa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/CondTools/Geometry/test/writehelpers/createExtended2018Payloads.sh b/CondTools/Geometry/test/writehelpers/createExtended2018Payloads.sh
@@ -41,6 +41,10 @@ sed -i '{s/Extended2018/Extended2018ZeroMaterial/g}' geometryExtended2018_xmlwri
 sed -i '{s/\/ge/\/gez/g}' geometryExtended2018_xmlwriter.py
 cmsRun geometryExtended2018_xmlwriter.py
 
+sed -i '{s/Extended2018ZeroMaterial/Extended2018DetailedCavern/g}' geometryExtended2018_xmlwriter.py
+sed -i '{s/\/gez/\/geDC/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py
+
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
 # This is repeated several times below.  The sed commands
@@ -54,6 +58,10 @@ sed -i '{s/Extended/Extended2018ZeroMaterial/g}' xmlgeometrywriter.py
 sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
 cmsRun xmlgeometrywriter.py
 
+sed -i '{s/Extended2018ZeroMaterial/Extended2018DetailedCavern/g}' xmlgeometrywriter.py
+sed -i '{s/\/gez/\/geDC/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py
+
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different
 # pieces into separate database files.  These are the payloads

diff --git a/CondTools/Geometry/test/writehelpers/splitExtended2018Database.sh b/CondTools/Geometry/test/writehelpers/splitExtended2018Database.sh
@@ -2,6 +2,7 @@
 
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2018.db -t XMLFILE_Geometry_TagXX_Extended2018_mc -i XMLFILE_Geometry_TagXX_Extended2018_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2018ZeroMaterial.db -t XMLFILE_Geometry_TagXX_Extended2018ZeroMaterial_mc -i XMLFILE_Geometry_TagXX_Extended2018ZeroMaterial_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2018DetailedCavern.db -t XMLFILE_Geometry_TagXX_Extended2018DetailedCavern_mc -i XMLFILE_Geometry_TagXX_Extended2018DetailedCavern_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKRECO_Geometry.db -t TKRECO_Geometry_TagXX -i TKRECO_Geometry_TagXX
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKExtra_Geometry.db -t TKExtra_Geometry_TagXX -i TKExtra_Geometry_TagXX
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKParameters_Geometry.db -t TKParameters_Geometry_TagXX -i TKParameters_Geometry_TagXX

diff --git a/Configuration/Geometry/python/GeometryExtended2018DetailedCavern_cff.py b/Configuration/Geometry/python/GeometryExtended2018DetailedCavern_cff.py
@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryDetailedCavern2018XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+