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

Changed the interface to work with sherpa2. #3474

Merged
merged 1 commit into from Apr 24, 2014
Merged

Changed the interface to work with sherpa2. #3474

merged 1 commit into from Apr 24, 2014

Conversation

ghost
Copy link

@ghost ghost commented Apr 24, 2014

The main changes to previous interface for sherpa2 is the change in the handling of the random nuber engine, here an unnamed namespace is used to store the first reference to the RNG to hand it over to the Sherpa external RNG class.

…ous interface for sherpa2 is the change in the handling of the random nuber engine, here an unnamed namespace is used to store the first reference to the RNG to hand it over to the Sherpa external RNG class
@ghost
Copy link
Author

ghost commented Apr 24, 2014

This PR should test correctly after 240414-1400 IB.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Degano (Alessandro Degano) for CMSSW_7_1_X.

Changed the interface to work with sherpa2.

It involves the following packages:

GeneratorInterface/SherpaInterface

@vciulli, @nclopezo, @thuer, @cmsbuild, @bendavid, @Degano 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.
@nclopezo, @ktf you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

@vciulli
Copy link
Contributor

vciulli commented Apr 24, 2014

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_1_X IBs unless changes or unless it breaks tests. @nclopezo, @ktf can you please take care of it?

@thuer thuer mentioned this pull request Apr 24, 2014
@cmsbuild
Copy link
Contributor

-1
I found an error when building:

>> Leaving Package FWCore/Version
>> Package FWCore/Version built
>> Subsystem FWCore built
In file included from /afs/cern.ch/cms/sw/ReleaseCandidates/vol1/slc6_amd64_gcc481/external/sherpa/1.4.2-cms3/include/SHERPA-MC/ATOOLS/Math/Random.H:8:0,
                 from /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/GeneratorInterface/SherpaInterface/src/SherpaHadronizer.cc:13:
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_1_X-slc6_amd64_gcc481/CMSSW_7_1_X_2014-04-24-0200/src/GeneratorInterface/SherpaInterface/src/SherpaHadronizer.cc:321:16: error: redefinition of 'class CMS_SHERPA_RNG'
 DECLARE_GETTER(CMS_SHERPA_RNG,"CMS_SHERPA_RNG",ATOOLS::External_RNG,ATOOLS::RNG_Key);
                ^
/afs/cern.ch/cms/sw/ReleaseCandidates/vol1/slc6_amd64_gcc481/external/sherpa/1.4.2-cms3/include/SHERPA-MC/ATOOLS/Org/Getter_Function.H:74:9: note: in definition of macro 'DECLARE_GETTER_BASE'
   class NAME: public ATOOLS::Getter_Function { \
         ^


you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-3474/1014/summary.html

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_1_X IBs unless changes (but tests are reportedly failing). @nclopezo, @ktf can you please take care of it?

@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_1_X IBs unless changes (tests are also fine). @nclopezo, @ktf can you please take care of it?

ktf added a commit that referenced this pull request Apr 24, 2014
Generators -- Changed the interface to work with sherpa2.
@ktf ktf merged commit 048d9bc into cms-sw:CMSSW_7_1_X Apr 24, 2014
@ktf
Copy link
Contributor

ktf commented Apr 24, 2014

Apologies to @Degano for the cursing...;)

@ghost ghost deleted the sherpa_210_71X branch April 25, 2014 06:42
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