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

MTD geometry: move topology parameters from PSet to xml, adapt the code #25417

Merged
merged 7 commits into from Dec 6, 2018

Conversation

fabiocos
Copy link
Contributor

@fabiocos fabiocos commented Dec 4, 2018

This PR follows #25352 , addressing some comments of @kpedro88 to #25063 about the propagation of mtdParameters through PSets. Now all parameters are moved from a PSet to xml files, as done for other detectors, and the MTDParametersFromDD class has been adapted accordingly.

Furthermore it addresses comments by @makortel to #25384 concerning the previous implementation of MTDTopologyMode, which was simply cloned from HCAL code. Now there is an enum Class and a function moving strings into values of this enum, both defined in a namespace MTDTopologyMode. The MTDTopologyAnalyzer class has been extended in order to dump both the original DetId built from DD (and in the MTDCommonData tests) and the information are reconstructed from the generic DetId by the MTD Topology. @lgray this class produces the output I ask you to cross check for consistency.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

A new Pull Request was created by @fabiocos (Fabio Cossutti) for master.

It involves the following packages:

CondFormats/GeometryObjects
Configuration/Geometry
Geometry/CMSCommonData
Geometry/MTDCommonData
Geometry/MTDGeometryBuilder
Geometry/MTDNumberingBuilder

@civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @franzoni, @tocheng, @ggovi, @pohsun, @kpedro88, @lpernie can you please review it and eventually sign? Thanks.
@Martin-Grunewald, @mmusich, @tocheng, @seemasharmafnal, @vargasa this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@fabiocos
Copy link
Contributor Author

fabiocos commented Dec 4, 2018

@pmeridian @casarsa FYI

@lpernie @tocheng @ggovi for CondFormats I just have added the PMTDParameters to the list of tests

@fabiocos
Copy link
Contributor Author

fabiocos commented Dec 4, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/31990/console Started: 2018/12/04 16:28

} else {
ptp.vpars_ = pars_;
}
std::list<std::string> mtdSubdet { "BTL", "ETL" };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std::array is probably better than std::list

}
std::list<std::string> mtdSubdet { "BTL", "ETL" };
int subdet(0);
for( auto name : mtdSubdet )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const auto&

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 yes, I agree it is preferable here

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 4, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

Pull request #25417 was updated. @civanch, @Dr15Jones, @cvuosalo, @ianna, @mdhildreth, @cmsbuild, @kpedro88 can you please check and sign again.

@fabiocos
Copy link
Contributor Author

fabiocos commented Dec 6, 2018

please test

@kpedro88 @cvuosalo @ianna I assume this is ok for you as there is just Carl's advice implemented after your signatures, please sign it again at the end for reference
@ggovi I will add the serialization test in a sperate PR as this is less urgent and non critical

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/32028/console Started: 2018/12/06 10:02

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

Comparison job queued.

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-25417/32028/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 8 differences found in the comparisons
  • DQMHistoTests: Total files compared: 33
  • DQMHistoTests: Total histograms compared: 3131939
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 3131734
  • DQMHistoTests: Total skipped: 204
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 32 files compared)
  • Checked 137 log files, 14 edm output root files, 33 DQM output files

@fabiocos
Copy link
Contributor Author

fabiocos commented Dec 6, 2018

+1

@kpedro88
Copy link
Contributor

kpedro88 commented Dec 6, 2018

+upgrade

@cvuosalo
Copy link
Contributor

cvuosalo commented Dec 6, 2018

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Dec 6, 2018

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 will be automatically merged.

@cmsbuild cmsbuild merged commit 27bbf6e into cms-sw:master Dec 6, 2018
forthommel pushed a commit to forthommel/cmssw that referenced this pull request Dec 10, 2018
MTD geometry: move topology parameters from PSet to xml, adapt the code
@fabiocos fabiocos deleted the fc-mtdTopology branch December 14, 2018 15:56
@fabiocos fabiocos restored the fc-mtdTopology branch December 14, 2018 15:57
@fabiocos fabiocos deleted the fc-mtdTopology branch December 20, 2018 16:49
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

5 participants