Skip to content

Phase2-hgx294A Add layeroffset attribute to 6-inch wafer geometry files for HGCal #36036

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

Merged
cmsbuild merged 3 commits into from
Nov 11, 2021
Merged

Phase2-hgx294A Add layeroffset attribute to 6-inch wafer geometry files for HGCal #36036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c603e
Add layeroffset attribute to v6 geometry files for HGCal
Nov 8, 2021
b770917
Code check
Nov 8, 2021
0398b56
Remove the changes in hgcalCons files (to be deleted later)
Nov 9, 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
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB161/1Module/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="-1"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB161/8Module/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<Parameter name="GroupingZOut" value="-1"/>
<Parameter name="GroupingZOut" value="8"/>
<Parameter name="GroupingZOut" value="8"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB161/TimingLayer/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/TB170/July17/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
<SpecPar name="HGCalHESiliconSensitive">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
Expand Down Expand Up @@ -96,6 +97,7 @@
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="LayerOffset" value="3"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB170/Sep17/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
<Parameter name="GroupingZOut" value="10"/>
<Parameter name="GroupingZOut" value="10"/>
<Parameter name="GroupingZOut" value="10"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/TB170/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
<SpecPar name="HGCalHESiliconSensitive">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
Expand Down Expand Up @@ -393,6 +394,7 @@
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="LayerOffset" value="28"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB180/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB181/June18/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
2 changes: 2 additions & 0 deletions Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
<Parameter name="GroupingZOut" value="-1"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="GroupingZOut" value="28"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
<SpecPar name="HGCalHESiliconSensitive">
<PartSelector path="//HGCalHESiliconSensitive.*"/>
Expand Down Expand Up @@ -393,6 +394,7 @@
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="LayerOffset" value="28"/>
</SpecPar>
</SpecParSection>

Expand Down
1 change: 1 addition & 0 deletions Geometry/HGCalCommonData/data/TB181/Test/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="GroupingZOut" value="12"/>
<Parameter name="LayerOffset" value="0"/>
</SpecPar>
</SpecParSection>

Expand Down
117 changes: 0 additions & 117 deletions Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py
View file
Open in desktop

This file was deleted.

120 changes: 0 additions & 120 deletions Geometry/HGCalCommonData/python/testHGCV8XML_cfi.py
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,11 @@ void HGCalGeomParameters::loadSpecParsHexagon(const DDFilteredView& fv,
php.layerGroupM_ = dbl_to_int(getDDDArray("GroupingZMid", sv, 0));
php.layerGroupO_ = dbl_to_int(getDDDArray("GroupingZOut", sv, 0));
php.slopeMin_ = getDDDArray("Slope", sv, 1);
const auto& dummy2 = getDDDArray("LayerOffset", sv, 0);
if (!dummy2.empty())
php.layerOffset_ = dummy2[0];
else
php.layerOffset_ = 0;

// Wafer size
std::string attribute = "Volume";
Expand Down Expand Up @@ -1223,6 +1228,14 @@ void HGCalGeomParameters::loadSpecParsHexagon(const cms::DDFilteredView& fv,
php.cellSize_ = fv.get<std::vector<double> >(sdTag3, "CellSize");
rescale(php.cellSize_, HGCalParameters::k_ScaleFromDD4hepToG4);

// Layer Offset
const auto& dummy2 = fv.get<std::vector<double> >(sdTag1, "LayerOffset");
Copy link
Contributor

@cvuosalo cvuosalo Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

layerOffset would be a more instructive name for this constant than dummy2.

if (!dummy2.empty()) {
php.layerOffset_ = dummy2[0];
} else {
php.layerOffset_ = 0;
}

loadSpecParsHexagon(php);
}

Expand All @@ -1242,6 +1255,8 @@ void HGCalGeomParameters::loadSpecParsHexagon(const HGCalParameters& php) {
edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: " << php.cellSize_.size() << " cells of sizes:";
for (unsigned int k = 0; k < php.cellSize_.size(); ++k)
edm::LogVerbatim("HGCalGeom") << " [" << k << "] " << php.cellSize_[k];
edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters: First Layer " << php.firstLayer_ << " and layer offset "
<< php.layerOffset_;
#endif
}

Expand Down