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

Alignment geometry upgrade 81X #13976

Merged
merged 11 commits into from Apr 26, 2016

Conversation

vbotta
Copy link
Contributor

@vbotta vbotta commented Apr 7, 2016

Upgraded alignment framework to cope with Phase1 geometry.

  • including changes by Max Stark (@DirtyDan88)
  • applied minimal fixes to restore full functionality of the alignment framework
  • tested full alignment workflow incl. full module level alignment with multiple IOVs.

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2016

A new Pull Request was created by @vbotta (valeria botta) for CMSSW_8_1_X.

It involves the following packages:

Alignment/CommonAlignment
Alignment/CommonAlignmentAlgorithm
Alignment/CommonAlignmentProducer
Alignment/LaserAlignment
Alignment/TrackerAlignment

@cmsbuild, @mmusich, @franzoni, @cerminar, @davidlange6 can you please review it and eventually sign? Thanks.
@ghellwig, @pakhotin, @tocheng, @tlampen, @mschrode, @mmusich this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@mmusich
Copy link
Contributor

mmusich commented Apr 7, 2016

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/12230/console

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2016

@cmsbuild
Copy link
Contributor

cmsbuild commented Apr 7, 2016

@ghellwig
Copy link

@mmusich Is there anything left here? I was on vacation right after this PR, so I missed to check it.

@mmusich
Copy link
Contributor

mmusich commented Apr 22, 2016

@ghellwig, no it is fine.

@mmusich
Copy link
Contributor

mmusich commented Apr 22, 2016

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @slava77, @davidlange6, @Degano, @smuzaffar

@ghellwig
Copy link

thanks!


AlignableIndexer alignableIndexer;

std::vector<AlignmentLevel*> alignmentLevels;
Copy link
Contributor

Choose a reason for hiding this comment

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

could this become an unique_ptr? (otherwise you need to clean up the memory in this class, as it seems to get ownership of the pointers)

Choose a reason for hiding this comment

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

@davidlange6, if I understand the code correctly, the memory is cleaned up here:
https://github.com/vbotta/cmssw/blob/AlignmentGeometryUpgrade_81X/Alignment/TrackerAlignment/src/TrackerAlignmentLevelBuilder.cc#L32-L42

However, using smart pointers should, of course, be preferred. But it should be a shared_ptr in this case, if I am not mistaken.

Choose a reason for hiding this comment

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

I think, my comment was wrong because the objects deleted in the code referenced by me are vectors of pointers to std::vector<AlignmentLevel*>. Need to check further, how to fix that...

Choose a reason for hiding this comment

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

@davidlange6, my initial comment was right, i.e. the objects get deleted in the destructor of 'TrackerAlignmentLevelBuilder'
Since, @vbotta is currently ill, we would get some delay until she pushed the changes to use smart pointers here. That is, in case of no exception we have no leak, so should we proceed now and update the code in a separate PR?

@mmusich
Copy link
Contributor

mmusich commented Apr 26, 2016

@ghellwig please yes. This one is holding other PRs.

@ghellwig
Copy link

@davidlange6, if you agree can you please approve this?

@davidlange6
Copy link
Contributor

+1
Approving - though its hard to convince myself of how memory is managed here - partly its due to the lack of a consistent naming convention for member data that can be improved in the future.

@cmsbuild cmsbuild merged commit e44a862 into cms-sw:CMSSW_8_1_X Apr 26, 2016
@ghellwig
Copy link

@davidlange6, thank you.
I agree with you on the memory management here and also on the style of the code in general.

@ghellwig
Copy link

Just to make sure: the style comment applies to the whole alignment package.

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

7 participants