Skip to content

Commit

Permalink
Merge pull request #41558 from bsunanda/Run3-gex160Y
Browse files Browse the repository at this point in the history
Run3-gex160Y Backport of #41464 to CMSSW version 13_1_X which contains a bug fix for ZDC simulation geometry
  • Loading branch information
cmsbuild authored May 21, 2023
2 parents f6fc5c0 + 8d7ac90 commit ccbe252
Show file tree
Hide file tree
Showing 26 changed files with 1,745 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dict2021Geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumirotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml'/>
<Include ref='Geometry/ForwardCommonData/data/cmszdc.xml'/>
<Include ref='Geometry/VeryForwardData/data/RP_Box.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v1/zdc.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v2/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
'Geometry/VeryForwardData/data/RP_Box.xml',
Expand Down
Loading

0 comments on commit ccbe252

Please sign in to comment.