Merge branch 'master' into femtoworld

Author: zchochul

CODEOWNERS

@@ -26,8 +26,8 @@
 /EventFiltering/PWGMM @alibuild @aortizve
 /EventFiltering/PWGJE @alibuild @fkrizek
 /PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
-/PWGDQ @alibuild @iarsene @dsekihat
-/PWGEM @alibuild @mikesas @rbailhac
+/PWGDQ @alibuild @iarsene @dsekihat @feisenhu
+/PWGEM @alibuild @mikesas @rbailhac @feisenhu
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky
 /PWGHF @alibuild @ginnocen @vkucera @fcolamar @cterrevo

Common/Core/TrackSelection.h

@@ -46,6 +46,12 @@ class TrackSelection
     kNCuts
   };
 
+  enum GlobalTrackRun3ITSMatching {
+    Run3ITSibAny,
+    Run3ITSallAny,
+    Run3ITSall7Layers
+  };
+
   static const std::string mCutNames[static_cast<int>(TrackCuts::kNCuts)];
 
   // Temporary function to check if track passes selection criteria. To be replaced by framework filters.

Common/Core/TrackSelectionDefaults.h

@@ -19,6 +19,7 @@
 #define TrackSelectionDefaults_H
 
 #include "Framework/DataTypes.h"
+#include "Common/Core/TrackSelection.h"
 
 // Default track selection requiring one hit in the SPD
 TrackSelection getGlobalTrackSelection()
@@ -40,6 +41,43 @@ TrackSelection getGlobalTrackSelection()
   return selectedTracks;
 }
 
+// Default track selection requiring a particular Run 3 ITS matching
+TrackSelection getGlobalTrackSelectionITSMatch(int matching)
+{
+  std::pair<int8_t, std::set<unsigned char>> itsMatching;
+  switch (matching) {
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSibAny:
+      itsMatching = std::make_pair((int8_t)1, (std::set<unsigned char>){0, 1, 2});
+      break;
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSallAny:
+      itsMatching = std::make_pair((int8_t)1, (std::set<unsigned char>){0, 1, 2, 3, 4, 5, 6});
+      break;
+    case TrackSelection::GlobalTrackRun3ITSMatching::Run3ITSall7Layers:
+      itsMatching = std::make_pair((int8_t)7, (std::set<unsigned char>){0, 1, 2, 3, 4, 5, 6});
+      break;
+
+    default:
+      LOG(fatal) << "getGlobalTrackSelectionITSMatch with undefined ITS matching";
+      break;
+  }
+
+  TrackSelection selectedTracks;
+  selectedTracks.SetTrackType(o2::aod::track::Run2Track);
+  selectedTracks.SetPtRange(0.1f, 1e10f);
+  selectedTracks.SetEtaRange(-0.8f, 0.8f);
+  selectedTracks.SetRequireITSRefit(true);
+  selectedTracks.SetRequireTPCRefit(true);
+  selectedTracks.SetRequireGoldenChi2(true);
+  selectedTracks.SetMinNCrossedRowsTPC(70);
+  selectedTracks.SetMinNCrossedRowsOverFindableClustersTPC(0.8f);
+  selectedTracks.SetMaxChi2PerClusterTPC(4.f);
+  selectedTracks.SetRequireHitsInITSLayers(itsMatching.first, itsMatching.second);
+  selectedTracks.SetMaxChi2PerClusterITS(36.f);
+  selectedTracks.SetMaxDcaXYPtDep([](float pt) { return 0.0105f + 0.0350f / pow(pt, 1.1f); });
+  selectedTracks.SetMaxDcaZ(2.f);
+  return selectedTracks;
+}
+
 // Default track selection requiring no hit in the SPD and one in the innermost
 // SDD -> complementary tracks to global selection
 TrackSelection getGlobalTrackSelectionSDD()