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

Geant4.9.6ref10 backward compatible modifications #1382

Merged
merged 8 commits into from Nov 11, 2013

Conversation

civanch
Copy link
Contributor

@civanch civanch commented Nov 8, 2013

Addition explicit headers from CLHEP units and physics consttants. THis modification should have no effect on any test result.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

A new Pull Request was created by @civanch (Vladimir Ivantchenko) for CMSSW_7_0_X.

Geant4.9.6ref10

It involves the following packages:

SimG4Core/Geometry
SimG4Core/SensitiveDetector
SimG4Core/Physics
SimG4Core/Generators
SimG4CMS/FP420
Alignment/LaserAlignmentSimulation
SimG4CMS/HcalTestBeam
SimG4CMS/CherenkovAnalysis
SimG4Core/Application
SimG4CMS/Forward
SimG4CMS/Muon
SimG4CMS/EcalTestBeam
SimG4CMS/Calo
SimG4Core/MagneticField
SimG4CMS/Tracker
SimG4CMS/ShowerLibraryProducer

@civanch, @nclopezo, @demattia, @mdhildreth, @cmsbuild, @rcastello, @giamman can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
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.
@ktf you are the release manager for this.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

Pull request #1382 was updated. @civanch, @nclopezo, @demattia, @mdhildreth, @cmsbuild, @rcastello, @giamman can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

Pull request #1382 was updated. @civanch, @nclopezo, @demattia, @mdhildreth, @cmsbuild, @rcastello, @giamman can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

-1
I found an error when building:

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4Core/PhysicsLists/src/CMSFTFPProtonBuilder.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4Core/PhysicsLists/src/CMSG4mplIonisation.cc 
In file included from /build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4Core/SensitiveDetector/interface/SensitiveTkDetector.h:5:0,
                 from /build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h:9,
                 from /build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.cc:22:
/build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4Core/SensitiveDetector/interface/SensitiveDetector.h:25:37: error: expected ')' before '&' token
   explicit SensitiveDetector(string & iname, const DDCompactView & cpv,
                                     ^
/build/cmsbuild/jenkins-workarea/workspace/Pull-Request-Integration/ARCHITECTURE/slc5_amd64_gcc481/CMSSW_7_0_X_2013-11-08-0200/src/SimG4Core/SensitiveDetector/interface/SensitiveDetector.h:34:25: error: 'string' has not been declared
   virtual void AssignSD(string & vname); 
                         ^


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

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

Pull request #1382 was updated. @demattia, @civanch, @mdhildreth, @rcastello, @giamman can you please check and sign again.

@nclopezo
Copy link
Contributor

nclopezo commented Nov 8, 2013

The previous tests were triggered before the commit 36dcb1b was pushed, I will trigger them again.

@civanch
Copy link
Contributor Author

civanch commented Nov 8, 2013

+1
the recent commits where correct but done by mistake due to test at wrong achitecture, this pull request is fine and should not provide any trouble

@rcastello
Copy link

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Nov 8, 2013

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

ktf added a commit that referenced this pull request Nov 11, 2013
Geant4.9.6ref10 -- backward compatible modifications
@ktf ktf merged commit c4c5e4c into cms-sw:CMSSW_7_0_X Nov 11, 2013
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