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

DD Name Cleanup #24313

Merged
merged 10 commits into from Aug 22, 2018
Merged

DD Name Cleanup #24313

merged 10 commits into from Aug 22, 2018

Conversation

ianna
Copy link
Contributor

@ianna ianna commented Aug 16, 2018

  • Disable implicit conversion of DDName to std::string

@Dr15Jones and @cvuosalo - I'd like to rewrite DDName class. Perhaps, to drop the need for singletons and replace the search on the DDname's id using is_transparent?

@cvuosalo - FYI, there are way to many string copies done unnecessarily in the algorithms.

Note: this is based on #24263

@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

It involves the following packages:

DetectorDescription/Core
DetectorDescription/OfflineDBLoader
DetectorDescription/Parser
DetectorDescription/RegressionTest
Fireworks/Geometry
Geometry/EcalCommonData
Geometry/EcalTestBeam
Geometry/HGCalCommonData
Geometry/HcalTestBeamData
Geometry/MTCCTrackerCommonData
Geometry/MTDCommonData
Geometry/TrackerCommonData
Geometry/TrackerGeometryBuilder
Geometry/TrackerNumberingBuilder
Geometry/VeryForwardGeometryBuilder
SimG4Core/Geometry
Validation/HGCalValidation

@andrius-k, @Dr15Jones, @kmaeshima, @cvuosalo, @schneiml, @ianna, @mdhildreth, @cmsbuild, @alja, @jfernan2, @kpedro88, @civanch can you please review it and eventually sign? Thanks.
@vandreev11, @sethzenz, @alja, @makortel, @jan-kaspar, @argiro, @VinInn, @ghugo83, @cseez, @bsunanda, @rovere, @venturia, @ebrondol, @lgray, @kpedro88, @pfs 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

@ianna
Copy link
Contributor Author

ianna commented Aug 16, 2018

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Aug 16, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/29875/console Started: 2018/08/16 14:31

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 31
  • DQMHistoTests: Total histograms compared: 2983575
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2983384
  • DQMHistoTests: Total skipped: 190
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
  • Checked 129 log files, 14 edm output root files, 31 DQM output files


//! \b don't \b use \b!
virtual int id() const=0; // dont't know if usefull ...
static Registry::iterator registerName( const std::pair<std::string, std::string> & s );
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of returning an iterator, which implies one could move forward, why not just return the std::pair<>?

@ianna
Copy link
Contributor Author

ianna commented Aug 17, 2018

+1

@civanch
Copy link
Contributor

civanch commented Aug 20, 2018

+1

(( myDDLRotation->size() > 0) ? myDDLRotation->getDDName( nmspace ) :
(( myDDLRefl->size() > 0) ? myDDLRefl->getDDName(nmspace) :
(( myrRefl->size() > 0 ) ? myrRefl->getDDName(nmspace) : DDName("")))));
// if (myrRotation->size() > 0){
Copy link
Contributor

Choose a reason for hiding this comment

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

delete commented-out code

if (mip.isDefined().first == nullptr) {
err=true;
curr_err += "material not declared; unknown material!";
//edm::LogError("DDCheckMaterials") << "material not declared!" << std::endl; //exit(1);
Copy link
Contributor

Choose a reason for hiding this comment

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

delete commented-out code


// recursive checking of constituents
// the composite material is not ok if only one constituent is not ok
int loop = mp.noOfConstituents() - 1;
Copy link
Contributor

Choose a reason for hiding this comment

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

why does this need to be declared outside of the loop condition?

@kpedro88
Copy link
Contributor

please also consider the earlier comment: #24313 (comment)

@ianna
Copy link
Contributor Author

ianna commented Aug 21, 2018

@kpedro88 - duly noted. Thanks.

@ianna ianna mentioned this pull request Aug 21, 2018
@kpedro88
Copy link
Contributor

+upgrade

@cmsbuild
Copy link
Contributor

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 now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

@kpedro88
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit b36a732 into cms-sw:master Aug 22, 2018
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

8 participants