Merge pull request #16757 from ianna/fix-2019-scenario

Bugfix: 2019 Geometry Scenario
cms-sw · Nov 27, 2016 · 378da70 · 378da70
2 parents 3a8f5c6 + aadb849
commit 378da70
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 46 deletions.
diff --git a/Fireworks/Geometry/python/dumpSimGeometry_cfg.py b/Fireworks/Geometry/python/dumpSimGeometry_cfg.py
@@ -3,7 +3,7 @@
 import FWCore.ParameterSet.VarParsing as VarParsing
 from FWCore.Utilities.Enumerate import Enumerate
 
-varType = Enumerate ("Run1 Ideal2015 Ideal2015dev 2015 2015dev GEMDev RPC4RE11 2017 2017dev 2017new 2017NewFPix 2019 2023D1 2023D2 2023D3 MaPSA CRack DB")
+varType = Enumerate ("Run1 Run2 Run3 2015 2017 2019 2023D1 2023D2 2023D3 2023D4 2023D5")
 
 def help():
    print "Usage: cmsRun dumpSimGeometry_cfg.py  tag=TAG "
@@ -19,40 +19,31 @@ def help():
 def simGeoLoad(score):
     print "Loading configuration for tag ", options.tag ,"...\n"
     if score == "Run1":
-       process.load("Geometry.CMSCommonData.cmsIdealGeometryXML_cfi")
-
-    elif score == "2015":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2015XML_cfi")
-
-    elif score == "2015dev":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2015devXML_cfi")
-
-    elif score == "GEMDev":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2015MuonGEMDevXML_cfi")
+       process.load('Configuration.StandardSequences.GeometryDB_cff')
+       process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+       from Configuration.AlCa.autoCond import autoCond
+       process.GlobalTag.globaltag = autoCond['run1_mc']
+
+    elif score == "Run2":
+       process.load('Configuration.StandardSequences.GeometryDB_cff')
+       process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+       from Configuration.AlCa.autoCond import autoCond
+       process.GlobalTag.globaltag = autoCond['run2_mc']
 
-    elif score == "Ideal2015":
-       process.load("Geometry.CMSCommonData.cmsIdealGeometry2015XML_cfi")
+    elif score == "Run3":
+       process.load('Configuration.StandardSequences.GeometryDB_cff')
+       process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+       from Configuration.AlCa.autoCond import autoCond
+       process.GlobalTag.globaltag = autoCond['upgrade2017']
 
-    elif score == "Ideal2015dev":
-       process.load("Geometry.CMSCommonData.cmsIdealGeometry2015devXML_cfi")
-
-    elif score == "RPC4RE11":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2015XML_RPC4RE11_cfi")
+    elif score == "2015":
+       process.load('Geometry.CMSCommonData.cmsExtendedGeometry2015XML_cfi')
 
     elif score == "2017":
-       process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')
+       process.load('Geometry.CMSCommonData.cmsExtendedGeometry2017XML_cfi')
 
-    elif score == "2017dev":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017devXML_cfi")
-
-    elif score == "2017new":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017newXML_cfi")
-
-    elif score == "2017NewFPix":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017XML_NewFPix_cfi")
-
     elif score == "2019":
-       process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+       process.load('Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi')
 
     elif score == "2023D1":
        process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023D1XML_cfi')
@@ -69,23 +60,9 @@ def simGeoLoad(score):
     elif score == "2023D5":
        process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023D5XML_cfi')
 
-    elif score == "MaPSA":
-       process.load('Geometry.TrackerCommonData.mapsaGeometryXML_cfi')
-
-    elif score == "CRack":
-       process.load('Geometry.TrackerCommonData.crackGeometryXML_cfi')
-
-    elif score == "DB":
-        process.load("Configuration.StandardSequences.GeometryDB_cff")
-        process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
-        from Configuration.AlCa.autoCond import autoCond
-        process.GlobalTag.globaltag = autoCond['run2_mc']
-
     else:
       help()
 
-
-
 options = VarParsing.VarParsing ()
 
 defaultTag=str(2015);

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py
@@ -6,11 +6,11 @@
     geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
         'Geometry/CMSCommonData/data/rotations.xml',
         'Geometry/CMSCommonData/data/extend/cmsextent.xml',
-        'Geometry/CMSCommonData/data/PostLS2/cms.xml',
+        'Geometry/CMSCommonData/data/Run2/cms.xml',
         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
         'Geometry/CMSCommonData/data/cmsMother.xml',
         'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase.xml',
+        'Geometry/CMSCommonData/data/Run2/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
         'Geometry/CMSCommonData/data/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',

diff --git a/Geometry/ForwardCommonData/data/PostLS2/brm.xml b/Geometry/ForwardCommonData/data/PostLS2/brm.xml
@@ -8,6 +8,7 @@
          When I refer to the trapezoidal paddles, I am speaking of the 4 trapezoidal parts of the detector. 
          ************************************************************************************************************************-->
     <ConstantsSection label="brm.xml" eval="true">
+        <Constant name="ForwdDetsZ2"  value="16.0065*m-1.6165*m"/>
         <!--BSC1_Specifications(below)-->
         <Constant name="rMinBSC" value="22.0*cm"/>
         <Constant name="rMaxBSC" value="45.0*cm"/>
@@ -40,7 +41,7 @@
         <Constant name="dzBSC2" value="0.8*cm"/>
         <Constant name="dzBSC2Total" value="([dzBSC2]+[dzBSCExtra])"/>
         <!--^^^ Thickness of BSC2 ^^^^-->
-        <Constant name="zposBSC2" value="[cms:ForwdDetsZ2]-[dzBSC2Total]"/>
+        <Constant name="zposBSC2" value="[ForwdDetsZ2]-[dzBSC2Total]"/>
         <!--^^^Where BSC2 rests along the beamline-->
     </ConstantsSection>
     <SolidSection label="brm.xml">