Merge pull request #10560 from ianna/zero-material-scenarios

Zero Material Scenarios
cms-sw · Aug 4, 2015 · 1263389 · 1263389
2 parents d91cf8c + e07364c
commit 1263389
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/CondTools/Geometry/test/writehelpers/createRun1Payloads.sh b/CondTools/Geometry/test/writehelpers/createRun1Payloads.sh
@@ -36,11 +36,11 @@ cmsRun geometrywriter.py
 # Input cff                    Output file
 # GeometryIdeal_cff            giSingleBigFile.xml
 #
-sed -i '{s/Extended/ExtendedTest2014/g}' geometryxmlwriter.py
-sed -i '{s/\/ge/\/get/g}' geometryxmlwriter.py
+sed -i '{s/Extended/ExtendedZeroMaterial/g}' geometryxmlwriter.py
+sed -i '{s/\/ge/\/gez/g}' geometryxmlwriter.py
 cmsRun geometryxmlwriter.py
-sed -i '{s/ExtendedTest2014/Ideal/g}' geometryxmlwriter.py
-sed -i '{s/\/get/\/gi/g}' geometryxmlwriter.py
+sed -i '{s/ExtendedZeroMaterial/Ideal/g}' geometryxmlwriter.py
+sed -i '{s/\/gez/\/gi/g}' geometryxmlwriter.py
 cmsRun geometryxmlwriter.py
 
 # Read the one big XML file and output a record to the
@@ -53,11 +53,11 @@ cmsRun geometryxmlwriter.py
 # gegSingleBigFile.xml      XMLFILE_Geometry_${mytag}_Extended2015GFlash_mc
 # giSingleBigFile.xml       XMLFILE_Geometry_${mytag}_Ideal_mc
 #
-sed -i '{s/Extended/ExtendedTest2014/g}' xmlgeometrywriter.py
-sed -i '{s/\/ge/\/get/g}' xmlgeometrywriter.py
+sed -i '{s/Extended/ExtendedZeroMaterial/g}' xmlgeometrywriter.py
+sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
 cmsRun xmlgeometrywriter.py
-sed -i '{s/ExtendedTest2014/Ideal/g}' xmlgeometrywriter.py
-sed -i '{s/\/get/\/gi/g}' xmlgeometrywriter.py
+sed -i '{s/ExtendedZeroMaterial/Ideal/g}' xmlgeometrywriter.py
+sed -i '{s/\/gez/\/gi/g}' xmlgeometrywriter.py
 cmsRun xmlgeometrywriter.py
 
 # All the database objects were written into one database

diff --git a/CondTools/Geometry/test/writehelpers/createRun2Payloads.sh b/CondTools/Geometry/test/writehelpers/createRun2Payloads.sh
@@ -39,6 +39,9 @@ cmsRun geometryrun2writer.py
 sed -i '{s/Extended/Ideal/g}' geometryrun2xmlwriter.py
 sed -i '{s/\/ge/\/gi/g}' geometryrun2xmlwriter.py
 cmsRun geometryrun2xmlwriter.py
+sed -i '{s/Ideal2015/Extended2015ZeroMaterial/g}' geometryrun2xmlwriter.py
+sed -i '{s/\/gi/\/gez/g}' geometryrun2xmlwriter.py
+cmsRun geometryrun2xmlwriter.py
 
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
@@ -53,6 +56,9 @@ cmsRun geometryrun2xmlwriter.py
 sed -i '{s/Extended/Ideal/g}' xmlgeometryrun2writer.py
 sed -i '{s/\/ge/\/gi/g}' xmlgeometryrun2writer.py
 cmsRun xmlgeometryrun2writer.py
+sed -i '{s/Ideal2015/Extended2015ZeroMaterial/g}' xmlgeometryrun2writer.py
+sed -i '{s/\/gi/\/gez/g}' xmlgeometryrun2writer.py
+cmsRun xmlgeometryrun2writer.py
 
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different

diff --git a/CondTools/Geometry/test/writehelpers/splitRun1Database.sh b/CondTools/Geometry/test/writehelpers/splitRun1Database.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended.db -t XMLFILE_Geometry_TagXX_Extended_mc -i XMLFILE_Geometry_TagXX_Extended_mc
-conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedTest2014.db -t XMLFILE_Geometry_TagXX_ExtendedTest2014_mc -i XMLFILE_Geometry_TagXX_ExtendedTest2014_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedZeroMaterial.db -t XMLFILE_Geometry_TagXX_ExtendedZeroMaterial_mc -i XMLFILE_Geometry_TagXX_ExtendedZeroMaterial_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileIdeal.db -t XMLFILE_Geometry_TagXX_Ideal_mc -i XMLFILE_Geometry_TagXX_Ideal_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

diff --git a/CondTools/Geometry/test/writehelpers/splitRun2Database.sh b/CondTools/Geometry/test/writehelpers/splitRun2Database.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015.db -t XMLFILE_Geometry_TagXX_Extended2015_mc -i XMLFILE_Geometry_TagXX_Extended2015_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileIdeal2015.db -t XMLFILE_Geometry_TagXX_Ideal2015_mc -i XMLFILE_Geometry_TagXX_Ideal2015_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015ZeroMaterial.db -t XMLFILE_Geometry_TagXX_Extended2015ZeroMaterial_mc -i XMLFILE_Geometry_TagXX_Extended2015ZeroMaterial_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKRECO_Geometry.db -t TKRECO_Geometry2015_TagXX -i TKRECO_Geometry2015_TagXX
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKExtra_Geometry.db -t TKExtra_Geometry2015_TagXX -i TKExtra_Geometry2015_TagXX
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:TKParameters_Geometry.db -t TKParameters_Geometry2015_TagXX -i TKParameters_Geometry2015_TagXX

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2015ZeroMaterialXML_cfi.py
@@ -211,6 +211,7 @@
         'Geometry/EcalCommonData/data/esalgo.xml',
         'Geometry/EcalCommonData/data/eeF.xml',
         'Geometry/EcalCommonData/data/eeB.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
         'Geometry/HcalCommonData/data/hcalrotations.xml',
         'Geometry/HcalCommonData/data/hcalalgo.xml',
         'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryZeroMaterialXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryZeroMaterialXML_cfi.py
@@ -242,6 +242,7 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
+        'Geometry/ForwardCommonData/data/bhm.xml',
         'Geometry/MuonCommonData/data/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/trackersens.xml',