Skip to content

Commit

Permalink
Fix the bug in rpc geometry - backport of the PR's cms-sw#41907, cms-…
Browse files Browse the repository at this point in the history
…sw#41921, cms-sw#41990 from 13_2_X to 13_0_X
  • Loading branch information
Sunanda authored and jsamudio committed Jun 25, 2023
1 parent 8e1906c commit 283cd5d
Show file tree
Hide file tree
Showing 28 changed files with 674 additions and 56 deletions.
4 changes: 2 additions & 2 deletions Configuration/Geometry/python/dict2021Geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down Expand Up @@ -1444,7 +1444,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml'/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml',
'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
'Geometry/MuonCommonData/data/gem21/2023/v1/gem21.xml',
Expand Down
Loading

0 comments on commit 283cd5d

Please sign in to comment.