Skip to content

Commit 63ed0a8

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#42262 from bsunanda/Phase2-hgx3341I
Phase2-hgx3341I Final step to prepare the V18 version of HGCal geometry which allows non-ero cassette shifts
2 parents 9f75c01 + 3968841 commit 63ed0a8

12 files changed

+874
-13
lines changed

‎Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalEEV18-algorithm.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0"?>
2+
<DDDefinition>
3+
<debug>
4+
<!--
5+
<debug_shapes/>
6+
<debug_includes/>
7+
<debug_rotations/>
8+
<debug_includes/>
9+
<debug_volumes/>
10+
<debug_constants/>
11+
<debug_namespaces/>
12+
<debug_placements/>
13+
<debug_algorithms/>
14+
<debug_materials/>
15+
<debug_visattr/>
16+
-->
17+
</debug>
18+
19+
<open_geometry/>
20+
<close_geometry/>
21+
22+
<IncludeSection>
23+
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
24+
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
25+
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
26+
<Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
27+
<Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
28+
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
29+
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
30+
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
31+
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
32+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
33+
<Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
34+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
35+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
36+
<Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
37+
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml"/>
38+
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
39+
</IncludeSection>
40+
41+
</DDDefinition>
42+

‎Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEmixV18-algorithm.xml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0"?>
2+
<DDDefinition>
3+
<debug>
4+
<!--
5+
<debug_shapes/>
6+
<debug_includes/>
7+
<debug_rotations/>
8+
<debug_includes/>
9+
<debug_volumes/>
10+
<debug_constants/>
11+
<debug_namespaces/>
12+
<debug_placements/>
13+
<debug_algorithms/>
14+
<debug_materials/>
15+
<debug_visattr/>
16+
-->
17+
</debug>
18+
19+
<open_geometry/>
20+
<close_geometry/>
21+
22+
<IncludeSection>
23+
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
24+
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
25+
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
26+
<Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
27+
<Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
28+
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
29+
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
30+
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
31+
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
32+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
33+
<Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
34+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
35+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
36+
<Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
37+
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml"/>
38+
</IncludeSection>
39+
40+
</DDDefinition>
41+

‎Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEsilV18-algorithm.xml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0"?>
2+
<DDDefinition>
3+
<debug>
4+
<!--
5+
<debug_shapes/>
6+
<debug_includes/>
7+
<debug_rotations/>
8+
<debug_includes/>
9+
<debug_volumes/>
10+
<debug_constants/>
11+
<debug_namespaces/>
12+
<debug_placements/>
13+
<debug_algorithms/>
14+
<debug_materials/>
15+
<debug_visattr/>
16+
-->
17+
</debug>
18+
19+
<open_geometry/>
20+
<close_geometry/>
21+
22+
<IncludeSection>
23+
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
24+
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
25+
<Include ref="Geometry/CMSCommonData/data/extend/v2/cmsextent.xml"/>
26+
<Include ref="Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml"/>
27+
<Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
28+
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
29+
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
30+
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
31+
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
32+
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
33+
<Include ref="Geometry/HGCalCommonData/data/hgcal/v18/hgcal.xml"/>
34+
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
35+
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
36+
<Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
37+
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml"/>
38+
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
39+
</IncludeSection>
40+
41+
</DDDefinition>
42+

‎Geometry/HGCalCommonData/data/dd4hep/testHGCalV18.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<Include ref="Geometry/HGCalCommonData/data/hgcalPassive/v18/hgcalPassive.xml"/>
4343
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v18/hgcalEE.xml"/>
4444
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v18/hgcalHEsil.xml"/>
45-
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml"/>
45+
<Include ref="Geometry/HGCalCommonData/data/hgcalHEmix/v18/hgcalHEmix.xml"/>
4646
<Include ref="Geometry/HGCalCommonData/data/hgcalCons/v18/hgcalCons.xml"/>
4747
<Include ref="Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml"/>
4848
<Include ref="Geometry/ForwardCommonData/data/forwardshield/2026/v4/forwardshield.xml"/>

‎Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedCassette.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <unordered_set>
3232
#include <vector>
3333

34-
#define EDM_ML_DEBUG
34+
//#define EDM_ML_DEBUG
3535
using namespace angle_units::operators;
3636

3737
class DDHGCalMixRotatedCassette : public DDAlgorithm {

‎Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <unordered_set>
3333
#include <vector>
3434

35-
#define EDM_ML_DEBUG
35+
//#define EDM_ML_DEBUG
3636
using namespace angle_units::operators;
3737

3838
class DDHGCalSiliconRotatedCassette : public DDAlgorithm {
@@ -554,7 +554,6 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
554554
#endif
555555
int nr = 2 * v;
556556
int nc = -2 * u + v;
557-
int type = HGCalProperty::waferThick(waferProperty_[k]);
558557
int part = HGCalProperty::waferPartial(waferProperty_[k]);
559558
int orien = HGCalProperty::waferOrient(waferProperty_[k]);
560559
int cassette = HGCalProperty::waferCassette(waferProperty_[k]);
@@ -566,6 +565,7 @@ void DDHGCalSiliconRotatedCassette::positionPassive(const DDLogicalPart& glog,
566565
double xorig = xyoff.first + nc * delx;
567566
double yorig = xyoff.second + nr * dy;
568567
double angle = std::atan2(yorig, xorig);
568+
int type = HGCalProperty::waferThick(waferProperty_[k]);
569569
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette::Passive: layer " << layer + 1 << " cassette "
570570
<< cassette << " Shift " << cshift.first << ":" << cshift.second << " Original "
571571
<< xorig << ":" << yorig << ":" << convertRadToDeg(angle) << " Final " << xpos << ":"

0 commit comments

Comments
 (0)