diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml index 30e8d5df589c4..664f5887d8da8 100644 --- a/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml +++ b/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml @@ -355,11 +355,11 @@ <Tubs name="PixelBarrelConnToST" rMin="[ConnToSTRin]" rMax="[ConnToSTRout]" dz="[ConnToSTT]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" - dz="[Conn3T]/2" startPhi="285*deg" deltaPhi="150*deg"/> + dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" - dz="[Conn4T]/2" startPhi="285*deg" deltaPhi="150*deg"/> + dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" - dz="[ServT]/2" startPhi="293*deg" deltaPhi="134*deg"/> + dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/> </SolidSection> @@ -539,19 +539,19 @@ </LogicalPart> <LogicalPart name="PixelBarrelConn3" category="unspecified"> <rSolid name="PixelBarrelConn3"/> - <rMaterial name="pixbarmaterial:SupplyTubeConn3"/> + <rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/> </LogicalPart> <LogicalPart name="PixelBarrelConn4" category="unspecified"> <rSolid name="PixelBarrelConn4"/> - <rMaterial name="pixbarmaterial:SectorC"/> + <rMaterial name="pixbarmaterial:SectorC_3Disks"/> </LogicalPart> <LogicalPart name="PixelBarrelService" category="unspecified"> <rSolid name="PixelBarrelService"/> - <rMaterial name="pixbarmaterial:SectorA"/> + <rMaterial name="pixbarmaterial:SectorA_3Disks"/> </LogicalPart> <LogicalPart name="PixelBarrelSupTubCables" category="unspecified"> <rSolid name="PixelBarrelSupTubCables"/> - <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/> + <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/> </LogicalPart> </LogicalPartSection> diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml index 198ef40105560..6d45c7af27a3d 100644 --- a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml +++ b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml @@ -4,7 +4,7 @@ <MaterialSection label="pixbarmaterial.xml"> <!-- New materials --> - <CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight"> <!--Supply tube material in Conn3 volume--> + <CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight"> <!--Supply tube material in Conn3 volume (no fpix contribution and 150/180 deg sectors)--> <MaterialFraction fraction="0.027795"> <rMaterial name="materials:Bpix_Pipe_Steel"/> </MaterialFraction> @@ -30,6 +30,17 @@ <rMaterial name="materials:T_Kapton"/> </MaterialFraction> </CompositeMaterial> + + <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.4646*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added --> + <MaterialFraction fraction="1.00000000"> + <rMaterial name="SupplyTubeConn3"/> + </MaterialFraction> + </CompositeMaterial> + <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.7908*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added --> + <MaterialFraction fraction="1.00000000"> + <rMaterial name="SupplyTubeConn3"/> + </MaterialFraction> + </CompositeMaterial> <CompositeMaterial name="SupplyTubeEpoxy" density="1.05*g/cm3" symbol=" " method="mixture by weight"> <MaterialFraction fraction="0.5999"> @@ -576,6 +587,17 @@ <rMaterial name="trackermaterial:T_Nomex"/> </MaterialFraction> </CompositeMaterial> + + <CompositeMaterial name="SectorA_3Disks" density="0.55812*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added --> + <MaterialFraction fraction="1.0"> + <rMaterial name="pixbarmaterial:SectorA"/> + </MaterialFraction> + </CompositeMaterial> + <CompositeMaterial name="SectorA_10Disks" density="0.95001*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added --> + <MaterialFraction fraction="1.0"> + <rMaterial name="pixbarmaterial:SectorA"/> + </MaterialFraction> + </CompositeMaterial> <CompositeMaterial name="SectorB" density="0.74961*g/cm3" symbol=" " method="mixture by weight"> <MaterialFraction fraction="0.19011"> @@ -648,6 +670,17 @@ <rMaterial name="trackermaterial:T_Nomex"/> </MaterialFraction> </CompositeMaterial> + + <CompositeMaterial name="SectorC_3Disks" density="1.22394*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added --> + <MaterialFraction fraction="1.000000"> + <rMaterial name="pixbarmaterial:SectorC"/> + </MaterialFraction> + </CompositeMaterial> + <CompositeMaterial name="SectorC_10Disks" density="2.18549*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added --> + <MaterialFraction fraction="1.000000"> + <rMaterial name="pixbarmaterial:SectorC"/> + </MaterialFraction> + </CompositeMaterial> <CompositeMaterial name="SectorC_Upgrade" density="0.19652*g/cm3" symbol=" " method="mixture by weight"> <MaterialFraction fraction="1.00000000"> @@ -685,6 +718,17 @@ <rMaterial name="trackermaterial:T_Copper"/> </MaterialFraction> </CompositeMaterial> + + <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="0.96016*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added --> + <MaterialFraction fraction="1.00000000"> + <rMaterial name="PixelBarrelSupTubCables2"/> + </MaterialFraction> + </CompositeMaterial> + <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.63436*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added --> + <MaterialFraction fraction="1.00000000"> + <rMaterial name="PixelBarrelSupTubCables2"/> + </MaterialFraction> + </CompositeMaterial> </MaterialSection> diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml index e924c89b5f5d1..aa1a3224a10d7 100644 --- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml +++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml @@ -10,7 +10,7 @@ <!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> --> <Constant name="OuterRingHalfWidth" value="18.6*mm"/> <Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/> - <Constant name="InnerRingRMax" value="89.2"/> + <Constant name="InnerRingRMax" value="89.2*mm"/> <Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/> <Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/> <Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/> diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml index 794b1c5e8255b..11a7049047648 100644 --- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml +++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml @@ -9,7 +9,7 @@ <!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> --> <Constant name="OuterRingHalfWidth" value="18.6*mm"/> <Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/> - <Constant name="InnerRingRMax" value="89.2"/> + <Constant name="InnerRingRMax" value="89.2*mm"/> <Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/> <Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/> <Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/> diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml index ddf6631f81f66..a83bc73637555 100644 --- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml +++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml @@ -10,7 +10,7 @@ <!-- <Constant name="OuterRingHalfWidth" value="18.6*mm"/> --> <Constant name="OuterRingHalfWidth" value="18.6*mm"/> <Constant name="OuterRingZ" value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/> - <Constant name="InnerRingRMax" value="89.2"/> + <Constant name="InnerRingRMax" value="89.2*mm"/> <Constant name="InnerRingRMin" value="[InnerRingRMax]-2.0*mm"/> <Constant name="InnerRingCFRMax" value="[InnerRingRMin]"/> <Constant name="InnerRingCFRMin" value="[InnerRingCFRMax]-0.5*mm"/> diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml index 1b06168cda8d1..4904142b547ed 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml @@ -5,8 +5,7 @@ <Constant name="Rin1" value="2.50*cm"/> <Constant name="Rin2" value="18.00*cm"/> <Constant name="Rin3" value="18.6*cm"/> - <Constant name="RinSupTubCab" value="15.00*cm"/> - <Constant name="Rout1" value="21.35*cm"/> + <Constant name="Rout1" value="20.35*cm"/> <!-- 21.35*cm--> <Constant name="Rout2" value="21.00*cm"/> <Constant name="Zv1" value="28.70*cm"/> <Constant name="Zv2" value="56.00*cm"/> @@ -14,7 +13,7 @@ <Constant name="Zv4" value="282.0*cm"/> <Constant name="ZvSupTubCab" value="248.0*cm"/> <Constant name="SupportL" value="221.0*cm"/> - <Constant name="SupportRin" value="21.2*cm"/> + <Constant name="SupportRin" value="20.2*cm"/> <!-- 21.2*cm--> <Constant name="SupportL_cut" value="[FlangeT]"/> <Constant name="SupportW_cut" value="7.00*cm"/> <Constant name="SupportW" value="20.00*cm"/> @@ -136,23 +135,9 @@ <Constant name="Conn2Rin" value="11.00*cm"/> <Constant name="Conn1Z" value="[FlangeZ]-[FlangeT]/2-[Conn1T]/2"/> <Constant name="Conn2Z" value="[FlangeZ]+[FlangeT]/2+[Conn1T]/2"/> - <Constant name="Conn3Rout" value="19.0*cm"/> - <Constant name="Conn3Rin" value="18.0*cm"/> - <Constant name="Conn4Rin" value="18.0*cm"/> <Constant name="ConnToSTT" value="3.00*cm"/> <Constant name="ConnToSTRin" value="18.0*cm"/> <Constant name="ConnToSTRout" value="18.8*cm"/> - <Constant name="Conn3T" value="51.0*cm"/> - <Constant name="Conn4T" value="120.00*cm"/> - <Constant name="ConnToSTZ" value="30.50*cm"/> - <Constant name="Conn3Z" value="54.62*cm"/> - <Constant name="Conn4Z" value="[Conn3Z]+ ([Conn3T]+[Conn4T])/2"/> - <Constant name="ServiceRout" value="21.0*cm"/> - <Constant name="ServiceRin" value="18.0*cm"/> - <Constant name="ServT" value="48.5*cm"/> - <Constant name="ServZ" value="[Conn4Z]+ ([Conn4T]+[ServT])/2"/> - <Constant name="ServCablT" value="32.2*cm"/> - <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/> <Constant name="RadialCoolZ" value="29.5*cm"/> <Constant name="RadialCoolDZ" value="1.0*cm"/> <Constant name="RadialCoolRin" value="4.0*cm"/> @@ -162,24 +147,20 @@ </RotationSection> <SolidSection label="pixbar.xml"> <Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg"> - <ZSection z="-281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/> - <ZSection z="-245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/> - <ZSection z="-245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/> - <ZSection z="-118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/> - <ZSection z="-118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/> - <ZSection z="-116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/> - <ZSection z="-116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/> - <ZSection z="-28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/> - <ZSection z="-28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/> - <ZSection z="28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/> - <ZSection z="28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/> - <ZSection z="116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/> - <ZSection z="116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/> - <ZSection z="118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/> - <ZSection z="118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/> - <ZSection z="245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/> - <ZSection z="245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/> - <ZSection z="281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/> + <ZSection z="-291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/> + <ZSection z="-119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/> + <ZSection z="-119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/> + <ZSection z="-29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/> + <ZSection z="-29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/> + <ZSection z="-28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/> + <ZSection z="-28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/> + <ZSection z="28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/> + <ZSection z="28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/> + <ZSection z="29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/> + <ZSection z="29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/> + <ZSection z="119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/> + <ZSection z="119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/> + <ZSection z="291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/> </Polycone> <!-- <Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg"> @@ -209,7 +190,7 @@ </Polycone> --> <Tubs name="PixelBarrelSuppTub" rMin="[SupportRin]" rMax="[Rout1]" dz="[SupportL]/2" startPhi="0*deg" deltaPhi="360*deg"/> - <Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.2*cm" dy="[SupportT]/2" dz="[SupportL]/2"/> + <Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.7*cm" dy="[SupportT]/2" dz="[SupportL]/2"/> <Box name="PixelBarrelSuppBox_cut" dx="[SupportW_cut]/2" dy="[SupportT]/2" dz="[SupportL_cut]/2"/> <SubtractionSolid name="PixelBarrelSuppBox_1"> <rSolid name="PixelBarrelSuppBox_full"/> @@ -291,10 +272,6 @@ <Tubs name="PixelBarrelConn1" rMin="[Conn1Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelConn2" rMin="[Conn2Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="PixelBarrelConnToST" rMin="[ConnToSTRin]" rMax="[ConnToSTRout]" dz="[ConnToSTT]/2" startPhi="0*deg" deltaPhi="360*deg"/> - <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="285*deg" deltaPhi="150*deg"/> - <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="285*deg" deltaPhi="150*deg"/> - <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="293*deg" deltaPhi="134*deg"/> - <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/> </SolidSection> <LogicalPartSection label="pixbar.xml"> <LogicalPart name="PixelBarrel" category="unspecified"> @@ -461,22 +438,6 @@ <rSolid name="PixelBarrelConnToST"/> <rMaterial name="pixbarmaterial:cable_endring_to_tube_Upgrade"/> </LogicalPart> - <LogicalPart name="PixelBarrelConn3" category="unspecified"> - <rSolid name="PixelBarrelConn3"/> - <rMaterial name="pixbarmaterial:SupplyTubeConn3"/> - </LogicalPart> - <LogicalPart name="PixelBarrelConn4" category="unspecified"> - <rSolid name="PixelBarrelConn4"/> - <rMaterial name="pixbarmaterial:SectorC"/> - </LogicalPart> - <LogicalPart name="PixelBarrelService" category="unspecified"> - <rSolid name="PixelBarrelService"/> - <rMaterial name="pixbarmaterial:SectorA"/> - </LogicalPart> - <LogicalPart name="PixelBarrelSupTubCables" category="unspecified"> - <rSolid name="PixelBarrelSupTubCables"/> - <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/> - </LogicalPart> </LogicalPartSection> <PosPartSection label="pixbar.xml"> <!-- --> @@ -822,83 +783,6 @@ <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXm"/> <Translation x="[zero]" y="[zero]" z="-[PixelBarrelPipe_FlangeToST_Z]"/> </PosPart> - <PosPart copyNumber="1"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn3"/> - <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/> - </PosPart> - <PosPart copyNumber="2"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn3"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/> - </PosPart> - <PosPart copyNumber="3"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn3"/> - <Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/> - </PosPart> - <PosPart copyNumber="4"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn3"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/> - </PosPart> - <PosPart copyNumber="1"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn4"/> - <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/> - </PosPart> - <PosPart copyNumber="2"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn4"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/> - </PosPart> - <PosPart copyNumber="3"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn4"/> - <Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/> - </PosPart> - <PosPart copyNumber="4"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelConn4"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/> - </PosPart> - <PosPart copyNumber="1"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelService"/> - <Translation x="[zero]" y="[zero]" z="[ServZ]"/> - </PosPart> - <PosPart copyNumber="2"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelService"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="[ServZ]"/> - </PosPart> - <PosPart copyNumber="3"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelService"/> - <Translation x="[zero]" y="[zero]" z="-[ServZ]"/> - </PosPart> - <PosPart copyNumber="4"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelService"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="-[ServZ]"/> - </PosPart> - <PosPart copyNumber="1"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelSupTubCables"/> - <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/> - </PosPart> - <PosPart copyNumber="2"> - <rParent name="pixbar:PixelBarrel"/> - <rChild name="pixbar:PixelBarrelSupTubCables"/> - <rRotation name="pixbar:180D"/> - <Translation x="[zero]" y="[zero]" z="-[ServCablZ]"/> - </PosPart> <PosPart copyNumber="1"> <rParent name="pixbar:PixelBarrel"/> <rChild name="pixbarlayer0:PixelBarrelLayer0"/> diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml index 9bd9becaea9e3..6f9d08221a4d7 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml @@ -3,35 +3,67 @@ <ConstantsSection label="pixfwd.xml" eval="true"> + <Constant name="zero" value="0.0*fm"/> <Constant name="RootRadius" value="[pixfwdCylinder:CylindersOuterRmax]"/> - <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2."/> + <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/> <Constant name="AnchorZ" value="0.*mm"/> <Constant name="ZPixelForward" value="291.*mm"/> - <Constant name="RootStartZ" value="-2*mm"/> + <Constant name="RootStartZ" value="-4*mm"/> <Constant name="RootMidZ1" value="[cms:TrackLumiZ1]-[ZPixelForward]"/> <Constant name="RootMidZ2" value="[cms:TrackLumiZ2]-[ZPixelForward]"/> <Constant name="RootMidZ3" value="[cms:TrackBeamZ1]-[ZPixelForward]"/> <Constant name="RootEndZ" value="2*[RootHalfLength]"/> + <Constant name="Zextension" value="273.11*mm"/> + <Constant name="ZextensionCables" value="203.5*mm"/> - <Constant name="Disk1Z" value="35.75*mm"/> - <Constant name="Disk2Z" value="[Disk1Z]+72.5*mm"/> - <Constant name="Disk3Z" value="[Disk2Z]+120*mm"/> + <Constant name="Disk1Z" value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm--> + <Constant name="Disk2Z" value="[Disk1Z]+75.0*mm"/> + <Constant name="Disk3Z" value="[Disk2Z]+95.0*mm"/> <Constant name="ZCylinder" value="[AnchorZ]"/> + <Constant name="Conn3Rout" value="19.0*cm"/> + <Constant name="Conn3Rin" value="18.0*cm"/> + <Constant name="Conn4Rin" value="18.0*cm"/> + <Constant name="Conn3T" value="51.0*cm"/> + <Constant name="Conn4T" value="120.00*cm"/> + <Constant name="ConnToSTZ" value="30.50*cm"/> + <Constant name="Conn3Z" value="54.62*cm-[ZPixelForward]"/> + <Constant name="Conn4Z" value="[Conn3Z]+([Conn3T]+[Conn4T])/2"/> + <Constant name="ServiceRout" value="21.0*cm"/> + <Constant name="ServiceRin" value="18.0*cm"/> + <Constant name="ServT" value="48.5*cm"/> + <Constant name="ServZ" value="[Conn4Z]+([Conn4T]+[ServT])/2"/> + <Constant name="ServCablT" value="32.2*cm"/> + <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/> + <Constant name="RinSupTubCab" value="18.00*cm"/> + </ConstantsSection> <SolidSection label="pixfwd.xml"> <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" > - <ZSection z="-0.40*cm" rMin="[cms:TrackBeamR1]" rMax="17.451*cm"/> - <ZSection z="99.00*cm" rMin="2.50*cm" rMax="17.451*cm"/> - <ZSection z="99.00*cm" rMin="2.50*cm" rMax="110.0*cm"/> - <ZSection z="102.80*cm" rMin="2.50*cm" rMax="110.0*cm"/> - <ZSection z="102.80*cm" rMin="9.99*cm" rMax="110.0*cm"/> - <ZSection z="214.24*cm" rMin="9.99*cm" rMax="110.0*cm"/> - <ZSection z="214.24*cm" rMin="22.19*cm" rMax="110.0*cm"/> - <ZSection z="245.30*cm" rMin="22.19*cm" rMax="110.0*cm"/> + <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/> + <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/> + <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/> + <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/> + <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/> + <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/> + <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ2]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ3]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/> + <ZSection z="[RootEndZ]+[ZextensionCables]" rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/> +</Polycone> + + <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <!-- <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/> <ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/> @@ -73,7 +105,6 @@ <RZPoint r="[cms:TrackBeamR1]" z="[RootStartZ]"/> --> - </Polycone> </SolidSection> <LogicalPartSection label="pixfwd.xml"> @@ -81,6 +112,22 @@ <rSolid name="PixelForward"/> <rMaterial name="materials:Air"/> </LogicalPart> + <LogicalPart name="PixelBarrelConn3" category="unspecified"> + <rSolid name="PixelBarrelConn3"/> + <rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelConn4" category="unspecified"> + <rSolid name="PixelBarrelConn4"/> + <rMaterial name="pixbarmaterial:SectorC_3Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelService" category="unspecified"> + <rSolid name="PixelBarrelService"/> + <rMaterial name="pixbarmaterial:SectorA_3Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelSupTubCables" category="unspecified"> + <rSolid name="PixelBarrelSupTubCables"/> + <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/> + </LogicalPart> </LogicalPartSection> @@ -121,6 +168,26 @@ <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/> <rRotation name="pixfwdCylinder:EndFlangeRot2"/> <!-- xt rRotation name="pixfwdCommon:Z180" / xt--> </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelConn3"/> + <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelConn4"/> + <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelService"/> + <Translation x="[zero]" y="[zero]" z="[ServZ]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelSupTubCables"/> + <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/> + </PosPart> <!-- xt PosPart copyNumber="1"> <rParent name="pixfwd:PixelForward"/> diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml index 6dfca79669eb1..e975780d303bc 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml @@ -16023,7 +16023,28 @@ </LogicalPart> </LogicalPartSection> <SolidSection label="tracker.xml"> +<!-- <Tubs name="Tracker" rMin="25*mm" rMax="1190*mm" dz="2910*mm" startPhi="0*deg" deltaPhi="360*deg"/> +--> + <Polycone name="Tracker" startPhi="0*deg" deltaPhi="360*deg"> + <ZSection z="-291.0*cm" rMin="7.4*cm" rMax="120.0*cm"/> + <ZSection z="-270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/> + <ZSection z="-270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/> + <ZSection z="-194.8*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="-180.0*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="-180.0*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/> + <ZSection z="-172.2*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/> + <ZSection z="-172.2*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="172.2*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="172.2*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/> + <ZSection z="180.0*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/> + <ZSection z="180.0*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="194.8*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/> + <ZSection z="270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/> + <ZSection z="270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/> + <ZSection z="291.0*cm" rMin="7.4*cm" rMax="120.0*cm"/> + </Polycone> + <Box name="BModule1Layer1" dx="48*mm" dy="23.13*mm" dz="1.4*mm"/> <Box name="BModule1Layer1INNERwafer" dx="48*mm" dy="23.13*mm" dz="0.1*mm"/> <Box name="BModule1Layer1OUTERwafer" dx="48*mm" dy="23.13*mm" dz="0.1*mm"/> @@ -17131,26 +17152,40 @@ <Tubs name="serviceR1179Z2415" rMin="1179.9*mm" rMax="1189.9*mm" dz="205.659*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="serviceR1179Z2765" rMin="1179.9*mm" rMax="1189.9*mm" dz="144.2*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR1190Z2910" rMin="1190*mm" rMax="1200*mm" dz="2910*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR214Z1160" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR214Z1160" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> --> +<Tubs name="supportR214Z1160" rMin="224.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR670Z1179" rMin="670.978*mm" rMax="1064.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR204Z1169" rMin="204.878*mm" rMax="214.878*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR1096Z1169" rMin="1096.08*mm" rMax="1106.08*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!-- <Tubs name="supportR204Z1169" rMin="204.878*mm" rMax="214.878*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> --> +<Tubs name="supportR204Z1169" rMin="203.578*mm" rMax="213.578*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR1096Z1169" rMin="1096.08*mm" rMax="1106.08*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> --> +<Tubs name="supportR1096Z1169" rMin="1096.98*mm" rMax="1106.98*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR1101Z1320" rMin="1101.05*mm" rMax="1111.05*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR235Z1320" rMin="235.459*mm" rMax="245.459*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR249Z285" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR375Z285" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR525Z285" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR702Z285" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR904Z285" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!-- <Tubs name="supportR249Z285" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> --> +<Tubs name="supportR249Z285" rMin="251.079*mm" rMax="341.446*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR375Z285" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR375Z285" rMin="376.371*mm" rMax="492.078*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR525Z285" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR525Z285" rMin="526.12*mm" rMax="669.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR702Z285" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR702Z285" rMin="703.511*mm" rMax="871.879*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR904Z285" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR904Z285" rMin="905.08*mm" rMax="1063.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR214Z1170" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR670Z1189" rMin="670.978*mm" rMax="1064.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR1101Z2621" rMin="1101.05*mm" rMax="1111.05*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/> <Tubs name="supportR235Z2621" rMin="235.459*mm" rMax="245.459*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR249Z295" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR375Z295" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR525Z295" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR702Z295" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -<Tubs name="supportR904Z295" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!-- <Tubs name="supportR249Z295" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> --> +<!--<Tubs name="supportR249Z295" rMin="251.079*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR249Z295" rMin="251.079*mm" rMax="341.446*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR375Z295" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR375Z295" rMin="376.371*mm" rMax="492.078*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR525Z295" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR525Z295" rMin="526.12*mm" rMax="669.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR702Z295" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR702Z295" rMin="703.511*mm" rMax="871.879*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> +<!--<Tubs name="supportR904Z295" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>--> +<Tubs name="supportR904Z295" rMin="905.08*mm" rMax="1063.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> </SolidSection> <PosPartSection label="tracker.xml"> <PosPart copyNumber="1"> @@ -22606,224 +22641,226 @@ <Translation x="0*mm" y="0*mm" z="2325*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR214Z1150"/> <Translation x="0*mm" y="0*mm" z="1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR214Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR342Z1150"/> <Translation x="0*mm" y="0*mm" z="1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR342Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR492Z1150"/> <Translation x="0*mm" y="0*mm" z="1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR492Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR670Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.54*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR872Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.54*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1064Z1169"/> -<Translation x="0*mm" y="0*mm" z="1174.54*mm"/> +<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR214Z-1169"/> <Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR214Z-1179"/> -<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR342Z-1169"/> -<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> +<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR342Z-1179"/> -<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR492Z-1169"/> -<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> +<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR492Z-1179"/> -<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/> +<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR670Z-1179"/> <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR872Z-1179"/> <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1064Z-1179"/> <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z1250"/> -<Translation x="0*mm" y="0*mm" z="1250.29*mm"/> +<Translation x="0*mm" y="0*mm" z="1250.29*mm"/> <!-- 1250.29--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z1444"/> -<Translation x="0*mm" y="0*mm" z="1445*mm"/> +<Translation x="0*mm" y="0*mm" z="1445.0*mm"/> <!-- 1445.0*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z1715"/> -<Translation x="0*mm" y="0*mm" z="1715.8*mm"/> +<Translation x="0*mm" y="0*mm" z="1715.8*mm"/> <!-- 1715.8*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z2036"/> -<Translation x="0*mm" y="0*mm" z="2036.36*mm"/> +<Translation x="0*mm" y="0*mm" z="2036.36*mm"/> <!-- 2036.36*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z2415"/> -<Translation x="0*mm" y="0*mm" z="2415.84*mm"/> +<Translation x="0*mm" y="0*mm" z="2415.84*mm"/> <!-- 2415.84*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:serviceR1179Z2765"/> -<Translation x="0*mm" y="0*mm" z="2765.8*mm"/> +<Translation x="0*mm" y="0*mm" z="2765.3*mm"/> <!-- 2765.8*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR1190Z2910"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR214Z1160"/> -<Translation x="0*mm" y="0*mm" z="1165.2*mm"/> +<Translation x="0*mm" y="0*mm" z="1184.64*mm"/> <!-- 1165.2*mm--> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR670Z1179"/> <Translation x="0*mm" y="0*mm" z="1184.64*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR204Z1169"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR1096Z1169"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixfwd:PixelForward"/> <rChild name="tracker:supportR1101Z1320"/> -<Translation x="0*mm" y="0*mm" z="1971.22*mm"/> +<Translation x="0*mm" y="0*mm" z="1680.22*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixfwd:PixelForward"/> <rChild name="tracker:supportR235Z1320"/> -<Translation x="0*mm" y="0*mm" z="1971.22*mm"/> +<Translation x="0*mm" y="0*mm" z="1680.22*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR249Z285"/> <Translation x="0*mm" y="0*mm" z="290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR375Z285"/> <Translation x="0*mm" y="0*mm" z="290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR525Z285"/> <Translation x="0*mm" y="0*mm" z="290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR702Z285"/> <Translation x="0*mm" y="0*mm" z="290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR904Z285"/> <Translation x="0*mm" y="0*mm" z="290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR214Z1170"/> -<Translation x="0*mm" y="0*mm" z="-1165.2*mm"/> +<Translation x="0*mm" y="0*mm" z="-1184.64*mm"/> <!-- 1165.2*mm --> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR670Z1189"/> <Translation x="0*mm" y="0*mm" z="-1184.64*mm"/> </PosPart> +<!-- <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixfwd:PixelForward"/> <rChild name="tracker:supportR1101Z2621"/> <Translation x="0*mm" y="0*mm" z="-1971.22*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixfwd:PixelForward"/> <rChild name="tracker:supportR235Z2621"/> <Translation x="0*mm" y="0*mm" z="-1971.22*mm"/> </PosPart> +--> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR249Z295"/> <Translation x="0*mm" y="0*mm" z="-290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR375Z295"/> <Translation x="0*mm" y="0*mm" z="-290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR525Z295"/> <Translation x="0*mm" y="0*mm" z="-290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR702Z295"/> <Translation x="0*mm" y="0*mm" z="-290*mm"/> </PosPart> <PosPart copyNumber="1"> -<rParent name="tracker:Tracker"/> +<rParent name="pixbar:PixelBarrel"/> <rChild name="tracker:supportR904Z295"/> <Translation x="0*mm" y="0*mm" z="-290*mm"/> </PosPart> diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml index f1c706771a0b3..8e86e4c1e2b02 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml @@ -3,6 +3,7 @@ <ConstantsSection label="pixfwd.xml" eval="true"> + <Constant name="zero" value="0.0*fm"/> <Constant name="RootRadius" value="[pixfwdCylinder:CylindersOuterRmax]"/> <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/> @@ -14,10 +15,11 @@ <Constant name="RootMidZ3" value="[cms:TrackBeamZ1]-[ZPixelForward]"/> <Constant name="RootEndZ" value="2*[RootHalfLength]"/> <Constant name="Zextension" value="273.11*mm"/> + <Constant name="ZextensionCables" value="203.5*mm"/> <Constant name="Disk1Z" value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm--> - <Constant name="Disk2Z" value="[Disk1Z]+89.0*mm"/> - <Constant name="Disk3Z" value="[Disk2Z]+113.0*mm"/> + <Constant name="Disk2Z" value="[Disk1Z]+75.0*mm"/> + <Constant name="Disk3Z" value="[Disk2Z]+95.0*mm"/> <Constant name="Disk4Z" value="[Disk3Z]+147.0*mm"/> <Constant name="Disk5Z" value="[Disk4Z]+188.0*mm"/> <Constant name="Disk6Z" value="[Disk5Z]+242.0*mm"/> @@ -30,20 +32,47 @@ <Constant name="Disk12Z" value="[Disk11Z]+477.0*mm"/> --> <Constant name="ZCylinder" value="[AnchorZ]"/> + + <Constant name="Conn3Rout" value="19.0*cm"/> + <Constant name="Conn3Rin" value="18.0*cm"/> + <Constant name="Conn4Rin" value="18.0*cm"/> + <Constant name="Conn3T" value="51.0*cm"/> + <Constant name="Conn4T" value="120.00*cm"/> + <Constant name="ConnToSTZ" value="30.50*cm"/> + <Constant name="Conn3Z" value="54.62*cm-[ZPixelForward]"/> + <Constant name="Conn4Z" value="[Conn3Z]+([Conn3T]+[Conn4T])/2"/> + <Constant name="ServiceRout" value="21.0*cm"/> + <Constant name="ServiceRin" value="18.0*cm"/> + <Constant name="ServT" value="48.5*cm"/> + <Constant name="ServZ" value="[Conn4Z]+([Conn4T]+[ServT])/2"/> + <Constant name="ServCablT" value="32.2*cm"/> + <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/> + <Constant name="RinSupTubCab" value="18.00*cm"/> </ConstantsSection> <SolidSection label="pixfwd.xml"> <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" > - <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/> - <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/> - <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/> - <ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/> - <ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/> - <ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/> - <ZSection z="[RootMidZ2]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/> - <ZSection z="[RootMidZ3]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/> - <ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="110.0*cm"/> + <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/> + <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/> + <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/> + <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/> + <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/> + <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/> + <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ2]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootMidZ3]" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/> + <ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/> + <ZSection z="[RootEndZ]+[ZextensionCables]" rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/> </Polycone> + + <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/> + <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/> + </SolidSection> <!-- @@ -64,6 +93,23 @@ <rSolid name="PixelForward"/> <rMaterial name="materials:Air"/> </LogicalPart> + <LogicalPart name="PixelBarrelConn3" category="unspecified"> + <rSolid name="PixelBarrelConn3"/> + <rMaterial name="pixbarmaterial:SupplyTubeConn3_10Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelConn4" category="unspecified"> + <rSolid name="PixelBarrelConn4"/> + <rMaterial name="pixbarmaterial:SectorC_10Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelService" category="unspecified"> + <rSolid name="PixelBarrelService"/> + <rMaterial name="pixbarmaterial:SectorA_10Disks"/> + </LogicalPart> + <LogicalPart name="PixelBarrelSupTubCables" category="unspecified"> + <rSolid name="PixelBarrelSupTubCables"/> + <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_10Disks"/> + </LogicalPart> + </LogicalPartSection> @@ -150,6 +196,26 @@ <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/> <rRotation name="pixfwdCylinder:EndFlangeRot2"/> <!-- xt rRotation name="pixfwdCommon:Z180" / xt--> </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelConn3"/> + <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelConn4"/> + <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelService"/> + <Translation x="[zero]" y="[zero]" z="[ServZ]"/> + </PosPart> + <PosPart copyNumber="1"> + <rParent name="pixfwd:PixelForward"/> + <rChild name="pixfwd:PixelBarrelSupTubCables"/> + <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/> + </PosPart> <!-- xt PosPart copyNumber="1"> <rParent name="pixfwd:PixelForward"/> diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml index ae32be20391b2..15609f535a7aa 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml @@ -5,7 +5,7 @@ <Constant name="DiskRmin1to7" value="37.5*mm"/> <Constant name="DiskRmin8to10" value="86.7*mm"/> <Constant name="DiskRmax" value="166.0*mm"/><!-- 166.00*mm--> - <Constant name="DiskHalfWidth" value="39.75*mm"/> <!-- 35.75*mm--> + <Constant name="DiskHalfWidth" value="37.5*mm"/> <!-- 35.75*mm--> </ConstantsSection> <SolidSection label="pixfwdDisks.xml"> diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml index 020290a4eef07..141c7c5112752 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml index a31d5171c5962..feedde6fb6355 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml index 2aa822da5e38d..e6654a4ec9f40 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml index cb0762d302a0c..5a22a42f3448d 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml index 6866ede9344ef..c0b2874840179 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml index f1582e11ec3c9..d4b1d788a7fa1 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml index 565a7c8fea4e8..a7cea1490d990 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="22"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="12*deg"/> - <Numeric name="BladeCommonZ" value="-18.7*mm"/> + <Numeric name="BladeCommonZ" value="-16.45*mm"/> <!-- -18.7*mm--> <Vector name="BladeZShift" type="numeric" nEntries="22"> 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, 11.62*mm, 7.12*mm, 2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml index 963571e33fead..aa1a3224a10d7 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml index 22483765f973a..a754171fdd583 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml index 7a4d66484a6fe..11a7049047648 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml index 3873949ee54e9..a83bc73637555 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml @@ -95,7 +95,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml index 3dbc86ae0962b..f7a3b09ec754b 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml index 76ecac7329f83..3177a903b5bb0 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml index 4c7bbd5ccae83..83f024ee671db 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml index e1001237c1a34..9b713ec72b4fe 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml index c4f221ab13f66..1bdd96b4b2fc5 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml index 1c484c922259d..b7e1789947e73 100644 --- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml +++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml @@ -94,7 +94,7 @@ <Numeric name="NumberOfBlades" value="34"/> <Numeric name="BladeAngle" value="20*deg"/> <Numeric name="BladeTilt" value="0*deg"/> - <Numeric name="BladeCommonZ" value="-3.75*mm"/> + <Numeric name="BladeCommonZ" value="-1.5*mm"/> <!-- -3.75*mm--> <Vector name="BladeZShift" type="numeric" nEntries="34"> -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm, -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,