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

Port Fireworks development from 71 to 72 #5271

Merged
merged 6 commits into from Sep 15, 2014

Conversation

alja
Copy link
Contributor

@alja alja commented Sep 11, 2014

  • bugfix on save of configuration
  • port changes in Fireworks/Tracksf
  • tgeo development in Fireworks/Geometry
  • cleanup of Fireworks/Geometry python scripts

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @alja (Alja Mrak-Tadel) for CMSSW_7_2_X.

Port Fireworks development from 71 to 72

It involves the following packages:

Fireworks/Core
Fireworks/FWInterface
Fireworks/Geometry
Fireworks/ParticleFlow
Fireworks/Tracks

@cmsbuild, @alja, @Dr15Jones, @ktf, @nclopezo 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.

@alja
Copy link
Contributor Author

alja commented Sep 11, 2014

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes or unless it breaks tests.

@cmsbuild
Copy link
Contributor

-1
Tested at: 0a6e42b
I found an error when building:

>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/src/FWTGeoRecoGeometryESProducer.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/src/FWTGeoRecoGeometryRecord.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/src/Reg_TGeoManager.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/src/TGeoFromDddService.cc 
>> Compiling  /build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/src/TGeoMgrFromDdd.cc 
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/plugins/ValidateGeometry.cc:91:8: error: 'void ValidateGeometry::validateTrackerGeometry(const DetUnitContainer&, const char_)' cannot be overloaded
   void validateTrackerGeometry(const TrackerGeometry::DetUnitContainer& dets, 
        ^
/build/cmsbuild/jenkins-workarea/workspace/ib-integration-CMSSW_7_2_X-slc6_amd64_gcc481/CMSSW_7_2_X_2014-09-12-0200/src/Fireworks/Geometry/plugins/ValidateGeometry.cc:88:8: error: with 'void ValidateGeometry::validateTrackerGeometry(const DetContainer&, const char_)'
   void validateTrackerGeometry(const TrackerGeometry::DetContainer& dets, 
        ^


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

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes (but tests are reportedly failing).

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_7_2_X IBs unless changes or unless it breaks tests.

@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_2_X IBs unless changes (tests are also fine).

@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_2_X IBs unless changes (tests are also fine).

davidlange6 added a commit that referenced this pull request Sep 15, 2014
Port Fireworks development from 71 to 72
@davidlange6 davidlange6 merged commit 7f420a9 into cms-sw:CMSSW_7_2_X Sep 15, 2014
@alja alja deleted the port_71_to_72 branch January 8, 2015 19:05
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

3 participants