Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

athena
- Activity
- Members
- Labels
- Terraform modules
- Incidents

Snippets Groups Projects

f405a0b4

Commit f405a0b4 authored 8 years ago by Takashi Yamanaka

Downloads
- Plain Diff

Merge branch 'UpdateAthenaRootComps_attempt2' into 'master'

Clean attempt to update AthenaRootComps and POOLRootAccess in master

See merge request !1154

parents bd6f5155 6939e7e9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Database/AthenaRoot/AthenaRootComps/python/ReadAthenaRoot.py 25 additions, 28 deletions

Database/AthenaRoot/AthenaRootComps/python/ReadAthenaRoot.py
Database/AthenaRoot/AthenaRootComps/python/ReadAthenaxAOD.py 22 additions, 34 deletions

Database/AthenaRoot/AthenaRootComps/python/ReadAthenaxAOD.py
Database/AthenaRoot/AthenaRootComps/python/ReadAthenaxAODHybrid.py 33 additions, 50 deletions

...AthenaRoot/AthenaRootComps/python/ReadAthenaxAODHybrid.py
Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx 28 additions, 6 deletions

...thenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx 57 additions, 13 deletions

...base/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h 2 additions, 0 deletions

Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
PhysicsAnalysis/POOLRootAccess/test/POOLRootAccess.xml 12 additions, 1 deletion

PhysicsAnalysis/POOLRootAccess/test/POOLRootAccess.xml
PhysicsAnalysis/POOLRootAccess/test/ut_elementLink_test.py 20 additions, 0 deletions

PhysicsAnalysis/POOLRootAccess/test/ut_elementLink_test.py

with 199 additions and 132 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment