Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx294 Update the longitudinal structure for the V16 (D86) geometry of HGCal #35945

Merged
merged 4 commits into from
Nov 4, 2021
Merged

Phase2-hgx294 Update the longitudinal structure for the V16 (D86) geometry of HGCal #35945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59bf667
Update the longitudinal structure for the V16 (D86) geometry of HGCal
Nov 1, 2021
511b9a1
Interchange air SS layer for FH
Nov 2, 2021
75b99c5
Change copper cover to ss cover
Nov 3, 2021
e28b479
Change copper cover to ss cover
Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferF-algorithm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcalwafer.xml"/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwaferP-algorithm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v16/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v16p/hgcalwafer.xml"/>
Expand Down
8 changes: 4 additions & 4 deletions Geometry/HGCalCommonData/data/hgcal/v16/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferThickness" value="0.31*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="MouseBite" value="5.00*mm"/>
<Constant name="ModuleThicknessEE" value="9.10*mm"/>
<Constant name="ModuleThicknessHE" value="8.60*mm"/>
<Constant name="ModuleThicknessEE" value="9.325*mm"/>
<Constant name="ModuleThicknessHE" value="8.70*mm"/>
<Constant name="CellThicknessFine" value="0.12*mm"/>
<Constant name="CellThicknessCoarse1" value="0.20*mm"/>
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
<Constant name="ScintillatorThickness" value="3.88*mm"/>
<Constant name="ScintillatorThickness" value="3.0*mm"/>
<Constant name="NumberOfCellsFine" value="12"/>
<Constant name="NumberOfCellsCoarse" value="8"/>
<Constant name="NPhiBinBH" value="288"/>
Expand Down
78 changes: 39 additions & 39 deletions Geometry/HGCalCommonData/data/hgcalEE/v16/hgcalEE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,53 +183,53 @@
hgcalwafer:HGCalEEWafer1Coarse2bm0, hgcalwafer:HGCalEEWafer1Coarse2bm1,
hgcalwafer:HGCalEEWafer1Coarse2bm2, hgcalwafer:HGCalEEWafer1Coarse2bm3,
hgcalwafer:HGCalEEWafer1Coarse2bm4, hgcalwafer:HGCalEEWafer1Coarse2bm5</Vector>
<Vector name="MaterialNames" type="string" nEntries="11">
materials:Air, materials:Copper, materials:StainlessSteel,
materials:Epoxy, materials:Lead, materials:Lead, materials:Lead,
materials:Copper, materials:Copper, materials:Air, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="11">
HGCalEEHardPointGap, HGCalEEAbsorberCopper, HGCalEEAbsorberStainlessSteel,
<Vector name="MaterialNames" type="string" nEntries="10">
materials:Copper, materials:StainlessSteel, materials:Epoxy,
materials:Lead, materials:Lead, materials:Lead, materials:Copper,
materials:StainlessSteel, materials:Air, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="10">
HGCalEEAbsorberCopper, HGCalEEAbsorberStainlessSteel,
HGCalEEAbsorberEpoxy, HGCalEEAbsorberLead1, HGCalEEAbsorberLead2,
HGCalEEAbsorberLead3, HGCalEECoolingPlate, HGCalEECopperCover,
HGCalEEAbsorberLead3, HGCalEECoolingPlate, HGCalEEStainlessSteelCover,
HGCalEELayerF, HGCalEELayerB</Vector>
<Vector name="Thickness" type="numeric" nEntries="11">
0.1*mm, 0.1*mm, 0.3*mm, 0.1*mm, 2.77*mm, 4.97*mm, 8.22*mm,
6.2*mm, 1.0*mm, [hgcal:ModuleThicknessEE], [hgcal:ModuleThicknessEE]
<Vector name="Thickness" type="numeric" nEntries="10">
0.1*mm, 0.3*mm, 0.05*mm, 2.77*mm, 4.97*mm, 8.22*mm,
6.05*mm, 1.0*mm, [hgcal:ModuleThicknessEE], [hgcal:ModuleThicknessEE]
</Vector>
<Vector name="Layers" type="numeric" nEntries="13">
12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13</Vector>
10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11</Vector>
<Vector name="LayerThick" type="numeric" nEntries="13">
28.37*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm, 30.57*mm,
30.57*mm, 30.57*mm, 33.82*mm, 33.82*mm, 33.82*mm, 34.82*mm </Vector>
<Vector name="LayerType" type="numeric" nEntries="157">
0, 1, 2, 3, 4, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 5, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0,
0, 1, 2, 3, 6, 3, 2, 1, 9, 7, 10, 0, 8
<Vector name="LayerType" type="numeric" nEntries="131">
0, 1, 2, 3, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 4, 2, 1, 0, 8, 6, 9,
0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
0, 1, 2, 5, 2, 1, 0, 8, 6, 9,
0, 1, 2, 5, 2, 1, 0, 8, 6, 9, 7
</Vector>
<Vector name="LayerSense" type="numeric" nEntries="157">
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,
0,-2,-2,-2,-2,-2,-2, 0, 1, 0, 2, 0,-2
<Vector name="LayerSense" type="numeric" nEntries="131">
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,
-2,-2,-2,-2,-2,-2, 0, 1, 0, 2,-2
</Vector>
<Vector name="LayerCenter" type="numeric" nEntries="26">
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
Expand Down
25 changes: 13 additions & 12 deletions Geometry/HGCalCommonData/data/hgcalHEmix/v16/hgcalHEmix.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap1, HGCalHECopperCover,
HGCalHESiliconLayer, HGCalHECoolingPlate</Vector>
<Vector name="Thickness" type="numeric" nEntries="6">
41.5*mm, 60.7*mm, 3.7*mm, 2.6*mm, [hgcal:ModuleThicknessHE], 6.65*mm
41.5*mm, 60.7*mm, 4.0*mm, 2.5*mm, [hgcal:ModuleThicknessHE], 6.35*mm
</Vector>
<Vector name="Layers" type="numeric" nEntries="14">
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5</Vector>
Expand All @@ -144,19 +144,20 @@
-1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
-1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
-1, 0, -1, 1, -2, -1, 0, -1, 1, -2</Vector>
<Vector name="TopMaterialNames" type="string" nEntries="6">
materials:Air, materials:Cables, materials:Air,
materials:H_Scintillator, materials:Epoxy,
<Vector name="TopMaterialNames" type="string" nEntries="7">
materials:Air, hgcalMaterial:HGC_Cables, hgcalMaterial:HGC_G10-FR4,
materials:Polystyrene, materials:H_Scintillator, materials:Polystyrene,
hgcalMaterial:HGC_G10-FR4</Vector>
<Vector name="TopVolumeNames" type="string" nEntries="6">
HGCalAirGap1, HGCalCableConnector, HGCalAirGap2,
HGCalHEScintillatorSensitive, HGCalScintillatorEpoxy,
<Vector name="TopVolumeNames" type="string" nEntries="7">
HGCalHEScintillatorAirGap, HGCalCableConnector,
HGCalHEScintillatorProtection, HGCalScintillatorFronyReflector,
HGCalHEScintillatorSensitive, HGCalScintillatorBackReflector,
HGCalTileBoard</Vector>
<Vector name="TopLayerThickness" type="numeric" nEntries="6">
0.87*mm, 1.04*mm, 1.245*mm, [hgcal:ScintillatorThickness], 0.075*mm,
1.49*mm</Vector> <!-- scintillator module -->
<Vector name="TopLayerType" type="numeric" nEntries="6">
0, 1, 2, 3, 4, 5</Vector>
<Vector name="TopLayerThickness" type="numeric" nEntries="7">
0.40*mm, 3.00*mm, 0.20*mm, 0.25*mm, [hgcal:ScintillatorThickness],
0.25*mm, 1.60*mm</Vector> <!-- scintillator module -->
<Vector name="TopLayerType" type="numeric" nEntries="7">
0, 1, 2, 3, 4, 5, 6</Vector>
<Vector name="LayerTypes" type="numeric" nEntries="14">
2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3
</Vector>
Expand Down
6 changes: 3 additions & 3 deletions Geometry/HGCalCommonData/data/hgcalHEsil/v16/hgcalHEsil.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,23 @@
HGCalHEAbsorber1, HGCalHEAbsorber2, HGCalHEAirGap0, HGCalHEAirGap1,
HGCalHECopperCover, HGCalHECoolingPlate, HGCalHESiliconLayer</Vector>
<Vector name="Thickness" type="numeric" nEntries="7">
45.0*mm, 41.5*mm, 1.25*mm, 3.7*mm, 2.6*mm, 6.65*mm,
45.0*mm, 41.5*mm, 1.25*mm, 4.00*mm, 2.50*mm, 6.35*mm,
[hgcal:ModuleThicknessHE] </Vector>
<Vector name="Layers" type="numeric" nEntries="7">
6, 5, 5, 5, 5, 5, 5</Vector>
<Vector name="LayerThick" type="numeric" nEntries="7">
67.80*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm, 63.05*mm
</Vector>
<Vector name="LayerType" type="numeric" nEntries="36">
0, 2, 3, 4, 6, 5,
2, 0, 3, 4, 6, 5,
1, 3, 4, 6, 5,
1, 3, 4, 6, 5,
1, 3, 4, 6, 5,
1, 3, 4, 6, 5,
1, 3, 4, 6, 5,
1, 3, 4, 6, 5 </Vector>
<Vector name="LayerSense" type="numeric" nEntries="36">
-1, 0, 0, -2, 1, -2,
0, -1, 0, -2, 1, -2,
-1, 0, -2, 1, -2,
-1, 0, -2, 1, -2,
-1, 0, -2, 1, -2,
Expand Down
17 changes: 16 additions & 1 deletion Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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">
<DDDefinition>

<MaterialSection label="hgcalMaterial.xml">
<CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
Expand Down Expand Up @@ -64,6 +64,21 @@
<rMaterial name="materials:Lead"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_EEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="materials:Air"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_HEConnector" density="1.214*mg/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="materials:Air"/>
</MaterialFraction>
</CompositeMaterial>
<CompositeMaterial name="HGC_Cables" density="2.68*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="1.0">
<rMaterial name="materials:Cables"/>
</MaterialFraction>
</CompositeMaterial>
</MaterialSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/hgcalcell/v16/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferThickness" value="0.31*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/hgcalwafer/v15f/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
<Constant name="NumberOfCellsFine" value="12"/>
<Constant name="NumberOfCellsCoarse" value="8"/>
<Constant name="LayerRotation" value="0*deg"/>
<Constant name="radMixL0" value="1537.05*mm"/>
<Constant name="radMixL1" value="1537.05*mm"/>
<Constant name="radMixL2" value="1537.05*mm"/>
Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
<Constant name="NumberOfCellsFine" value="12"/>
<Constant name="NumberOfCellsCoarse" value="8"/>
<Constant name="LayerRotation" value="0*deg"/>
</ConstantsSection>

</DDDefinition>
7 changes: 4 additions & 3 deletions Geometry/HGCalCommonData/data/hgcalwafer/v16/hgcal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferThickness" value="0.31*mm"/>
<Constant name="WaferThickness" value="0.30*mm"/>
<Constant name="WaferThicknessFine" value="0.30*mm"/>
<Constant name="WaferThicknessCoarse1" value="0.20*mm"/>
<Constant name="WaferThicknessCoarse2" value="0.30*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="ModuleThicknessEE" value="9.10*mm"/>
<Constant name="ModuleThicknessHE" value="8.60*mm"/>
<Constant name="ModuleThicknessEE" value="9.325*mm"/>
<Constant name="ModuleThicknessHE" value="8.70*mm"/>
<Constant name="CellThicknessFine" value="0.12*mm"/>
<Constant name="CellThicknessCoarse1" value="0.20*mm"/>
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
<Constant name="NumberOfCellsFine" value="12"/>
<Constant name="NumberOfCellsCoarse" value="8"/>
<Constant name="LayerRotation" value="30*deg"/>
</ConstantsSection>

</DDDefinition>
Loading