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
Restructure XML Data Directories by Year and Version #17831
Conversation
please test |
The tests are being triggered in jenkins. |
A new Pull Request was created by @ianna (Ianna Osborne) for master. It involves the following packages: Configuration/Geometry @civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @davidlange6 can you please review it and eventually sign? Thanks. cms-bot commands are listed here #13028 |
@@ -453,7 +453,7 @@ | |||
"default" : 1, | |||
"F1" : { | |||
1 : [ | |||
'Geometry/ForwardCommonData/data/v2/forwardshield.xml', | |||
'Geometry/ForwardCommonData/data/forwardshield/2015/v1/forwardshield.xml', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should 2023 use the newest version of this, or will that change come later?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kpedro88 - the new version is needed for new cavern. I'll have to use it here to avoid F duplication without actual changes. It only affects mother volumes made of Air. I'll update 2023 scenarios later. The same goes for some of the new MuonCommonData files.
please test |
The tests are being triggered in jenkins. |
Comparison job queued. |
+1 |
+1 |
This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @Muzaffar, @davidlange6, @smuzaffar |
@davidlange6 - please, integrate it before other PRs will start impeding its integration. Thanks. |
+1 |
The new structure Subsystem/Package/data/fileName/Year/Version/fileName.xml has been suggested by @davidlange6
create mode 100644 Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml
create mode 100644 Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml
create mode 100644 Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml
rename Geometry/CMSCommonData/data/{Run2 => cms/2017/v1}/cms.xml (100%)
create mode 100644 Geometry/CMSCommonData/data/cms/2017/v2/cms.xml
create mode 100644 Geometry/CMSCommonData/data/extend/v2/cmsextent.xml
create mode 100644 Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml
rename Geometry/ForwardCommonData/data/{v2 => forwardshield/2015/v1}/forwardshield.xml (100%)
create mode 100644 Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml
rename Geometry/MuonCommonData/data/{Run2 => mb1/2017/v1}/mb1.xml (100%)
rename Geometry/MuonCommonData/data/{Run2 => mb2/2017/v1}/mb2.xml (100%)
rename Geometry/MuonCommonData/data/{Run2 => mb3/2017/v1}/mb3.xml (100%)
rename Geometry/MuonCommonData/data/{Run2 => mb4/2017/v1}/mb4.xml (100%)
rename Geometry/MuonCommonData/data/{Run2 => mbCommon/2017/v1}/mbCommon.xml (100%)
create mode 100644 Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml
rename Geometry/MuonCommonData/data/{v2 => mf/2015/v1}/mf.xml (100%)
create mode 100644 Geometry/MuonCommonData/data/mf/2017/v1/mf.xml
rename Geometry/MuonCommonData/data/mb1/{2017 => 2015}/v1/mb1.xml (100%)
rename Geometry/MuonCommonData/data/mb2/{2017 => 2015}/v1/mb2.xml (100%)
rename Geometry/MuonCommonData/data/mb3/{2017 => 2015}/v1/mb3.xml (100%)
rename Geometry/MuonCommonData/data/mb4/{2017 => 2015}/v1/mb4.xml (100%)
rename Geometry/MuonCommonData/data/{ => mbCommon/2015}/v1/mbCommon.xml (100%)
rename Geometry/MuonCommonData/data/{v6 => mf/2017/v2}/mf.xml (95%)
delete mode 100644 Geometry/MuonCommonData/data/v1/mb1.xml
delete mode 100644 Geometry/MuonCommonData/data/v1/mb2.xml
delete mode 100644 Geometry/MuonCommonData/data/v1/mb3.xml
delete mode 100644 Geometry/MuonCommonData/data/v1/mb4.xml