Merge pull request #7019 from boudoul/fix2023dev

fix 2023Muondev (development scenario)
cms-sw · Dec 30, 2014 · f2b38bc · f2b38bc
2 parents c61f793 + c1c2b44
commit f2b38bc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuondevXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuondevXML_cfi.py
@@ -67,7 +67,7 @@
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseIIdev/BarrelEndcap5D/tracker.xml',
         'Geometry/TrackerCommonData/data/trackerpixbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseIdev/trackerpixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseIIdev/Pixel10D/trackerpixfwd.xml',
         'Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',

diff --git a/Geometry/TrackerCommonData/data/PhaseIIdev/Pixel10D/trackerpixfwd.xml b/Geometry/TrackerCommonData/data/PhaseIIdev/Pixel10D/trackerpixfwd.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="trackerpixfwd.xml" eval="true">
+ <Constant name="zero"        value="0.0*fm"/>
+ <Constant name="zPos"        value="[pixfwd:ZPixelForward]"/>
+</ConstantsSection>
+
+<PosPartSection label="trackerpixfwd.xml">
+ <PosPart copyNumber="1">
+   <rParent name="tracker:Tracker"/>
+   <rChild name="pixfwd:PixelForward"/>
+   <Translation x="[zero]" y="[zero]" z="[zPos]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="tracker:Tracker"/>
+   <rChild name="pixfwd:PixelForward"/>
+   <Translation x="[zero]" y="[zero]" z="-[zPos]" />
+   <rRotation name="pixfwdCommon:Y180" />
+ </PosPart>
+</PosPartSection>
+
+</DDDefinition>