Skip to content
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.

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

Phase2-gem63 Include the right version of MuonNumbering file for many scenarios #34324

Merged
merged 1 commit into from Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions Configuration/Geometry/python/dict2026Geometry.py
Expand Up @@ -978,7 +978,7 @@
'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
],
2 : [
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml',
],
3 : [
'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
Expand Down Expand Up @@ -1025,7 +1025,7 @@
'Geometry/MuonCommonData/data/me0/TDR_Dev/v3/me0.xml',
],
2 : [
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml',
],
3 : [
'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
Expand Down Expand Up @@ -1072,7 +1072,7 @@
'Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml',
],
2 : [
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
],
3 : [
'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml',
Expand Down
Expand Up @@ -95,7 +95,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -95,7 +95,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -95,7 +95,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -95,7 +95,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -101,7 +101,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v5/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v3/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -96,7 +96,7 @@
<Include ref='Geometry/MTDCommonData/data/etl/v3/etl.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdStructureTopology.xml'/>
<Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml'/>
<Include ref='Geometry/EcalSimData/data/PhaseII/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
Expand Down
Expand Up @@ -98,7 +98,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -98,7 +98,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -98,7 +98,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -98,7 +98,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -104,7 +104,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v2/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down
Expand Up @@ -99,7 +99,7 @@
'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
)+
cms.vstring(
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v1/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v4/muonNumbering.xml',
'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand Down