Skip to content

Commit 6d884fe

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47684 from bsunanda/Phase2-gex187X
Phase2-hgx187X Remove the overlaps in the EE parts of HGCal
2 parents c3b85f6 + 8603499 commit 6d884fe

File tree

3 files changed

+107
-98
lines changed

3 files changed

+107
-98
lines changed

‎Geometry/HGCalCommonData/data/hgcal/v19/hgcal.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,19 @@
9595
<Constant name="rMinHGCal8" value="483.4*mm"/>
9696
<Constant name="rMaxHGCal0" value="([rPosV0]+[slope1]*([zHGCal0]-[zPosV0]))"/>
9797
<Constant name="rMaxHGCal0S" value="[caloBase:RmaxV0]"/>
98-
<Constant name="rMaxHGCal1" value="[rPosV0]"/>
99-
<Constant name="rMaxHGCal2" value="([rPosV0]+[slope1]*([zHGCal2]-[zPosV0]))"/>
100-
<Constant name="rMaxHGCal3" value="([rPosV0]+[slope1]*([zHGCal3]-[zPosV0]))"/>
98+
<Constant name="rMaxHGCal1" value="1540.0*mm"/>
99+
<Constant name="rMaxHGCal2" value="([rMaxHGCal1]+[slope1]*([zHGCal2]-[zPosV0]))"/>
100+
<Constant name="rMaxHGCal3" value="([rMaxHGCal1]+[slope1]*([zHGCal3]-[zPosV0]))"/>
101101
<Constant name="rMaxHGCal3S" value="[caloBase:Rmax31]"/>
102102
<Constant name="rMaxHGCal4S" value="[caloBase:Rmax32]"/>
103-
<Constant name="rMaxHGCal5" value="[rPosV1]"/>
104-
<Constant name="rMaxHGCal6" value="([rPosV1]+[slope3]*([zHGCal6]-[zPosV1]))"/>
105-
<Constant name="rMaxHGCal7" value="([rPosV1]+[slope3]*([zHGCal7]-[zPosV1]))"/>
103+
<Constant name="rMaxHGCal5" value="([rMaxHGCal1]+[slope1]*([zHGCal5]-[zPosV0]))"/>
104+
<Constant name="rMaxHGCal6" value="([rMaxHGCal5]+[slope3]*([zHGCal6]-[zHGCal5]))"/>
105+
<Constant name="rMaxHGCal7" value="([rMaxHGCal5]+[slope3]*([zHGCal7]-[zHGCal5]))"/>
106106
<Constant name="rMaxHGCal7S" value="[caloBase:Rmax33]"/>
107-
<Constant name="rMaxHGCal8" value="([rPosV1]+[slope3]*([zHGCal8]-[zPosV1]))"/>
107+
<Constant name="rMaxHGCal8" value="([rMaxHGCal5]+[slope3]*([zHGCal8]-[zHGCal5]))"/>
108108
<Constant name="rMaxHGCal8S" value="[caloBase:Rmax34]"/>
109109
<Constant name="rMaxHGCal9S" value="[caloBase:Rmax36]"/>
110-
<Constant name="rMaxHGCal10" value="[rPosV2]"/>
110+
<Constant name="rMaxHGCal10" value="([rMaxHGCal5]+[slope3]*([zHGCal10]-[zHGCal5]))"/>
111111
<Constant name="rMaxHGCal11" value="[caloBase:Rmax37]"/>
112112
<Constant name="rMaxHGCal12" value="[caloBase:Rmax37]"/>
113113
<Constant name="rMaxHGCal12S" value="[caloBase:Rmax38]"/>

‎Geometry/HGCalCommonData/data/hgcalEE/v19/hgcalEE.xml‎

Lines changed: 89 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -186,117 +186,117 @@
186186
hgcalPassive:HGCalEEPassiveL01AF4PN, hgcalPassive:HGCalEEPassiveL01BF4PN,
187187
hgcalPassive:HGCalEEPassiveL01AF5PN, hgcalPassive:HGCalEEPassiveL01BF5PN,
188188
hgcalPassive:HGCalEEPassiveL02AF0PN, hgcalPassive:HGCalEEPassiveL02BF0PN,
189-
hgcalPassive:HGCalEEPassiveL03AF0PN, hgcalPassive:HGCalEEPassiveL03BF0PN,
190-
hgcalPassive:HGCalEEPassiveL04AF0PN, hgcalPassive:HGCalEEPassiveL04BF0PN,
191-
hgcalPassive:HGCalEEPassiveL05AF0PN, hgcalPassive:HGCalEEPassiveL05BF0PN,
192-
hgcalPassive:HGCalEEPassiveL06AF0PN, hgcalPassive:HGCalEEPassiveL06BF0PN,
193-
hgcalPassive:HGCalEEPassiveL07AF0PN, hgcalPassive:HGCalEEPassiveL07BF0PN,
194-
hgcalPassive:HGCalEEPassiveL08AF0PN, hgcalPassive:HGCalEEPassiveL08BF0PN,
195-
hgcalPassive:HGCalEEPassiveL09AF0PN, hgcalPassive:HGCalEEPassiveL09BF0PN,
196189
hgcalPassive:HGCalEEPassiveL02AF1PN, hgcalPassive:HGCalEEPassiveL02BF1PN,
197-
hgcalPassive:HGCalEEPassiveL03AF1PN, hgcalPassive:HGCalEEPassiveL03BF1PN,
198-
hgcalPassive:HGCalEEPassiveL04AF1PN, hgcalPassive:HGCalEEPassiveL04BF1PN,
199-
hgcalPassive:HGCalEEPassiveL05AF1PN, hgcalPassive:HGCalEEPassiveL05BF1PN,
200-
hgcalPassive:HGCalEEPassiveL06AF1PN, hgcalPassive:HGCalEEPassiveL06BF1PN,
201-
hgcalPassive:HGCalEEPassiveL07AF1PN, hgcalPassive:HGCalEEPassiveL07BF1PN,
202-
hgcalPassive:HGCalEEPassiveL08AF1PN, hgcalPassive:HGCalEEPassiveL08BF1PN,
203-
hgcalPassive:HGCalEEPassiveL09AF1PN, hgcalPassive:HGCalEEPassiveL09BF1PN,
204190
hgcalPassive:HGCalEEPassiveL02AF2PN, hgcalPassive:HGCalEEPassiveL02BF2PN,
205-
hgcalPassive:HGCalEEPassiveL03AF2PN, hgcalPassive:HGCalEEPassiveL03BF2PN,
206-
hgcalPassive:HGCalEEPassiveL04AF2PN, hgcalPassive:HGCalEEPassiveL04BF2PN,
207-
hgcalPassive:HGCalEEPassiveL05AF2PN, hgcalPassive:HGCalEEPassiveL05BF2PN,
208-
hgcalPassive:HGCalEEPassiveL06AF2PN, hgcalPassive:HGCalEEPassiveL06BF2PN,
209-
hgcalPassive:HGCalEEPassiveL07AF2PN, hgcalPassive:HGCalEEPassiveL07BF2PN,
210-
hgcalPassive:HGCalEEPassiveL08AF2PN, hgcalPassive:HGCalEEPassiveL08BF2PN,
211-
hgcalPassive:HGCalEEPassiveL09AF2PN, hgcalPassive:HGCalEEPassiveL09BF2PN,
212191
hgcalPassive:HGCalEEPassiveL02AF3PN, hgcalPassive:HGCalEEPassiveL02BF3PN,
213-
hgcalPassive:HGCalEEPassiveL03AF3PN, hgcalPassive:HGCalEEPassiveL03BF3PN,
214-
hgcalPassive:HGCalEEPassiveL04AF3PN, hgcalPassive:HGCalEEPassiveL04BF3PN,
215-
hgcalPassive:HGCalEEPassiveL05AF3PN, hgcalPassive:HGCalEEPassiveL05BF3PN,
216-
hgcalPassive:HGCalEEPassiveL06AF3PN, hgcalPassive:HGCalEEPassiveL06BF3PN,
217-
hgcalPassive:HGCalEEPassiveL07AF3PN, hgcalPassive:HGCalEEPassiveL07BF3PN,
218-
hgcalPassive:HGCalEEPassiveL08AF3PN, hgcalPassive:HGCalEEPassiveL08BF3PN,
219-
hgcalPassive:HGCalEEPassiveL09AF3PN, hgcalPassive:HGCalEEPassiveL09BF3PN,
220192
hgcalPassive:HGCalEEPassiveL02AF4PN, hgcalPassive:HGCalEEPassiveL02BF4PN,
221-
hgcalPassive:HGCalEEPassiveL03AF4PN, hgcalPassive:HGCalEEPassiveL03BF4PN,
222-
hgcalPassive:HGCalEEPassiveL04AF4PN, hgcalPassive:HGCalEEPassiveL04BF4PN,
223-
hgcalPassive:HGCalEEPassiveL05AF4PN, hgcalPassive:HGCalEEPassiveL05BF4PN,
224-
hgcalPassive:HGCalEEPassiveL06AF4PN, hgcalPassive:HGCalEEPassiveL06BF4PN,
225-
hgcalPassive:HGCalEEPassiveL07AF4PN, hgcalPassive:HGCalEEPassiveL07BF4PN,
226-
hgcalPassive:HGCalEEPassiveL08AF4PN, hgcalPassive:HGCalEEPassiveL08BF4PN,
227-
hgcalPassive:HGCalEEPassiveL09AF4PN, hgcalPassive:HGCalEEPassiveL09BF4PN,
228193
hgcalPassive:HGCalEEPassiveL02AF5PN, hgcalPassive:HGCalEEPassiveL02BF5PN,
194+
hgcalPassive:HGCalEEPassiveL03AF0PN, hgcalPassive:HGCalEEPassiveL03BF0PN,
195+
hgcalPassive:HGCalEEPassiveL03AF1PN, hgcalPassive:HGCalEEPassiveL03BF1PN,
196+
hgcalPassive:HGCalEEPassiveL03AF2PN, hgcalPassive:HGCalEEPassiveL03BF2PN,
197+
hgcalPassive:HGCalEEPassiveL03AF3PN, hgcalPassive:HGCalEEPassiveL03BF3PN,
198+
hgcalPassive:HGCalEEPassiveL03AF4PN, hgcalPassive:HGCalEEPassiveL03BF4PN,
229199
hgcalPassive:HGCalEEPassiveL03AF5PN, hgcalPassive:HGCalEEPassiveL03BF5PN,
200+
hgcalPassive:HGCalEEPassiveL04AF0PN, hgcalPassive:HGCalEEPassiveL04BF0PN,
201+
hgcalPassive:HGCalEEPassiveL04AF1PN, hgcalPassive:HGCalEEPassiveL04BF1PN,
202+
hgcalPassive:HGCalEEPassiveL04AF2PN, hgcalPassive:HGCalEEPassiveL04BF2PN,
203+
hgcalPassive:HGCalEEPassiveL04AF3PN, hgcalPassive:HGCalEEPassiveL04BF3PN,
204+
hgcalPassive:HGCalEEPassiveL04AF4PN, hgcalPassive:HGCalEEPassiveL04BF4PN,
230205
hgcalPassive:HGCalEEPassiveL04AF5PN, hgcalPassive:HGCalEEPassiveL04BF5PN,
206+
hgcalPassive:HGCalEEPassiveL05AF0PN, hgcalPassive:HGCalEEPassiveL05BF0PN,
207+
hgcalPassive:HGCalEEPassiveL05AF1PN, hgcalPassive:HGCalEEPassiveL05BF1PN,
208+
hgcalPassive:HGCalEEPassiveL05AF2PN, hgcalPassive:HGCalEEPassiveL05BF2PN,
209+
hgcalPassive:HGCalEEPassiveL05AF3PN, hgcalPassive:HGCalEEPassiveL05BF3PN,
210+
hgcalPassive:HGCalEEPassiveL05AF4PN, hgcalPassive:HGCalEEPassiveL05BF4PN,
231211
hgcalPassive:HGCalEEPassiveL05AF5PN, hgcalPassive:HGCalEEPassiveL05BF5PN,
212+
hgcalPassive:HGCalEEPassiveL06AF0PN, hgcalPassive:HGCalEEPassiveL06BF0PN,
213+
hgcalPassive:HGCalEEPassiveL06AF1PN, hgcalPassive:HGCalEEPassiveL06BF1PN,
214+
hgcalPassive:HGCalEEPassiveL06AF2PN, hgcalPassive:HGCalEEPassiveL06BF2PN,
215+
hgcalPassive:HGCalEEPassiveL06AF3PN, hgcalPassive:HGCalEEPassiveL06BF3PN,
216+
hgcalPassive:HGCalEEPassiveL06AF4PN, hgcalPassive:HGCalEEPassiveL06BF4PN,
232217
hgcalPassive:HGCalEEPassiveL06AF5PN, hgcalPassive:HGCalEEPassiveL06BF5PN,
218+
hgcalPassive:HGCalEEPassiveL07AF0PN, hgcalPassive:HGCalEEPassiveL07BF0PN,
219+
hgcalPassive:HGCalEEPassiveL07AF1PN, hgcalPassive:HGCalEEPassiveL07BF1PN,
220+
hgcalPassive:HGCalEEPassiveL07AF2PN, hgcalPassive:HGCalEEPassiveL07BF2PN,
221+
hgcalPassive:HGCalEEPassiveL07AF3PN, hgcalPassive:HGCalEEPassiveL07BF3PN,
222+
hgcalPassive:HGCalEEPassiveL07AF4PN, hgcalPassive:HGCalEEPassiveL07BF4PN,
233223
hgcalPassive:HGCalEEPassiveL07AF5PN, hgcalPassive:HGCalEEPassiveL07BF5PN,
224+
hgcalPassive:HGCalEEPassiveL08AF0PN, hgcalPassive:HGCalEEPassiveL08BF0PN,
225+
hgcalPassive:HGCalEEPassiveL08AF1PN, hgcalPassive:HGCalEEPassiveL08BF1PN,
226+
hgcalPassive:HGCalEEPassiveL08AF2PN, hgcalPassive:HGCalEEPassiveL08BF2PN,
227+
hgcalPassive:HGCalEEPassiveL08AF3PN, hgcalPassive:HGCalEEPassiveL08BF3PN,
228+
hgcalPassive:HGCalEEPassiveL08AF4PN, hgcalPassive:HGCalEEPassiveL08BF4PN,
234229
hgcalPassive:HGCalEEPassiveL08AF5PN, hgcalPassive:HGCalEEPassiveL08BF5PN,
230+
hgcalPassive:HGCalEEPassiveL09AF0PN, hgcalPassive:HGCalEEPassiveL09BF0PN,
231+
hgcalPassive:HGCalEEPassiveL09AF1PN, hgcalPassive:HGCalEEPassiveL09BF1PN,
232+
hgcalPassive:HGCalEEPassiveL09AF2PN, hgcalPassive:HGCalEEPassiveL09BF2PN,
233+
hgcalPassive:HGCalEEPassiveL09AF3PN, hgcalPassive:HGCalEEPassiveL09BF3PN,
234+
hgcalPassive:HGCalEEPassiveL09AF4PN, hgcalPassive:HGCalEEPassiveL09BF4PN,
235235
hgcalPassive:HGCalEEPassiveL09AF5PN, hgcalPassive:HGCalEEPassiveL09BF5PN,
236236
hgcalPassive:HGCalEEPassiveL10AF0PN, hgcalPassive:HGCalEEPassiveL10BF0PN,
237-
hgcalPassive:HGCalEEPassiveL11AF0PN, hgcalPassive:HGCalEEPassiveL11BF0PN,
238-
hgcalPassive:HGCalEEPassiveL12AF0PN, hgcalPassive:HGCalEEPassiveL12BF0PN,
239-
hgcalPassive:HGCalEEPassiveL13AF0PN, hgcalPassive:HGCalEEPassiveL13BF0PN,
240237
hgcalPassive:HGCalEEPassiveL10AF1PN, hgcalPassive:HGCalEEPassiveL10BF1PN,
241-
hgcalPassive:HGCalEEPassiveL11AF1PN, hgcalPassive:HGCalEEPassiveL11BF1PN,
242-
hgcalPassive:HGCalEEPassiveL12AF1PN, hgcalPassive:HGCalEEPassiveL12BF1PN,
243-
hgcalPassive:HGCalEEPassiveL13AF1PN, hgcalPassive:HGCalEEPassiveL13BF1PN,
244238
hgcalPassive:HGCalEEPassiveL10AF2PN, hgcalPassive:HGCalEEPassiveL10BF2PN,
245-
hgcalPassive:HGCalEEPassiveL11AF2PN, hgcalPassive:HGCalEEPassiveL11BF2PN,
246-
hgcalPassive:HGCalEEPassiveL12AF2PN, hgcalPassive:HGCalEEPassiveL12BF2PN,
247-
hgcalPassive:HGCalEEPassiveL13AF2PN, hgcalPassive:HGCalEEPassiveL13BF2PN,
248239
hgcalPassive:HGCalEEPassiveL10AF3PN, hgcalPassive:HGCalEEPassiveL10BF3PN,
249-
hgcalPassive:HGCalEEPassiveL11AF3PN, hgcalPassive:HGCalEEPassiveL11BF3PN,
250-
hgcalPassive:HGCalEEPassiveL12AF3PN, hgcalPassive:HGCalEEPassiveL12BF3PN,
251-
hgcalPassive:HGCalEEPassiveL13AF3PN, hgcalPassive:HGCalEEPassiveL13BF3PN,
252240
hgcalPassive:HGCalEEPassiveL10AF4PN, hgcalPassive:HGCalEEPassiveL10BF4PN,
253-
hgcalPassive:HGCalEEPassiveL11AF4PN, hgcalPassive:HGCalEEPassiveL11BF4PN,
254-
hgcalPassive:HGCalEEPassiveL12AF4PN, hgcalPassive:HGCalEEPassiveL12BF4PN,
255-
hgcalPassive:HGCalEEPassiveL13AF4PN, hgcalPassive:HGCalEEPassiveL13BF4PN,
256241
hgcalPassive:HGCalEEPassiveL10AF5PN, hgcalPassive:HGCalEEPassiveL10BF5PN,
242+
hgcalPassive:HGCalEEPassiveL11AF0PN, hgcalPassive:HGCalEEPassiveL11BF0PN,
243+
hgcalPassive:HGCalEEPassiveL11AF1PN, hgcalPassive:HGCalEEPassiveL11BF1PN,
244+
hgcalPassive:HGCalEEPassiveL11AF2PN, hgcalPassive:HGCalEEPassiveL11BF2PN,
245+
hgcalPassive:HGCalEEPassiveL11AF3PN, hgcalPassive:HGCalEEPassiveL11BF3PN,
246+
hgcalPassive:HGCalEEPassiveL11AF4PN, hgcalPassive:HGCalEEPassiveL11BF4PN,
257247
hgcalPassive:HGCalEEPassiveL11AF5PN, hgcalPassive:HGCalEEPassiveL11BF5PN,
248+
hgcalPassive:HGCalEEPassiveL12AF0PN, hgcalPassive:HGCalEEPassiveL12BF0PN,
249+
hgcalPassive:HGCalEEPassiveL12AF1PN, hgcalPassive:HGCalEEPassiveL12BF1PN,
250+
hgcalPassive:HGCalEEPassiveL12AF2PN, hgcalPassive:HGCalEEPassiveL12BF2PN,
251+
hgcalPassive:HGCalEEPassiveL12AF3PN, hgcalPassive:HGCalEEPassiveL12BF3PN,
252+
hgcalPassive:HGCalEEPassiveL12AF4PN, hgcalPassive:HGCalEEPassiveL12BF4PN,
258253
hgcalPassive:HGCalEEPassiveL12AF5PN, hgcalPassive:HGCalEEPassiveL12BF5PN,
254+
hgcalPassive:HGCalEEPassiveL13AF0PN, hgcalPassive:HGCalEEPassiveL13BF0PN,
255+
hgcalPassive:HGCalEEPassiveL13AF1PN, hgcalPassive:HGCalEEPassiveL13BF1PN,
256+
hgcalPassive:HGCalEEPassiveL13AF2PN, hgcalPassive:HGCalEEPassiveL13BF2PN,
257+
hgcalPassive:HGCalEEPassiveL13AF3PN, hgcalPassive:HGCalEEPassiveL13BF3PN,
258+
hgcalPassive:HGCalEEPassiveL13AF4PN, hgcalPassive:HGCalEEPassiveL13BF4PN,
259259
hgcalPassive:HGCalEEPassiveL13AF5PN, hgcalPassive:HGCalEEPassiveL13BF5PN</Vector>,
260260
<Vector name="PassiveNamesPartial" type="string" nEntries="78">
261-
hgcalPassive:HGCalEECoolingL01F0PN, hgcalPassive:HGCalEECoolingL02F0PN,
262-
hgcalPassive:HGCalEECoolingL03F0PN, hgcalPassive:HGCalEECoolingL04F0PN,
263-
hgcalPassive:HGCalEECoolingL05F0PN, hgcalPassive:HGCalEECoolingL06F0PN,
264-
hgcalPassive:HGCalEECoolingL07F0PN, hgcalPassive:HGCalEECoolingL08F0PN,
265-
hgcalPassive:HGCalEECoolingL09F0PN, hgcalPassive:HGCalEECoolingL10F0PN,
266-
hgcalPassive:HGCalEECoolingL11F0PN, hgcalPassive:HGCalEECoolingL12F0PN,
267-
hgcalPassive:HGCalEECoolingL13F0PN, hgcalPassive:HGCalEECoolingL01F1PN,
268-
hgcalPassive:HGCalEECoolingL02F1PN, hgcalPassive:HGCalEECoolingL03F1PN,
269-
hgcalPassive:HGCalEECoolingL04F1PN, hgcalPassive:HGCalEECoolingL05F1PN,
270-
hgcalPassive:HGCalEECoolingL06F1PN, hgcalPassive:HGCalEECoolingL07F1PN,
271-
hgcalPassive:HGCalEECoolingL08F1PN, hgcalPassive:HGCalEECoolingL09F1PN,
272-
hgcalPassive:HGCalEECoolingL10F1PN, hgcalPassive:HGCalEECoolingL11F1PN,
273-
hgcalPassive:HGCalEECoolingL12F1PN, hgcalPassive:HGCalEECoolingL13F1PN,
274-
hgcalPassive:HGCalEECoolingL01F2PN, hgcalPassive:HGCalEECoolingL02F2PN,
275-
hgcalPassive:HGCalEECoolingL03F2PN, hgcalPassive:HGCalEECoolingL04F2PN,
276-
hgcalPassive:HGCalEECoolingL05F2PN, hgcalPassive:HGCalEECoolingL06F2PN,
277-
hgcalPassive:HGCalEECoolingL07F2PN, hgcalPassive:HGCalEECoolingL08F2PN,
278-
hgcalPassive:HGCalEECoolingL09F2PN, hgcalPassive:HGCalEECoolingL10F2PN,
279-
hgcalPassive:HGCalEECoolingL11F2PN, hgcalPassive:HGCalEECoolingL12F2PN,
280-
hgcalPassive:HGCalEECoolingL13F2PN, hgcalPassive:HGCalEECoolingL01F3PN,
281-
hgcalPassive:HGCalEECoolingL02F3PN, hgcalPassive:HGCalEECoolingL03F3PN,
282-
hgcalPassive:HGCalEECoolingL04F3PN, hgcalPassive:HGCalEECoolingL05F3PN,
283-
hgcalPassive:HGCalEECoolingL06F3PN, hgcalPassive:HGCalEECoolingL07F3PN,
284-
hgcalPassive:HGCalEECoolingL08F3PN, hgcalPassive:HGCalEECoolingL09F3PN,
285-
hgcalPassive:HGCalEECoolingL10F3PN, hgcalPassive:HGCalEECoolingL11F3PN,
286-
hgcalPassive:HGCalEECoolingL12F3PN, hgcalPassive:HGCalEECoolingL13F3PN,
287-
hgcalPassive:HGCalEECoolingL01F4PN, hgcalPassive:HGCalEECoolingL02F4PN,
288-
hgcalPassive:HGCalEECoolingL03F4PN, hgcalPassive:HGCalEECoolingL04F4PN,
289-
hgcalPassive:HGCalEECoolingL05F4PN, hgcalPassive:HGCalEECoolingL06F4PN,
290-
hgcalPassive:HGCalEECoolingL07F4PN, hgcalPassive:HGCalEECoolingL08F4PN,
291-
hgcalPassive:HGCalEECoolingL09F4PN, hgcalPassive:HGCalEECoolingL10F4PN,
292-
hgcalPassive:HGCalEECoolingL11F4PN, hgcalPassive:HGCalEECoolingL12F4PN,
293-
hgcalPassive:HGCalEECoolingL13F4PN, hgcalPassive:HGCalEECoolingL01F5PN,
294-
hgcalPassive:HGCalEECoolingL02F5PN, hgcalPassive:HGCalEECoolingL03F5PN,
295-
hgcalPassive:HGCalEECoolingL04F5PN, hgcalPassive:HGCalEECoolingL05F5PN,
296-
hgcalPassive:HGCalEECoolingL06F5PN, hgcalPassive:HGCalEECoolingL07F5PN,
297-
hgcalPassive:HGCalEECoolingL08F5PN, hgcalPassive:HGCalEECoolingL09F5PN,
298-
hgcalPassive:HGCalEECoolingL10F5PN, hgcalPassive:HGCalEECoolingL11F5PN,
299-
hgcalPassive:HGCalEECoolingL12F5PN, hgcalPassive:HGCalEECoolingL13F5PN</Vector>
261+
hgcalPassive:HGCalEECoolingL01F0PN, hgcalPassive:HGCalEECoolingL01F1PN,
262+
hgcalPassive:HGCalEECoolingL01F2PN, hgcalPassive:HGCalEECoolingL01F3PN,
263+
hgcalPassive:HGCalEECoolingL01F4PN, hgcalPassive:HGCalEECoolingL01F5PN,
264+
hgcalPassive:HGCalEECoolingL02F0PN, hgcalPassive:HGCalEECoolingL02F1PN,
265+
hgcalPassive:HGCalEECoolingL02F2PN, hgcalPassive:HGCalEECoolingL02F3PN,
266+
hgcalPassive:HGCalEECoolingL02F4PN, hgcalPassive:HGCalEECoolingL02F5PN,
267+
hgcalPassive:HGCalEECoolingL03F0PN, hgcalPassive:HGCalEECoolingL03F1PN,
268+
hgcalPassive:HGCalEECoolingL03F2PN, hgcalPassive:HGCalEECoolingL03F3PN,
269+
hgcalPassive:HGCalEECoolingL03F4PN, hgcalPassive:HGCalEECoolingL03F5PN,
270+
hgcalPassive:HGCalEECoolingL04F0PN, hgcalPassive:HGCalEECoolingL04F1PN,
271+
hgcalPassive:HGCalEECoolingL04F2PN, hgcalPassive:HGCalEECoolingL04F3PN,
272+
hgcalPassive:HGCalEECoolingL04F4PN, hgcalPassive:HGCalEECoolingL04F5PN,
273+
hgcalPassive:HGCalEECoolingL05F0PN, hgcalPassive:HGCalEECoolingL05F1PN,
274+
hgcalPassive:HGCalEECoolingL05F2PN, hgcalPassive:HGCalEECoolingL05F3PN,
275+
hgcalPassive:HGCalEECoolingL05F4PN, hgcalPassive:HGCalEECoolingL05F5PN,
276+
hgcalPassive:HGCalEECoolingL06F0PN, hgcalPassive:HGCalEECoolingL06F1PN,
277+
hgcalPassive:HGCalEECoolingL06F2PN, hgcalPassive:HGCalEECoolingL06F3PN,
278+
hgcalPassive:HGCalEECoolingL06F4PN, hgcalPassive:HGCalEECoolingL06F5PN,
279+
hgcalPassive:HGCalEECoolingL07F0PN, hgcalPassive:HGCalEECoolingL07F1PN,
280+
hgcalPassive:HGCalEECoolingL07F2PN, hgcalPassive:HGCalEECoolingL07F3PN,
281+
hgcalPassive:HGCalEECoolingL07F4PN, hgcalPassive:HGCalEECoolingL07F5PN,
282+
hgcalPassive:HGCalEECoolingL08F0PN, hgcalPassive:HGCalEECoolingL08F1PN,
283+
hgcalPassive:HGCalEECoolingL08F2PN, hgcalPassive:HGCalEECoolingL08F3PN,
284+
hgcalPassive:HGCalEECoolingL08F4PN, hgcalPassive:HGCalEECoolingL08F5PN,
285+
hgcalPassive:HGCalEECoolingL09F0PN, hgcalPassive:HGCalEECoolingL09F1PN,
286+
hgcalPassive:HGCalEECoolingL09F2PN, hgcalPassive:HGCalEECoolingL09F3PN,
287+
hgcalPassive:HGCalEECoolingL09F4PN, hgcalPassive:HGCalEECoolingL09F5PN,
288+
hgcalPassive:HGCalEECoolingL10F0PN, hgcalPassive:HGCalEECoolingL10F1PN,
289+
hgcalPassive:HGCalEECoolingL10F2PN, hgcalPassive:HGCalEECoolingL10F3PN,
290+
hgcalPassive:HGCalEECoolingL10F4PN, hgcalPassive:HGCalEECoolingL10F5PN,
291+
hgcalPassive:HGCalEECoolingL11F0PN, hgcalPassive:HGCalEECoolingL11F1PN,
292+
hgcalPassive:HGCalEECoolingL11F2PN, hgcalPassive:HGCalEECoolingL11F3PN,
293+
hgcalPassive:HGCalEECoolingL11F4PN, hgcalPassive:HGCalEECoolingL11F5PN,
294+
hgcalPassive:HGCalEECoolingL12F0PN, hgcalPassive:HGCalEECoolingL12F1PN,
295+
hgcalPassive:HGCalEECoolingL12F2PN, hgcalPassive:HGCalEECoolingL12F3PN,
296+
hgcalPassive:HGCalEECoolingL12F4PN, hgcalPassive:HGCalEECoolingL12F5PN,
297+
hgcalPassive:HGCalEECoolingL13F0PN, hgcalPassive:HGCalEECoolingL13F1PN,
298+
hgcalPassive:HGCalEECoolingL13F2PN, hgcalPassive:HGCalEECoolingL13F3PN,
299+
hgcalPassive:HGCalEECoolingL13F4PN, hgcalPassive:HGCalEECoolingL13F5PN</Vector>
300300
<Vector name="MaterialNames" type="string" nEntries="9">
301301
materials:Air, materials:Air, materials:Air, materials:Air,
302302
materials:StainlessSteel, materials:Air, materials:Air,

‎Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedCassette.cc‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,20 @@ void DDHGCalSiliconRotatedCassette::execute(DDCompactView& cpv) {
318318
void DDHGCalSiliconRotatedCassette::constructLayers(const DDLogicalPart& module, DDCompactView& cpv) {
319319
double zi(zMinBlock_);
320320
int laymin(0);
321+
#ifdef EDM_ML_DEBUG
322+
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: Enters constructLayers with " << layers_.size()
323+
<< " layers";
324+
#endif
321325
for (unsigned int i = 0; i < layers_.size(); i++) {
322326
double zo = zi + layerThick_[i];
323327
double routF = HGCalGeomTools::radius(zi, zFrontT_, rMaxFront_, slopeT_);
324328
int laymax = laymin + layers_[i];
325329
double zz = zi;
326330
double thickTot(0);
331+
#ifdef EDM_ML_DEBUG
332+
edm::LogVerbatim("HGCalGeom") << "DDHGCalSiliconRotatedCassette: Section " << i << " Layers " << laymin << ":"
333+
<< laymax << " zi " << zi;
334+
#endif
327335
for (int ly = laymin; ly < laymax; ++ly) {
328336
int ii = layerType_[ly];
329337
int copy = copyNumber_[ii];
@@ -392,7 +400,8 @@ void DDHGCalSiliconRotatedCassette::constructLayers(const DDLogicalPart& module,
392400
} else if (passiveMode_ > 0) {
393401
unsigned int num = (-layerSense_[ly] <= waferTypes_) ? passiveAbsorb_.size() : passiveCool_.size();
394402
if (num > 0)
395-
positionPassiveNew(glog, (copy - firstLayer_), -layerSense_[ly], cpv);
403+
positionPassiveNew(glog, i, -layerSense_[ly], cpv);
404+
// positionPassiveNew(glog, (copy - firstLayer_), -layerSense_[ly], cpv);
396405
} else {
397406
positionPassive(glog, (copy - firstLayer_), -layerSense_[ly], cpv);
398407
}

0 commit comments

Comments
 (0)