Skip to content

Commit

Permalink
Merge pull request #45692 from bsunanda/Phase2-hgx359L
Browse files Browse the repository at this point in the history 
Phase2-hgx359L Equip the correct wafer and passive module names for the V19 version of HGCal Geometry
  • Loading branch information
@cmsbuild
cmsbuild committed Aug 14, 2024
2 parents a961243 + 49d4c52 commit 8793052
Show file tree
Hide file tree
Showing 12 changed files with 611 additions and 251 deletions.
18 changes: 18 additions & 0 deletions Geometry/HGCalCommonData/data/dd4hep/testHGCalWaferV18.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<DDDefinition>
<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v18/hgcalpos.xml"/>
</IncludeSection>

</DDDefinition>

18 changes: 18 additions & 0 deletions Geometry/HGCalCommonData/data/dd4hep/testHGCalWaferV19.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<DDDefinition>
<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v3/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v19/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v19/hgcalpos.xml"/>
</IncludeSection>

</DDDefinition>

280 changes: 158 additions & 122 deletions Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml
View file

Large diffs are not rendered by default.

142 changes: 80 additions & 62 deletions Geometry/HGCalCommonData/data/hgcalHEmix/v19/hgcalHEmix.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,68 +37,86 @@
<Vector name="RMaxFront" type="numeric" nEntries="4">
[hgcal:rMaxHGCal1], [hgcal:rMaxHGCal5], [hgcal:rMaxHGCal10],
[hgcal:rMaxHGCal11]</Vector>
, <Vector name="WaferNamesFull" type="string" nEntries="18">
hgcalwafer:HGCalHEWafer06Fine, hgcalwafer:HGCalHEWafer07Fine,
hgcalwafer:HGCalHEWafer08Fine, hgcalwafer:HGCalHEWafer09Fine,
hgcalwafer:HGCalHEWafer10Fine, hgcalwafer:HGCalHEWafer11Fine,
hgcalwafer:HGCalHEWafer06Coarse1, hgcalwafer:HGCalHEWafer07Coarse1,
hgcalwafer:HGCalHEWafer08Coarse1, hgcalwafer:HGCalHEWafer09Coarse1,
hgcalwafer:HGCalHEWafer10Coarse1, hgcalwafer:HGCalHEWafer11Coarse1,
hgcalwafer:HGCalHEWafer06Coarse2, hgcalwafer:HGCalHEWafer07Coarse2,
hgcalwafer:HGCalHEWafer08Coarse2, hgcalwafer:HGCalHEWafer09Coarse2,
hgcalwafer:HGCalHEWafer10Coarse2, hgcalwafer:HGCalHEWafer11Coarse2</Vector>
<Vector name="WaferNamesPartial" type="string" nEntries="102">
hgcalwafer:HGCalHEWafer06FineHD1, hgcalwafer:HGCalHEWafer07FineHD1,
hgcalwafer:HGCalHEWafer08FineHD1, hgcalwafer:HGCalHEWafer09FineHD1,
hgcalwafer:HGCalHEWafer10FineHD1, hgcalwafer:HGCalHEWafer11FineHD1,
hgcalwafer:HGCalHEWafer06FineHD2, hgcalwafer:HGCalHEWafer07FineHD2,
hgcalwafer:HGCalHEWafer08FineHD2, hgcalwafer:HGCalHEWafer09FineHD2,
hgcalwafer:HGCalHEWafer10FineHD2, hgcalwafer:HGCalHEWafer11FineHD2,
hgcalwafer:HGCalHEWafer06FineHD3, hgcalwafer:HGCalHEWafer07FineHD3,
hgcalwafer:HGCalHEWafer08FineHD3, hgcalwafer:HGCalHEWafer09FineHD3,
hgcalwafer:HGCalHEWafer10FineHD3, hgcalwafer:HGCalHEWafer11FineHD3,
hgcalwafer:HGCalHEWafer06FineHD4, hgcalwafer:HGCalHEWafer07FineHD4,
hgcalwafer:HGCalHEWafer08FineHD4, hgcalwafer:HGCalHEWafer09FineHD4,
hgcalwafer:HGCalHEWafer10FineHD4, hgcalwafer:HGCalHEWafer11FineHD4,
hgcalwafer:HGCalHEWafer06FineHD5, hgcalwafer:HGCalHEWafer07FineHD5,
hgcalwafer:HGCalHEWafer08FineHD5, hgcalwafer:HGCalHEWafer09FineHD5,
hgcalwafer:HGCalHEWafer10FineHD5, hgcalwafer:HGCalHEWafer11FineHD5,
hgcalwafer:HGCalHEWafer06Coarse1LD1, hgcalwafer:HGCalHEWafer07Coarse1LD1,
hgcalwafer:HGCalHEWafer08Coarse1LD1, hgcalwafer:HGCalHEWafer09Coarse1LD1,
hgcalwafer:HGCalHEWafer10Coarse1LD1, hgcalwafer:HGCalHEWafer11Coarse1LD1,
hgcalwafer:HGCalHEWafer06Coarse1LD2, hgcalwafer:HGCalHEWafer07Coarse1LD2,
hgcalwafer:HGCalHEWafer08Coarse1LD2, hgcalwafer:HGCalHEWafer09Coarse1LD2,
hgcalwafer:HGCalHEWafer10Coarse1LD2, hgcalwafer:HGCalHEWafer11Coarse1LD2,
hgcalwafer:HGCalHEWafer06Coarse1LD3, hgcalwafer:HGCalHEWafer07Coarse1LD3,
hgcalwafer:HGCalHEWafer08Coarse1LD3, hgcalwafer:HGCalHEWafer09Coarse1LD3,
hgcalwafer:HGCalHEWafer10Coarse1LD3, hgcalwafer:HGCalHEWafer11Coarse1LD3,
hgcalwafer:HGCalHEWafer06Coarse1LD4, hgcalwafer:HGCalHEWafer07Coarse1LD4,
hgcalwafer:HGCalHEWafer08Coarse1LD4, hgcalwafer:HGCalHEWafer09Coarse1LD4,
hgcalwafer:HGCalHEWafer10Coarse1LD4, hgcalwafer:HGCalHEWafer11Coarse1LD4,
hgcalwafer:HGCalHEWafer06Coarse1LD5, hgcalwafer:HGCalHEWafer07Coarse1LD5,
hgcalwafer:HGCalHEWafer08Coarse1LD5, hgcalwafer:HGCalHEWafer09Coarse1LD5,
hgcalwafer:HGCalHEWafer10Coarse1LD5, hgcalwafer:HGCalHEWafer11Coarse1LD5,
hgcalwafer:HGCalHEWafer06Coarse1LD6, hgcalwafer:HGCalHEWafer07Coarse1LD6,
hgcalwafer:HGCalHEWafer08Coarse1LD6, hgcalwafer:HGCalHEWafer09Coarse1LD6,
hgcalwafer:HGCalHEWafer10Coarse1LD6, hgcalwafer:HGCalHEWafer11Coarse1LD6,
hgcalwafer:HGCalHEWafer06Coarse2LD1, hgcalwafer:HGCalHEWafer07Coarse2LD1,
hgcalwafer:HGCalHEWafer08Coarse2LD1, hgcalwafer:HGCalHEWafer09Coarse2LD1,
hgcalwafer:HGCalHEWafer10Coarse2LD1, hgcalwafer:HGCalHEWafer11Coarse2LD1,
hgcalwafer:HGCalHEWafer06Coarse2LD2, hgcalwafer:HGCalHEWafer07Coarse2LD2,
hgcalwafer:HGCalHEWafer08Coarse2LD2, hgcalwafer:HGCalHEWafer09Coarse2LD2,
hgcalwafer:HGCalHEWafer10Coarse2LD2, hgcalwafer:HGCalHEWafer11Coarse2LD2,
hgcalwafer:HGCalHEWafer06Coarse2LD3, hgcalwafer:HGCalHEWafer07Coarse2LD3,
hgcalwafer:HGCalHEWafer08Coarse2LD3, hgcalwafer:HGCalHEWafer09Coarse2LD3,
hgcalwafer:HGCalHEWafer10Coarse2LD3, hgcalwafer:HGCalHEWafer11Coarse2LD3,
hgcalwafer:HGCalHEWafer06Coarse2LD4, hgcalwafer:HGCalHEWafer07Coarse2LD4,
hgcalwafer:HGCalHEWafer08Coarse2LD4, hgcalwafer:HGCalHEWafer09Coarse2LD4,
hgcalwafer:HGCalHEWafer10Coarse2LD4, hgcalwafer:HGCalHEWafer11Coarse2LD4,
hgcalwafer:HGCalHEWafer06Coarse2LD5, hgcalwafer:HGCalHEWafer07Coarse2LD5,
hgcalwafer:HGCalHEWafer08Coarse2LD5, hgcalwafer:HGCalHEWafer09Coarse2LD5,
hgcalwafer:HGCalHEWafer10Coarse2LD5, hgcalwafer:HGCalHEWafer11Coarse2LD5,
hgcalwafer:HGCalHEWafer06Coarse2LD6, hgcalwafer:HGCalHEWafer07Coarse2LD6,
hgcalwafer:HGCalHEWafer08Coarse2LD6, hgcalwafer:HGCalHEWafer09Coarse2LD6,
hgcalwafer:HGCalHEWafer10Coarse2LD6, hgcalwafer:HGCalHEWafer11Coarse2LD6</Vector>
, <Vector name="WaferNamesFull" type="string" nEntries="24">
hgcalwafer:HGCalHEWafer06HD120, hgcalwafer:HGCalHEWafer07HD120,
hgcalwafer:HGCalHEWafer08HD120, hgcalwafer:HGCalHEWafer09HD120,
hgcalwafer:HGCalHEWafer10HD120, hgcalwafer:HGCalHEWafer11HD120,
hgcalwafer:HGCalHEWafer06LD200, hgcalwafer:HGCalHEWafer07LD200,
hgcalwafer:HGCalHEWafer08LD200, hgcalwafer:HGCalHEWafer09LD200,
hgcalwafer:HGCalHEWafer10LD200, hgcalwafer:HGCalHEWafer11LD200,
hgcalwafer:HGCalHEWafer06LD300, hgcalwafer:HGCalHEWafer07LD300,
hgcalwafer:HGCalHEWafer08LD300, hgcalwafer:HGCalHEWafer09LD300,
hgcalwafer:HGCalHEWafer10LD300, hgcalwafer:HGCalHEWafer11LD300,
hgcalwafer:HGCalHEWafer06HD200, hgcalwafer:HGCalHEWafer07HD200,
hgcalwafer:HGCalHEWafer08HD200, hgcalwafer:HGCalHEWafer09HD200,
hgcalwafer:HGCalHEWafer10HD200, hgcalwafer:HGCalHEWafer11HD200</Vector>
<Vector name="WaferNamesPartial" type="string" nEntries="132">
hgcalwafer:HGCalHEWafer06HD120HD1, hgcalwafer:HGCalHEWafer07HD120HD1,
hgcalwafer:HGCalHEWafer08HD120HD1, hgcalwafer:HGCalHEWafer09HD120HD1,
hgcalwafer:HGCalHEWafer10HD120HD1, hgcalwafer:HGCalHEWafer11HD120HD1,
hgcalwafer:HGCalHEWafer06HD120HD2, hgcalwafer:HGCalHEWafer07HD120HD2,
hgcalwafer:HGCalHEWafer08HD120HD2, hgcalwafer:HGCalHEWafer09HD120HD2,
hgcalwafer:HGCalHEWafer10HD120HD2, hgcalwafer:HGCalHEWafer11HD120HD2,
hgcalwafer:HGCalHEWafer06HD120HD3, hgcalwafer:HGCalHEWafer07HD120HD3,
hgcalwafer:HGCalHEWafer08HD120HD3, hgcalwafer:HGCalHEWafer09HD120HD3,
hgcalwafer:HGCalHEWafer10HD120HD3, hgcalwafer:HGCalHEWafer11HD120HD3,
hgcalwafer:HGCalHEWafer06HD120HD4, hgcalwafer:HGCalHEWafer07HD120HD4,
hgcalwafer:HGCalHEWafer08HD120HD4, hgcalwafer:HGCalHEWafer09HD120HD4,
hgcalwafer:HGCalHEWafer10HD120HD4, hgcalwafer:HGCalHEWafer11HD120HD4,
hgcalwafer:HGCalHEWafer06HD120HD5, hgcalwafer:HGCalHEWafer07HD120HD5,
hgcalwafer:HGCalHEWafer08HD120HD5, hgcalwafer:HGCalHEWafer09HD120HD5,
hgcalwafer:HGCalHEWafer10HD120HD5, hgcalwafer:HGCalHEWafer11HD120HD5,
hgcalwafer:HGCalHEWafer06LD200LD1, hgcalwafer:HGCalHEWafer07LD200LD1,
hgcalwafer:HGCalHEWafer08LD200LD1, hgcalwafer:HGCalHEWafer09LD200LD1,
hgcalwafer:HGCalHEWafer10LD200LD1, hgcalwafer:HGCalHEWafer11LD200LD1,
hgcalwafer:HGCalHEWafer06LD200LD2, hgcalwafer:HGCalHEWafer07LD200LD2,
hgcalwafer:HGCalHEWafer08LD200LD2, hgcalwafer:HGCalHEWafer09LD200LD2,
hgcalwafer:HGCalHEWafer10LD200LD2, hgcalwafer:HGCalHEWafer11LD200LD2,
hgcalwafer:HGCalHEWafer06LD200LD3, hgcalwafer:HGCalHEWafer07LD200LD3,
hgcalwafer:HGCalHEWafer08LD200LD3, hgcalwafer:HGCalHEWafer09LD200LD3,
hgcalwafer:HGCalHEWafer10LD200LD3, hgcalwafer:HGCalHEWafer11LD200LD3,
hgcalwafer:HGCalHEWafer06LD200LD4, hgcalwafer:HGCalHEWafer07LD200LD4,
hgcalwafer:HGCalHEWafer08LD200LD4, hgcalwafer:HGCalHEWafer09LD200LD4,
hgcalwafer:HGCalHEWafer10LD200LD4, hgcalwafer:HGCalHEWafer11LD200LD4,
hgcalwafer:HGCalHEWafer06LD200LD5, hgcalwafer:HGCalHEWafer07LD200LD5,
hgcalwafer:HGCalHEWafer08LD200LD5, hgcalwafer:HGCalHEWafer09LD200LD5,
hgcalwafer:HGCalHEWafer10LD200LD5, hgcalwafer:HGCalHEWafer11LD200LD5,
hgcalwafer:HGCalHEWafer06LD200LD6, hgcalwafer:HGCalHEWafer07LD200LD6,
hgcalwafer:HGCalHEWafer08LD200LD6, hgcalwafer:HGCalHEWafer09LD200LD6,
hgcalwafer:HGCalHEWafer10LD200LD6, hgcalwafer:HGCalHEWafer11LD200LD6,
hgcalwafer:HGCalHEWafer06LD300LD1, hgcalwafer:HGCalHEWafer07LD300LD1,
hgcalwafer:HGCalHEWafer08LD300LD1, hgcalwafer:HGCalHEWafer09LD300LD1,
hgcalwafer:HGCalHEWafer10LD300LD1, hgcalwafer:HGCalHEWafer11LD300LD1,
hgcalwafer:HGCalHEWafer06LD300LD2, hgcalwafer:HGCalHEWafer07LD300LD2,
hgcalwafer:HGCalHEWafer08LD300LD2, hgcalwafer:HGCalHEWafer09LD300LD2,
hgcalwafer:HGCalHEWafer10LD300LD2, hgcalwafer:HGCalHEWafer11LD300LD2,
hgcalwafer:HGCalHEWafer06LD300LD3, hgcalwafer:HGCalHEWafer07LD300LD3,
hgcalwafer:HGCalHEWafer08LD300LD3, hgcalwafer:HGCalHEWafer09LD300LD3,
hgcalwafer:HGCalHEWafer10LD300LD3, hgcalwafer:HGCalHEWafer11LD300LD3,
hgcalwafer:HGCalHEWafer06LD300LD4, hgcalwafer:HGCalHEWafer07LD300LD4,
hgcalwafer:HGCalHEWafer08LD300LD4, hgcalwafer:HGCalHEWafer09LD300LD4,
hgcalwafer:HGCalHEWafer10LD300LD4, hgcalwafer:HGCalHEWafer11LD300LD4,
hgcalwafer:HGCalHEWafer06LD300LD5, hgcalwafer:HGCalHEWafer07LD300LD5,
hgcalwafer:HGCalHEWafer08LD300LD5, hgcalwafer:HGCalHEWafer09LD300LD5,
hgcalwafer:HGCalHEWafer10LD300LD5, hgcalwafer:HGCalHEWafer11LD300LD5,
hgcalwafer:HGCalHEWafer06LD300LD6, hgcalwafer:HGCalHEWafer07LD300LD6,
hgcalwafer:HGCalHEWafer08LD300LD6, hgcalwafer:HGCalHEWafer09LD300LD6,
hgcalwafer:HGCalHEWafer10LD300LD6, hgcalwafer:HGCalHEWafer11LD300LD6,
hgcalwafer:HGCalHEWafer06HD200HD1, hgcalwafer:HGCalHEWafer07HD200HD1,
hgcalwafer:HGCalHEWafer08HD200HD1, hgcalwafer:HGCalHEWafer09HD200HD1,
hgcalwafer:HGCalHEWafer10HD200HD1, hgcalwafer:HGCalHEWafer11HD200HD1,
hgcalwafer:HGCalHEWafer06HD200HD2, hgcalwafer:HGCalHEWafer07HD200HD2,
hgcalwafer:HGCalHEWafer08HD200HD2, hgcalwafer:HGCalHEWafer09HD200HD2,
hgcalwafer:HGCalHEWafer10HD200HD2, hgcalwafer:HGCalHEWafer11HD200HD2,
hgcalwafer:HGCalHEWafer06HD200HD3, hgcalwafer:HGCalHEWafer07HD200HD3,
hgcalwafer:HGCalHEWafer08HD200HD3, hgcalwafer:HGCalHEWafer09HD200HD3,
hgcalwafer:HGCalHEWafer10HD200HD3, hgcalwafer:HGCalHEWafer11HD200HD3,
hgcalwafer:HGCalHEWafer06HD200HD4, hgcalwafer:HGCalHEWafer07HD200HD4,
hgcalwafer:HGCalHEWafer08HD200HD4, hgcalwafer:HGCalHEWafer09HD200HD4,
hgcalwafer:HGCalHEWafer10HD200HD4, hgcalwafer:HGCalHEWafer11HD200HD4,
hgcalwafer:HGCalHEWafer06HD200HD5, hgcalwafer:HGCalHEWafer07HD200HD5,
hgcalwafer:HGCalHEWafer08HD200HD5, hgcalwafer:HGCalHEWafer09HD200HD5,
hgcalwafer:HGCalHEWafer10HD200HD5, hgcalwafer:HGCalHEWafer11HD200HD5</Vector>
<Vector name="PassiveNamesFull" type="string" nEntries="252">
hgcalPassive:HGCalHEPassiveL01F00, hgcalPassive:HGCalHEPassiveL01F01,
hgcalPassive:HGCalHEPassiveL01F02, hgcalPassive:HGCalHEPassiveL01F03,
Expand Down
Loading

0 comments on commit 8793052

Please sign in to comment.