Merge remote-tracking branch 'upstream/master' into master-dijetmatcher-2, generalize
Also: code rationlization, removal of now unnecessary classes, generalize MaximumBipartiteGroupsMatcherMT for non sharing jet groups of size > 1.
Showing
- AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py 1 addition, 1 deletion...st/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
- AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.ref 337 additions, 327 deletions...t/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.ref
- AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTestMT.ref 397 additions, 387 deletions...AthenaPoolTest/share/DoubleEventSelectorOverlayTestMT.ref
- Calorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt 1 addition, 2 deletionsCalorimeter/CaloCnv/CaloIdCnv/CMakeLists.txt
- Calorimeter/CaloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc 2 additions, 2 deletions...aloCnv/CaloIdCnv/CaloIdCnv/CaloIDHelper_IDDetDescrCnv.icc
- Calorimeter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx 2 additions, 2 deletions...eter/CaloCnv/CaloIdCnv/src/CaloIDHelper_IDDetDescrCnv.cxx
- Control/AthLinks/AthLinks/DataLink.h 2 additions, 2 deletionsControl/AthLinks/AthLinks/DataLink.h
- Control/AthLinks/AthLinks/DataLink.icc 2 additions, 2 deletionsControl/AthLinks/AthLinks/DataLink.icc
- Control/AthLinks/AthLinks/exceptions.h 17 additions, 11 deletionsControl/AthLinks/AthLinks/exceptions.h
- Control/AthLinks/test/DataLink_test.cxx 2 additions, 2 deletionsControl/AthLinks/test/DataLink_test.cxx
- Control/AthenaCommon/python/AthOptionsParser.py 1 addition, 6 deletionsControl/AthenaCommon/python/AthOptionsParser.py
- Control/AthenaConfiguration/python/AllConfigFlags.py 25 additions, 6 deletionsControl/AthenaConfiguration/python/AllConfigFlags.py
- Control/AthenaConfiguration/python/ArgsToFlags.py 1 addition, 1 deletionControl/AthenaConfiguration/python/ArgsToFlags.py
- Control/AthenaConfiguration/python/AthConfigFlags.py 16 additions, 5 deletionsControl/AthenaConfiguration/python/AthConfigFlags.py
- Control/AthenaConfiguration/python/AutoConfigFlags.py 2 additions, 0 deletionsControl/AthenaConfiguration/python/AutoConfigFlags.py
- Control/AthenaConfiguration/python/ComponentAccumulator.py 28 additions, 26 deletionsControl/AthenaConfiguration/python/ComponentAccumulator.py
- Control/AthenaConfiguration/python/ComponentAccumulatorTest.py 20 additions, 13 deletions...ol/AthenaConfiguration/python/ComponentAccumulatorTest.py
- Control/AthenaConfiguration/python/Deduplication.py 4 additions, 2 deletionsControl/AthenaConfiguration/python/Deduplication.py
- Control/AthenaConfiguration/python/DetectorConfigFlags.py 3 additions, 1 deletionControl/AthenaConfiguration/python/DetectorConfigFlags.py
- Control/AthenaConfiguration/python/MainServicesConfig.py 2 additions, 0 deletionsControl/AthenaConfiguration/python/MainServicesConfig.py
Loading
Please register or sign in to comment