Adapting to updated vertex selection in converter (#5633)

Author: jgrosseo

Analysis/Tasks/PWGCF/correlations.cxx

@@ -58,7 +58,8 @@ struct CorrelationTask {
 
   // Filters and input definitions
   Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
-  Filter vertexTypeFilter = aod::collision::flags == (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracks || aod::collision::flags == (uint16_t)aod::collision::CollisionFlagsRun2::Run2VertexerTracksNoConstraint;
+  // TODO bitwise operations not supported, yet
+  // Filter vertexTypeFilter = aod::collision::flags & (uint16_t) aod::collision::CollisionFlagsRun2::Run2VertexerTracks;
   Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPt) && ((aod::track::isGlobalTrack == (uint8_t) true) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
   using myTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection>>;
 
@@ -163,7 +164,12 @@ struct CorrelationTask {
 
     same->fillEvent(centrality, CorrelationContainer::kCFStepTriggered);
 
-    // vertex already checked as filter
+    // vertex range already checked as filter, but bitwise operations not yet supported
+    // TODO (collision.flags() != 0) can be removed with next conversion (AliPhysics >= 20210305)
+    if ((collision.flags() != 0) && ((collision.flags() & aod::collision::CollisionFlagsRun2::Run2VertexerTracks) != aod::collision::CollisionFlagsRun2::Run2VertexerTracks)) {
+      return;
+    }
+
     same->fillEvent(centrality, CorrelationContainer::kCFStepVertex);
 
     same->fillEvent(centrality, CorrelationContainer::kCFStepReconstructed);

Framework/Core/include/Framework/DataTypes.h

@@ -15,10 +15,13 @@
 namespace o2::aod::collision
 {
 enum CollisionFlagsRun2 : uint16_t {
-  Run2VertexerTracks = 0,
-  Run2VertexerTracksNoConstraint,
-  Run2VertexerZ,
-  Run2Vertexer3D
+  Run2VertexerTracks = 0x1,
+  Run2VertexerZ = 0x2,
+  Run2Vertexer3D = 0x4,
+  // upper 8 bits for flags
+  Run2VertexerTracksWithConstraint = 0x10,
+  Run2VertexerTracksOnlyFitter = 0x20,
+  Run2VertexerTracksMultiVertex = 0x40
 };
 } // namespace o2::aod::collision
 namespace o2::aod::track