init utilsTpcSkimsTableCreator, move event selection there

Author: lubynets

DPG/Tasks/TPC/tpcSkimsTableCreator.cxx

@@ -19,6 +19,8 @@
 
 #include "tpcSkimsTableCreator.h"
 
+#include "utilsTpcSkimsTableCreator.h"
+
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
@@ -54,6 +56,7 @@ using namespace o2::framework;
 using namespace o2::framework::expressions;
 using namespace o2::track;
 using namespace o2::dataformats;
+using namespace o2::dpg_tpcskimstablecreator;
 
 struct TreeWriterTpcV0 {
 
@@ -126,21 +129,6 @@ struct TreeWriterTpcV0 {
     DaughterProton
   };
 
-  enum {
-    TrackSelectionNoCut = 0,
-    TrackSelectionGlobalTrack,
-    TrackSelectionTrackWoPtEta,
-    TrackSelectionGlobalTrackWoDCA,
-    TrackSelectionQualityTracks,
-    TrackSelectionInAcceptanceTracks
-  };
-
-  enum {
-    EventSelectionNo = 0,
-    EventSelectionRun2,
-    EventSelectionRun3
-  };
-
   Filter trackFilter = (trackSelection.node() == static_cast<int>(TrackSelectionNoCut)) ||
                        ((trackSelection.node() == static_cast<int>(TrackSelectionGlobalTrack)) && requireGlobalTrackInFilter()) ||
                        ((trackSelection.node() == static_cast<int>(TrackSelectionTrackWoPtEta)) && requireGlobalTrackWoPtEtaInFilter()) ||
@@ -428,22 +416,6 @@ struct TreeWriterTpcV0 {
     }
   };
 
-  /// Event selection
-  template <typename CollisionType, typename TrackType>
-  bool isEventSelected(const CollisionType& collision, const TrackType& /*tracks*/)
-  {
-    if (applyEvSel == EventSelectionRun2) {
-      if (!collision.sel7()) {
-        return false;
-      }
-    } else if (applyEvSel == EventSelectionRun3) {
-      if (!collision.sel8()) {
-        return false;
-      }
-    }
-    return true;
-  };
-
   void init(o2::framework::InitContext&)
   {
     const std::array<bool, 7> doprocess{doprocessStandard, doprocessStandardWithCorrecteddEdx, doprocessWithdEdxTrQA, doprocessWithdEdxTrQAWithCorrecteddEdx, doprocessWithTrQA, doprocessWithTrQAWithCorrecteddEdx, doprocessDummy};
@@ -497,7 +469,7 @@ struct TreeWriterTpcV0 {
   void runStandard(Colls::iterator const& collision, soa::Filtered<TrksType> const& tracks, V0sWithID const& v0s, CascsWithID const& cascs)
   {
     /// Check event slection
-    if (!isEventSelected(collision, tracks)) {
+    if (!isEventSelected(collision, applyEvSel)) {
       return;
     }
     const auto& bc = collision.bc_as<aod::BCsWithTimestamps>();
@@ -574,7 +546,7 @@ struct TreeWriterTpcV0 {
     for (const auto& collision : collisions) {
       /// Check event slection
       const auto& tracks = myTracks.sliceBy(perCollisionTracksType, collision.globalIndex());
-      if (!isEventSelected(collision, tracks)) {
+      if (!isEventSelected(collision, applyEvSel)) {
         continue;
       }
       const auto& v0s = myV0s.sliceBy(perCollisionV0s, collision.globalIndex());
@@ -757,21 +729,6 @@ struct TreeWriterTPCTOF {
   Configurable<float> downsamplingTsalisKaons{"downsamplingTsalisKaons", -1., "Downsampling factor to reduce the number of kaons"};
   Configurable<float> downsamplingTsalisPions{"downsamplingTsalisPions", -1., "Downsampling factor to reduce the number of pions"};
 
-  enum {
-    TrackSelectionNoCut = 0,
-    TrackSelectionGlobalTrack,
-    TrackSelectionTrackWoPtEta,
-    TrackSelectionGlobalTrackWoDCA,
-    TrackSelectionQualityTracks,
-    TrackSelectionInAcceptanceTracks
-  };
-
-  enum {
-    EventSelectionNo = 0,
-    EventSelectionRun2,
-    EventSelectionRun3
-  };
-
   Filter trackFilter = (trackSelection.node() == static_cast<int>(TrackSelectionNoCut)) ||
                        ((trackSelection.node() == static_cast<int>(TrackSelectionGlobalTrack)) && requireGlobalTrackInFilter()) ||
                        ((trackSelection.node() == static_cast<int>(TrackSelectionTrackWoPtEta)) && requireGlobalTrackWoPtEtaInFilter()) ||
@@ -955,22 +912,6 @@ struct TreeWriterTPCTOF {
     }
   }
 
-  /// Event selection
-  template <typename CollisionType, typename TrackType>
-  bool isEventSelected(const CollisionType& collision, const TrackType& /*tracks*/)
-  {
-    if (applyEvSel == EventSelectionRun2) {
-      if (!collision.sel7()) {
-        return false;
-      }
-    } else if (applyEvSel == EventSelectionRun3) {
-      if (!collision.sel8()) {
-        return false;
-      }
-    }
-    return true;
-  };
-
   void init(o2::framework::InitContext&)
   {
     const std::array<bool, 7> doprocess{doprocessStandard, doprocessStandardWithCorrecteddEdx, doprocessWithdEdxTrQA, doprocessWithdEdxTrQAWithCorrecteddEdx, doprocessWithTrQA, doprocessWithTrQAWithCorrecteddEdx, doprocessDummy};
@@ -998,7 +939,7 @@ struct TreeWriterTPCTOF {
   void runStandard(Colls::iterator const& collision, soa::Filtered<TrksType> const& tracks)
   {
     /// Check event selection
-    if (!isEventSelected(collision, tracks)) {
+    if (!isEventSelected(collision, applyEvSel)) {
       return;
     }
     const auto& bc = collision.bc_as<aod::BCsWithTimestamps>();
@@ -1055,7 +996,7 @@ struct TreeWriterTPCTOF {
     for (const auto& collision : collisions) {
       /// Check event selection
       const auto& tracks = myTracks.sliceBy(perCollisionTracksType, collision.globalIndex());
-      if (!isEventSelected(collision, tracks)) {
+      if (!isEventSelected(collision, applyEvSel)) {
         continue;
       }
       const auto& tracksWithITSPid = soa::Attach<TrksType,

DPG/Tasks/TPC/utilsTpcSkimsTableCreator.h

@@ -0,0 +1,57 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+/// \file utilsTpcSkimsTableCreator.h
+/// \author Annalena Kalteyer <annalena.sophie.kalteyer@cern.ch>
+/// \author Christian Sonnabend <christian.sonnabend@cern.ch>
+/// \author Jeremy Wilkinson <jeremy.wilkinson@cern.ch>
+/// \author Ana Marin <ana.marin@cern.ch>
+/// \author Oleksii Lubynets <oleksii.lubynets@cern.ch>
+/// \brief  Helper functions used both in V0 and TOF structs of tpcSkimsTableCreator.cxx
+
+#ifndef DPG_TASKS_TPC_UTILSTPCSKIMSTABLECREATOR_H_
+#define DPG_TASKS_TPC_UTILSTPCSKIMSTABLECREATOR_H_
+
+namespace o2::dpg_tpcskimstablecreator
+{
+enum {
+  TrackSelectionNoCut = 0,
+  TrackSelectionGlobalTrack,
+  TrackSelectionTrackWoPtEta,
+  TrackSelectionGlobalTrackWoDCA,
+  TrackSelectionQualityTracks,
+  TrackSelectionInAcceptanceTracks
+};
+
+enum {
+  EventSelectionNo = 0,
+  EventSelectionRun2,
+  EventSelectionRun3
+};
+
+/// Event selection
+template <typename CollisionType>
+bool isEventSelected(const CollisionType& collision, const int applyEvSel)
+{
+  if (applyEvSel == EventSelectionRun2) {
+    if (!collision.sel7()) {
+      return false;
+    }
+  } else if (applyEvSel == EventSelectionRun3) {
+    if (!collision.sel8()) {
+      return false;
+    }
+  }
+  return true;
+};
+
+} // namespace o2::dpg_tpcskimstablecreator
+#endif // DPG_TASKS_TPC_UTILSTPCSKIMSTABLECREATOR_H_