Merge branch 'cp-algs-05-18' into 'master'

add first set of common CP algorithms to AnalysisBase

See merge request atlas/athena!32987

PhysicsAnalysis/Algorithms/SelectionHelpers/Root/SelectionHelpers.cxx

@@ -11,7 +11,7 @@
 
 #include <SelectionHelpers/SelectionHelpers.h>
 
-#include <PATCore/TAccept.h>
+#include <PATCore/AcceptData.h>
 
 //
 // method implementations
@@ -29,7 +29,7 @@ namespace CP
 
 
 
-  SelectionType selectionFromAccept (const Root::TAccept& accept)
+  SelectionType selectionFromAccept (const asg::AcceptData& accept)
   {
     return ~SelectionType (accept.getCutResultInvertedBitSet().to_ulong());
   }

PhysicsAnalysis/Algorithms/SelectionHelpers/SelectionHelpers/SelectionHelpers.h

@@ -11,17 +11,17 @@
 #include <AsgTools/MessageCheck.h>
 #include <cstdint>
 
-namespace Root
+namespace asg
 {
-  class TAccept;
+  class AcceptData;
 }
 
 namespace CP
 {
   /// \brief the type for selection decorations that are meant to hold
-  /// a \ref Root::TAccept
+  /// a \ref asg::AcceptData
   ///
-  /// This is matched to the number of bits in a TAccept, since that
+  /// This is matched to the number of bits in a AcceptData, since that
   /// holds 32 bits, so do we.
   typedef uint32_t SelectionType;
 
@@ -30,7 +30,7 @@ namespace CP
   /// selected
   ///
   /// This is to be used when making a selection decoration for a
-  /// single cut and no TAccept object is at hand, as well as to check
+  /// single cut and no AcceptData object is at hand, as well as to check
   /// whether a particular selection passed.
   inline constexpr SelectionType selectionAccept () {
     return ~SelectionType (0);}
@@ -40,7 +40,7 @@ namespace CP
   /// rejected
   ///
   /// This is to be used when making a selection decoration for a
-  /// single cut and no TAccept object is at hand.
+  /// single cut and no AcceptData object is at hand.
   inline constexpr SelectionType selectionReject () {
     return ~SelectionType (1);}
 
@@ -50,9 +50,9 @@ namespace CP
   SelectionType selectionFromBool (bool accept);
 
 
-  /// \brief the selection decoration made from the given TAccept
+  /// \brief the selection decoration made from the given AcceptData
   /// object
-  SelectionType selectionFromAccept (const Root::TAccept& accept);
+  SelectionType selectionFromAccept (const asg::AcceptData& accept);
 
 
   ANA_MSG_HEADER (msgSelectionHelpers)

Projects/AnalysisBase/package_filters.txt

@@ -8,6 +8,12 @@
 # packages get fixed up, or moved to the main list if these packages
 # are not intended for analysis.
 
+- PhysicsAnalysis/Algorithms/AsgAnalysisAlgorithms
+- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
+- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
+- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
+- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
+- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
 - PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection
 - PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection
 - PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
@@ -57,7 +63,7 @@
 + InnerDetector/InDetRecTools/InDetTrackSelectionTool
 + InnerDetector/InDetRecTools/TrackVertexAssociationTool
 + MuonSpectrometer/MuonStationIndex
-#+ PhysicsAnalysis/Algorithms/.*
++ PhysicsAnalysis/Algorithms/.*
 + PhysicsAnalysis/AnalysisCommon/AssociationUtils
 #+ PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples
 + PhysicsAnalysis/AnalysisCommon/CutBookkeeperUtils