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

Restructure XML Data Directories by Year and Version Step 2 #17844

Merged
merged 4 commits into from Mar 13, 2017

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Mar 9, 2017

  • Further restructuring XML data directories by year and version
  • Duplicate files are removed

This PR is based on fully signed and tested #17831

In addition it integrates GE11 overlap fix from #17830 in a new directory structure.

rename Geometry/MuonCommonData/data/{v2 => csc/2015/v1}/csc.xml (100%)
rename Geometry/MuonCommonData/data/{v2 => mfshield/2015/v1}/mfshield.xml (100%)
create mode 100644 Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml
rename Geometry/MuonCommonData/data/{PhaseII => mfshield/2023/v1}/mfshield.xml (100%)
rename Geometry/MuonCommonData/data/{v2 => muonNumbering/2015/v1}/muonNumbering.xml (100%)
rename Geometry/MuonCommonData/data/{v6/muonGemNumbering17.xml => muonNumbering/2017/v1/muonNumbering.xml} (100%)
rename Geometry/MuonCommonData/data/{v6 => muonNumbering/2019/v1}/muonGemNumbering.xml (100%)
rename Geometry/MuonCommonData/data/{v2 => rpcf/2015/v1}/rpcf.xml (100%)
rename Geometry/MuonCommonData/data/{PhaseII => rpcf/2023/v1}/rpcf.xml (100%)
delete mode 100644 Geometry/MuonCommonData/data/v2/muonGemNumbering.xml

	renamed:    Geometry/MuonCommonData/data/v2/csc.xml -> Geometry/MuonCommonData/data/csc/2015/v1/csc.xml
	renamed:    Geometry/MuonCommonData/data/v2/mfshield.xml -> Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml
	new file:   Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml
	renamed:    Geometry/MuonCommonData/data/PhaseII/mfshield.xml -> Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml
	renamed:    Geometry/MuonCommonData/data/v2/muonNumbering.xml -> Geometry/MuonCommonData/data/muonNumbering/2015/v1/muonNumbering.xml
	renamed:    Geometry/MuonCommonData/data/v6/muonGemNumbering17.xml -> Geometry/MuonCommonData/data/muonNumbering/2017/v1/muonNumbering.xml
	renamed:    Geometry/MuonCommonData/data/v6/muonGemNumbering.xml -> Geometry/MuonCommonData/data/muonNumbering/2019/v1/muonGemNumbering.xml
	renamed:    Geometry/MuonCommonData/data/v2/rpcf.xml -> Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml
	renamed:    Geometry/MuonCommonData/data/PhaseII/rpcf.xml -> Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml
	deleted:    Geometry/MuonCommonData/data/v2/muonGemNumbering.xml
@ianna
Copy link
Contributor Author

ianna commented Mar 9, 2017

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/18274/console Started: 2017/03/09 11:15

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

A new Pull Request was created by @ianna (Ianna Osborne) for master.

It involves the following packages:

Configuration/Geometry
Geometry/CMSCommonData
Geometry/ForwardCommonData
Geometry/MuonCommonData

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @kpedro88, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @ptcox, @Martin-Grunewald this is something you requested to watch as well.
@Muzaffar, @davidlange6, @smuzaffar you are the release manager for this.

cms-bot commands are listed here #13028

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

Comparison job queued.

@ianna
Copy link
Contributor Author

ianna commented Mar 9, 2017

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

@kpedro88
Copy link
Contributor

kpedro88 commented Mar 9, 2017

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Mar 9, 2017

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

@ianna
Copy link
Contributor Author

ianna commented Mar 10, 2017

@davidlange6 - If you have any objections against integrating this PR, please, list them here. It would be good to put at least one IB between it and further modifications.

@davidlange6
Copy link
Contributor

davidlange6 commented Mar 10, 2017 via email

@ianna
Copy link
Contributor Author

ianna commented Mar 10, 2017

@davidlange6 - thanks!

@ianna
Copy link
Contributor Author

ianna commented Mar 13, 2017

@davidlange6 - Please, list your objections for this PR integration here so that I could address them. Thanks.

@davidlange6
Copy link
Contributor

+1

@davidlange6
Copy link
Contributor

just had not gotten to it..

@cmsbuild cmsbuild merged commit 976040b into cms-sw:master Mar 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants