Skip to content

Commit 7dd7c7c

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47999 from bsunanda/Phase2-hgx363U
Phase2-hgx363U Update the list of parameters to be saved on DB for HGCal
2 parents c8d01ce + 224743d commit 7dd7c7c

File tree

4 files changed

+682
-191
lines changed

4 files changed

+682
-191
lines changed

‎CondFormats/GeometryObjects/interface/PHGCalParameters.h‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ class PHGCalParameters {
1313

1414
std::string name_;
1515
std::vector<double> cellSize_;
16+
std::vector<double> slopeMin_;
17+
std::vector<double> zFrontMin_;
18+
std::vector<double> rMinFront_;
19+
std::vector<double> slopeTop_;
20+
std::vector<double> zFrontTop_;
21+
std::vector<double> rMaxFront_;
22+
std::vector<double> zRanges_;
1623
std::vector<double> moduleBlS_;
1724
std::vector<double> moduleTlS_;
1825
std::vector<double> moduleHS_;
@@ -37,6 +44,8 @@ class PHGCalParameters {
3744
std::vector<double> trformRotXZ_;
3845
std::vector<double> trformRotYZ_;
3946
std::vector<double> trformRotZZ_;
47+
std::vector<double> xLayerHex_;
48+
std::vector<double> yLayerHex_;
4049
std::vector<double> zLayerHex_;
4150
std::vector<double> rMinLayHex_;
4251
std::vector<double> rMaxLayHex_;
@@ -47,6 +56,17 @@ class PHGCalParameters {
4756
std::vector<double> cellCoarseX_;
4857
std::vector<double> cellCoarseY_;
4958
std::vector<double> boundR_;
59+
std::vector<double> rLimit_;
60+
std::vector<double> waferThickness_;
61+
std::vector<double> cellThickness_;
62+
std::vector<double> radius100to200_;
63+
std::vector<double> radius200to300_;
64+
std::vector<double> radiusMixBoundary_;
65+
std::vector<double> rMinLayerBH_;
66+
std::vector<double> radiusLayer_[2];
67+
std::vector<double> cassetteShift_;
68+
std::vector<double> cassetteShiftTile_;
69+
std::vector<double> cassetteRetractTile_;
5070
std::vector<int> moduleLayS_;
5171
std::vector<int> moduleLayR_;
5272
std::vector<int> layer_;
@@ -61,12 +81,65 @@ class PHGCalParameters {
6181
std::vector<int> waferTypeT_;
6282
std::vector<int> layerGroupM_;
6383
std::vector<int> layerGroupO_;
84+
std::vector<int> cellFine_;
85+
std::vector<int> cellCoarse_;
86+
std::vector<int> levelT_;
87+
std::vector<int> waferUVMaxLayer_;
88+
std::vector<int> nPhiBinBH_;
89+
std::vector<int> layerFrontBH_;
90+
std::vector<int> iradMinBH_;
91+
std::vector<int> iradMaxBH_;
92+
std::vector<int> iradMinBHFine_;
93+
std::vector<int> iradMaxBHFine_;
94+
std::vector<int> firstModule_;
95+
std::vector<int> lastModule_;
96+
std::vector<int> layerType_;
97+
std::vector<int> layerCenter_;
98+
std::vector<int> nPhiLayer_;
99+
std::vector<int> calibCellFullHD_;
100+
std::vector<int> calibCellPartHD_;
101+
std::vector<int> calibCellFullLD_;
102+
std::vector<int> calibCellPartLD_;
64103
std::vector<uint32_t> trformIndex_;
104+
std::vector<bool> cellFineHalf_;
105+
std::vector<bool> cellCoarseHalf_;
65106
double waferR_;
66-
std::vector<double> slopeMin_;
107+
double waferSize_;
108+
double waferThick_;
109+
double sensorSeparation_;
110+
double sensorSizeOffset_;
111+
double guardRingOffset_;
112+
double mouseBite_;
113+
double fracAreaMin_;
114+
double zMinForRad_;
115+
double minTileSize_;
116+
double layerRotation_;
117+
double calibCellRHD_;
118+
double calibCellRLD_;
119+
int detectorType_;
120+
int useSimWt_;
67121
int nCells_;
68122
int nSectors_;
69123
int mode_;
124+
int firstLayer_;
125+
int firstMixedLayer_;
126+
int levelZSide_;
127+
int nCellsFine_;
128+
int nCellsCoarse_;
129+
int useOffset_;
130+
int waferUVMax_;
131+
int choiceType_;
132+
int nCornerCut_;
133+
int layerOffset_;
134+
int waferMaskMode_;
135+
int waferZSide_;
136+
int cassettes_;
137+
int nphiCassette_;
138+
int nphiFineCassette_;
139+
int phiOffset_;
140+
int tileUVMax_;
141+
int tileUVMaxFine_;
142+
bool defineFull_;
70143
std::vector<std::unordered_map<uint32_t, uint32_t> > copiesInLayers_;
71144

72145
COND_SERIALIZABLE;

‎CondFormats/GeometryObjects/src/classes_def.xml‎

Lines changed: 131 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -97,63 +97,138 @@
9797
</class>
9898
<class name="HcalParameters::LayerItem"/>
9999
<class name="std::vector<HcalParameters::LayerItem>"/>
100+
100101
<class name="PHGCalParameters" class_version="0">
101-
<field name="name_" mapping="blob"/>
102-
<field name="cellSize_" mapping="blob"/>
103-
<field name="moduleBlS_" mapping="blob"/>
104-
<field name="moduleTlS_" mapping="blob"/>
105-
<field name="moduleHS_" mapping="blob"/>
106-
<field name="moduleDzS_" mapping="blob"/>
107-
<field name="moduleAlphaS_" mapping="blob"/>
108-
<field name="moduleCellS_" mapping="blob"/>
109-
<field name="moduleBlR_" mapping="blob"/>
110-
<field name="moduleTlR_" mapping="blob"/>
111-
<field name="moduleHR_" mapping="blob"/>
112-
<field name="moduleDzR_" mapping="blob"/>
113-
<field name="moduleAlphaR_" mapping="blob"/>
114-
<field name="moduleCellR_" mapping="blob"/>
115-
<field name="trformTranX_" mapping="blob"/>
116-
<field name="trformTranY_" mapping="blob"/>
117-
<field name="trformTranZ_" mapping="blob"/>
118-
<field name="trformRotXX_" mapping="blob"/>
119-
<field name="trformRotYX_" mapping="blob"/>
120-
<field name="trformRotZX_" mapping="blob"/>
121-
<field name="trformRotXY_" mapping="blob"/>
122-
<field name="trformRotYY_" mapping="blob"/>
123-
<field name="trformRotZY_" mapping="blob"/>
124-
<field name="trformRotXZ_" mapping="blob"/>
125-
<field name="trformRotYZ_" mapping="blob"/>
126-
<field name="trformRotZZ_" mapping="blob"/>
127-
<field name="zLayerHex_" mapping="blob"/>
128-
<field name="rMinLayHex_" mapping="blob"/>
129-
<field name="rMaxLayHex_" mapping="blob"/>
130-
<field name="waferPosX_" mapping="blob"/>
131-
<field name="waferPosY_" mapping="blob"/>
132-
<field name="cellFineX_" mapping="blob"/>
133-
<field name="cellFineY_" mapping="blob"/>
134-
<field name="cellCoarseX_" mapping="blob"/>
135-
<field name="cellCoarseY_" mapping="blob"/>
136-
<field name="boundR_" mapping="blob"/>
137-
<field name="moduleLayS_" mapping="blob"/>
138-
<field name="moduleLayR_" mapping="blob"/>
139-
<field name="layer_" mapping="blob"/>
140-
<field name="layerIndex_" mapping="blob"/>
141-
<field name="layerGroup_" mapping="blob"/>
142-
<field name="cellFactor_" mapping="blob"/>
143-
<field name="depth_" mapping="blob"/>
144-
<field name="depthIndex_" mapping="blob"/>
145-
<field name="depthLayerF_" mapping="blob"/>
146-
<field name="waferCopy_" mapping="blob"/>
147-
<field name="waferTypeL_" mapping="blob"/>
148-
<field name="waferTypeT_" mapping="blob"/>
149-
<field name="layerGroupM_" mapping="blob"/>
150-
<field name="layerGroupO_" mapping="blob"/>
151-
<field name="trformIndex_" mapping="blob"/>
152-
<field name="waferR_" mapping="blob"/>
153-
<field name="nCells_" mapping="blob"/>
154-
<field name="nSectors_" mapping="blob"/>
155-
<field name="mode_" mapping="blob"/>
156-
<field name="copiesInLayers_" mapping="blob"/>
102+
<field name="name_" mapping="blob"/>
103+
<field name="slopeMin_" mapping="blob"/>
104+
<field name="zFrontMin_" mapping="blob"/>
105+
<field name="rMinFront_" mapping="blob"/>
106+
<field name="slopeTop_" mapping="blob"/>
107+
<field name="zFrontTop_" mapping="blob"/>
108+
<field name="rMaxFront_" mapping="blob"/>
109+
<field name="zRanges_" mapping="blob"/>
110+
<field name="cellSize_" mapping="blob"/>
111+
<field name="moduleBlS_" mapping="blob"/>
112+
<field name="moduleTlS_" mapping="blob"/>
113+
<field name="moduleHS_" mapping="blob"/>
114+
<field name="moduleDzS_" mapping="blob"/>
115+
<field name="moduleAlphaS_" mapping="blob"/>
116+
<field name="moduleCellS_" mapping="blob"/>
117+
<field name="moduleBlR_" mapping="blob"/>
118+
<field name="moduleTlR_" mapping="blob"/>
119+
<field name="moduleHR_" mapping="blob"/>
120+
<field name="moduleDzR_" mapping="blob"/>
121+
<field name="moduleAlphaR_" mapping="blob"/>
122+
<field name="moduleCellR_" mapping="blob"/>
123+
<field name="trformTranX_" mapping="blob"/>
124+
<field name="trformTranY_" mapping="blob"/>
125+
<field name="trformTranZ_" mapping="blob"/>
126+
<field name="trformRotXX_" mapping="blob"/>
127+
<field name="trformRotYX_" mapping="blob"/>
128+
<field name="trformRotZX_" mapping="blob"/>
129+
<field name="trformRotXY_" mapping="blob"/>
130+
<field name="trformRotYY_" mapping="blob"/>
131+
<field name="trformRotZY_" mapping="blob"/>
132+
<field name="trformRotXZ_" mapping="blob"/>
133+
<field name="trformRotYZ_" mapping="blob"/>
134+
<field name="trformRotZZ_" mapping="blob"/>
135+
<field name="xLayerHex_" mapping="blob"/>
136+
<field name="yLayerHex_" mapping="blob"/>
137+
<field name="zLayerHex_" mapping="blob"/>
138+
<field name="rMinLayHex_" mapping="blob"/>
139+
<field name="rMaxLayHex_" mapping="blob"/>
140+
<field name="waferPosX_" mapping="blob"/>
141+
<field name="waferPosY_" mapping="blob"/>
142+
<field name="cellFineX_" mapping="blob"/>
143+
<field name="cellFineY_" mapping="blob"/>
144+
<field name="cellCoarseX_" mapping="blob"/>
145+
<field name="cellCoarseY_" mapping="blob"/>
146+
<field name="boundR_" mapping="blob"/>
147+
<field name="rLimit_" mapping="blob"/>
148+
<field name="waferThickness_" mapping="blob"/>
149+
<field name="cellThickness_" mapping="blob"/>
150+
<field name="radius100to200_" mapping="blob"/>
151+
<field name="radius200to300_" mapping="blob"/>
152+
<field name="radiusMixBoundary_" mapping="blob"/>
153+
<field name="rMinLayerBH_" mapping="blob"/>
154+
<field name="radiusLayer_[2]" mapping="blob"/>
155+
<field name="cassetteShift_" mapping="blob"/>
156+
<field name="cassetteShiftTile_" mapping="blob"/>
157+
<field name="cassetteRetractTile_" mapping="blob"/>
158+
<field name="moduleLayS_" mapping="blob"/>
159+
<field name="moduleLayR_" mapping="blob"/>
160+
<field name="layer_" mapping="blob"/>
161+
<field name="layerIndex_" mapping="blob"/>
162+
<field name="layerGroup_" mapping="blob"/>
163+
<field name="cellFactor_" mapping="blob"/>
164+
<field name="depth_" mapping="blob"/>
165+
<field name="depthIndex_" mapping="blob"/>
166+
<field name="depthLayerF_" mapping="blob"/>
167+
<field name="waferCopy_" mapping="blob"/>
168+
<field name="waferTypeL_" mapping="blob"/>
169+
<field name="waferTypeT_" mapping="blob"/>
170+
<field name="layerGroupM_" mapping="blob"/>
171+
<field name="layerGroupO_" mapping="blob"/>
172+
<field name="cellFine_" mapping="blob"/>
173+
<field name="cellCoarse_" mapping="blob"/>
174+
<field name="levelT_" mapping="blob"/>
175+
<field name="waferUVMaxLayer_" mapping="blob"/>
176+
<field name="nPhiBinBH_" mapping="blob"/>
177+
<field name="layerFrontBH_" mapping="blob"/>
178+
<field name="iradMinBH_" mapping="blob"/>
179+
<field name="iradMaxBH_" mapping="blob"/>
180+
<field name="iradMinBHFine_" mapping="blob"/>
181+
<field name="iradMaxBHFine_" mapping="blob"/>
182+
<field name="firstModule_" mapping="blob"/>
183+
<field name="lastModule_" mapping="blob"/>
184+
<field name="layerType_" mapping="blob"/>
185+
<field name="layerCenter_" mapping="blob"/>
186+
<field name="nPhiLayer_" mapping="blob"/>
187+
<field name="calibCellFullHD_" mapping="blob"/>
188+
<field name="calibCellPartHD_" mapping="blob"/>
189+
<field name="calibCellFullLD_" mapping="blob"/>
190+
<field name="calibCellPartLD_" mapping="blob"/>
191+
<field name="trformIndex_" mapping="blob"/>
192+
<field name="cellFineHalf_" mapping="blob"/>
193+
<field name="cellCoarseHalf_" mapping="blob"/>
194+
<field name="waferR_" mapping="blob"/>
195+
<field name="waferSize_" mapping="blob"/>
196+
<field name="waferThick_" mapping="blob"/>
197+
<field name="sensorSeparation_" mapping="blob"/>
198+
<field name="sensorSizeOffset_" mapping="blob"/>
199+
<field name="guardRingOffset_" mapping="blob"/>
200+
<field name="mouseBite_" mapping="blob"/>
201+
<field name="fracAreaMin_" mapping="blob"/>
202+
<field name="zMinForRad_" mapping="blob"/>
203+
<field name="minTileSize_" mapping="blob"/>
204+
<field name="layerRotation_" mapping="blob"/>
205+
<field name="calibCellRHD_" mapping="blob"/>
206+
<field name="calibCellRLD_" mapping="blob"/>
207+
<field name="detectorType_" mapping="blob"/>
208+
<field name="useSimWt_" mapping="blob"/>
209+
<field name="nCells_" mapping="blob"/>
210+
<field name="nSectors_" mapping="blob"/>
211+
<field name="mode_" mapping="blob"/>
212+
<field name="firstLayer_" mapping="blob"/>
213+
<field name="firstMixedLayer_" mapping="blob"/>
214+
<field name="levelZSide_" mapping="blob"/>
215+
<field name="nCellsFine_" mapping="blob"/>
216+
<field name="nCellsCoarse_" mapping="blob"/>
217+
<field name="useOffset_" mapping="blob"/>
218+
<field name="waferUVMax_" mapping="blob"/>
219+
<field name="choiceType_" mapping="blob"/>
220+
<field name="nCornerCut_" mapping="blob"/>
221+
<field name="layerOffset_" mapping="blob"/>
222+
<field name="waferMaskMode_" mapping="blob"/>
223+
<field name="waferZSide_" mapping="blob"/>
224+
<field name="cassettes_" mapping="blob"/>
225+
<field name="nphiCassette_" mapping="blob"/>
226+
<field name="nphiFineCassette_" mapping="blob"/>
227+
<field name="phiOffset_" mapping="blob"/>
228+
<field name="tileUVMax_" mapping="blob"/>
229+
<field name="tileUVMaxFine_" mapping="blob"/>
230+
<field name="defineFull_" mapping="blob"/>
231+
<field name="copiesInLayers_" mapping="blob"/>
157232
</class>
158233
<class name="HcalSimulationParameters" class_version="1">
159234
<field name="attenuationLength_" mapping="blob"/>

0 commit comments

Comments
 (0)