Merge pull request #14010 from ianna/2015-tracker-material-variations

2015 Extended Scenario with Tracker Material Variations

CondTools/Geometry/test/writehelpers/createRun2Payloads.sh

@@ -51,6 +51,18 @@ cmsRun geometryrun2xmlwriter.py
 sed -i '{s/CastorSystMinus/CastorSystPlus/g}' geometryrun2xmlwriter.py
 sed -i '{s/\/gm/\/gp/g}' geometryrun2xmlwriter.py
 cmsRun geometryrun2xmlwriter.py
+sed -i '{s/CastorSystPlus/FlatMinus05Percent/g}' geometryrun2xmlwriter.py
+sed -i '{s/\/gp/\/gfm05/g}' geometryrun2xmlwriter.py
+cmsRun geometryrun2xmlwriter.py
+sed -i '{s/FlatMinus05Percent/FlatMinus10Percent/g}' geometryrun2xmlwriter.py
+sed -i '{s/\/gfm05/\/gfm10/g}' geometryrun2xmlwriter.py
+cmsRun geometryrun2xmlwriter.py
+sed -i '{s/FlatMinus10Percent/FlatPlus05Percent/g}' geometryrun2xmlwriter.py
+sed -i '{s/\/gfm10/\/gfp05/g}' geometryrun2xmlwriter.py
+cmsRun geometryrun2xmlwriter.py
+sed -i '{s/FlatPlus05Percent/FlatPlus10Percent/g}' geometryrun2xmlwriter.py
+sed -i '{s/\/gfp05/\/gfp10/g}' geometryrun2xmlwriter.py
+cmsRun geometryrun2xmlwriter.py
 
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
@@ -77,6 +89,18 @@ cmsRun xmlgeometryrun2writer.py
 sed -i '{s/CastorSystMinus/CastorSystPlus/g}' xmlgeometryrun2writer.py
 sed -i '{s/\/gm/\/gp/g}' xmlgeometryrun2writer.py
 cmsRun xmlgeometryrun2writer.py
+sed -i '{s/CastorSystPlus/FlatMinus05Percent/g}' xmlgeometryrun2writer.py
+sed -i '{s/\/gp/\/gfm05/g}' xmlgeometryrun2writer.py
+cmsRun xmlgeometryrun2writer.py
+sed -i '{s/FlatMinus05Percent/FlatMinus10Percent/g}' xmlgeometryrun2writer.py
+sed -i '{s/\/gfm05/\/gfm10/g}' xmlgeometryrun2writer.py
+cmsRun xmlgeometryrun2writer.py
+sed -i '{s/FlatMinus10Percent/FlatPlus05Percent/g}' xmlgeometryrun2writer.py
+sed -i '{s/\/gfm10/\/gfp05/g}' xmlgeometryrun2writer.py
+cmsRun xmlgeometryrun2writer.py
+sed -i '{s/FlatPlus05Percent/FlatPlus10Percent/g}' xmlgeometryrun2writer.py
+sed -i '{s/\/gfp05/\/gfp10/g}' xmlgeometryrun2writer.py
+cmsRun xmlgeometryrun2writer.py
 
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different

CondTools/Geometry/test/writehelpers/splitRun2Database.sh

@@ -5,6 +5,10 @@ conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015Ze
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015CastorMeasured.db -t XMLFILE_Geometry_TagXX_Extended2015CastorMeasured_mc -i XMLFILE_Geometry_TagXX_Extended2015CastorMeasured_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015CastorSystMinus.db -t XMLFILE_Geometry_TagXX_Extended2015CastorSystMinus_mc -i XMLFILE_Geometry_TagXX_Extended2015CastorSystMinus_mc
 conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015CastorSystPlus.db -t XMLFILE_Geometry_TagXX_Extended2015CastorSystPlus_mc -i XMLFILE_Geometry_TagXX_Extended2015CastorSystPlus_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015FlatMinus05Percent.db -t XMLFILE_Geometry_TagXX_Extended2015FlatMinus05Percent_mc -i XMLFILE_Geometry_TagXX_Extended2015FlatMinus05Percent_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015FlatMinus10Percent.db -t XMLFILE_Geometry_TagXX_Extended2015FlatMinus10Percent_mc -i XMLFILE_Geometry_TagXX_Extended2015FlatMinus10Percent_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015FlatPlus05Percent.db -t XMLFILE_Geometry_TagXX_Extended2015FlatPlus05Percent_mc -i XMLFILE_Geometry_TagXX_Extended2015FlatPlus05Percent_mc
+conddb_import -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtended2015FlatPlus10Percent.db -t XMLFILE_Geometry_TagXX_Extended2015FlatPlus10Percent_mc -i XMLFILE_Geometry_TagXX_Extended2015FlatPlus10Percent_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

Configuration/Geometry/python/GeometryExtended2015FlatMinus05Percent_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatMinus05PercentXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+

Configuration/Geometry/python/GeometryExtended2015FlatMinus10Percent_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatMinus10PercentXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+

Configuration/Geometry/python/GeometryExtended2015FlatPlus05Percent_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatPlus05PercentXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+

Configuration/Geometry/python/GeometryExtended2015FlatPlus10Percent_cff.py

@@ -0,0 +1,11 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometry2015FlatPlus10PercentXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from Geometry.HcalCommonData.hcalParameters_cfi      import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
+