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

Fixes for compatibility with pythia8 212 #11495

Merged
merged 3 commits into from
Sep 29, 2015

Conversation

mkirsano
Copy link
Contributor

No description provided.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @mkirsano (Mikhail Kirsanov) for CMSSW_7_6_X.

Fixes for compatibility with pythia8 212

It involves the following packages:

GeneratorInterface/Pythia8Interface

@vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @govoni can you please review it and eventually sign? Thanks.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
If you are a L2 or a release manager you can ask for tests by saying 'please test' in the first line of a comment.
@Degano you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@mkirsano
Copy link
Contributor Author

Fixes for compatibility with pythia8 212 (PR cmsdist #1840). Compatible also with pythia8 210, so can be made first.

@@ -1,5 +1,7 @@
#include "Pythia8/Pythia.h"

using namespace Pythia8;
Copy link
Contributor

Choose a reason for hiding this comment

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

Don't think we should have "using namespace" in a header file.

@bendavid
Copy link
Contributor

The fix implemented here can cause a memory leak I think. The pointer to fEvAttributes should be initialized to 0 in the constructor of LHAupLesHouches, then
"fEvAttributes = new std::map<std::string, std::string >;"
could be replaced with
"if (fEvAttributes) {
fEvAttributes->clear();
} else {
fEvAttributes = new std::map<std::string, std::string >;
}
"

(then if the pointer is non-zero it should also be deleted in the destructor for LHAupLesHouches)

@mkirsano
Copy link
Contributor Author

Thanks, Josh, I correct it. I always forget that there can be several runs.

@cmsbuild
Copy link
Contributor

Pull request #11495 was updated. @vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @govoni can you please check and sign again.

@cmsbuild
Copy link
Contributor

Pull request #11495 was updated. @vciulli, @covarell, @thuer, @cmsbuild, @bendavid, @govoni can you please check and sign again.

@bendavid
Copy link
Contributor

+1
(contingent on taking cms-sw/cmsdist#1840 of course)

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

@bendavid
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

The tests are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_6_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

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

@davidlange6
Copy link
Contributor

+1

cmsbuild added a commit that referenced this pull request Sep 29, 2015
Fixes for compatibility with pythia8 212
@cmsbuild cmsbuild merged commit 9328253 into cms-sw:CMSSW_7_6_X Sep 29, 2015
@cmsbuild
Copy link
Contributor

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.

4 participants