Add selection of track sources for p.vertexing, vtx/track matching

shahor02 · shahor02 · commit 596a7ab1ec89 · 2021-03-01T09:31:52.000+01:00
diff --git a/Detectors/GlobalTrackingWorkflow/README.md b/Detectors/GlobalTrackingWorkflow/README.md
@@ -4,6 +4,14 @@
 
 # Global tracking workflows
 
+## Primary vertexer and vertex-track matcher
+
+Builds primary vertices from all allowed sources (currently by default: ITS, ITS-TPC, ITS-TPC-TOF, can be reduced with `--vertexing-sources <source0,source1...>`) and if builds a vector of indices (`VtxTrackIndex`) of tracks from every source (currently by default: ITS, TPC, ITS-TPC, TPC-TOF, ITS-TPC-TOF, can be reduced with `--vetex-track-matching-sources`) which either contributes to vertex (flagged) or matches to it time-wise (ambiguous matches are flagged). To disable vertex tracks matching used `--vetex-track-matching-sources none`.
+```cpp
+o2-primary-vertexing-workflow
+```
+The list of track sources used for vertexing can be steer
+
 ## Cosmics tracker
 
 Matches and refits top-bottom legs of cosmic tracks. A test case:
@@ -18,4 +26,6 @@ o2-tof-matcher-tpc   --shm-segment-size 10000000000 --run | tee recTOF_TPC.log
 o2-cosmics-match-workflow --shm-segment-size 10000000000 --run | tee cosmics.log
 ```
 
-One can account contributions of a limited set of detectors only (by default: ITS, TPC, [TRD] and TOF) by providing optiont `--skipDet` or `--onlyDet`.
+One can account contributions of a limited set of track sources (currently by default: ITS, TPC, ITS-TPC, TPC-TOF, ITS-TPC-TOF) by providing optiont `--track-sources`.
+
+
diff --git a/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/PrimaryVertexingSpec.h b/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/PrimaryVertexingSpec.h
@@ -45,7 +45,7 @@ class PrimaryVertexingSpec : public Task
 };
 
 /// create a processor spec
-DataProcessorSpec getPrimaryVertexingSpec(DetID::mask_t dets, bool validateWithFT0, bool useMC);
+DataProcessorSpec getPrimaryVertexingSpec(GTrackID::mask_t src, bool validateWithFT0, bool useMC);
 
 } // namespace vertexing
 } // namespace o2
diff --git a/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/VertexTrackMatcherSpec.h b/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/VertexTrackMatcherSpec.h
@@ -26,6 +26,7 @@ namespace vertexing
 {
 
 using namespace o2::framework;
+using GTrackID = o2::dataformats::GlobalTrackID;
 
 class VertexTrackMatcherSpec : public Task
 {
@@ -42,7 +43,7 @@ class VertexTrackMatcherSpec : public Task
 };
 
 /// create a processor spec
-DataProcessorSpec getVertexTrackMatcherSpec(o2::detectors::DetID::mask_t dets);
+DataProcessorSpec getVertexTrackMatcherSpec(GTrackID::mask_t src);
 
 } // namespace vertexing
 } // namespace o2
diff --git a/Detectors/GlobalTrackingWorkflow/src/PrimaryVertexingSpec.cxx b/Detectors/GlobalTrackingWorkflow/src/PrimaryVertexingSpec.cxx
@@ -146,23 +146,20 @@ void PrimaryVertexingSpec::endOfStream(EndOfStreamContext& ec)
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
 
-DataProcessorSpec getPrimaryVertexingSpec(DetID::mask_t dets, bool validateWithFT0, bool useMC)
+DataProcessorSpec getPrimaryVertexingSpec(GTrackID::mask_t src, bool validateWithFT0, bool useMC)
 {
   std::vector<OutputSpec> outputs;
-  if (dets[DetID::ITS]) {
+  if (src[GTrackID::ITS]) {
     dataRequest.requestITSTracks(useMC);
   }
-  if (dets[DetID::TPC]) {
+  if (src[GTrackID::ITSTPC] || src[GTrackID::ITSTPCTOF]) { // ITSTPCTOF does not provide tracks, only matchInfo
     dataRequest.requestITSTPCTracks(useMC);
-    if (dets[DetID::TRD]) {
-      // RSTODO will add once TRD tracking available
-    }
-    if (dets[DetID::TOF]) {
-      dataRequest.requestTOFMatches(useMC);
-      dataRequest.requestTOFClusters(false);
-    }
   }
-  if (validateWithFT0 && dets[DetID::FT0]) {
+  if (src[GTrackID::ITSTPCTOF]) {
+    dataRequest.requestTOFMatches(useMC);
+    dataRequest.requestTOFClusters(false);
+  }
+  if (validateWithFT0 && src[GTrackID::FT0]) {
     dataRequest.requestFT0RecPoints(false);
   }
 
diff --git a/Detectors/GlobalTrackingWorkflow/src/VertexTrackMatcherSpec.cxx b/Detectors/GlobalTrackingWorkflow/src/VertexTrackMatcherSpec.cxx
@@ -71,27 +71,27 @@ void VertexTrackMatcherSpec::endOfStream(EndOfStreamContext& ec)
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
 
-DataProcessorSpec getVertexTrackMatcherSpec(DetID::mask_t dets)
+DataProcessorSpec getVertexTrackMatcherSpec(GTrackID::mask_t src)
 {
   std::vector<OutputSpec> outputs;
 
-  if (dets[DetID::ITS]) {
+  if (src[GTrackID::ITS]) {
     dataRequestV2T.requestITSTracks(false);
   }
-  if (dets[DetID::TPC]) {
-    dataRequestV2T.requestITSTPCTracks(false);
+  if (src[GTrackID::TPC]) {
     dataRequestV2T.requestTPCTracks(false);
-    if (dets[DetID::TRD]) {
-      // RSTODO will add once TRD tracking available
-    }
-    if (dets[DetID::TOF]) {
-      dataRequestV2T.requestTPCTOFTracks(false);
-      dataRequestV2T.requestTOFClusters(false);
-      if (dets[DetID::ITS]) {
-        dataRequestV2T.requestTOFMatches(false);
-      }
-    }
   }
+  if (src[GTrackID::ITSTPC] || src[GTrackID::ITSTPCTOF]) { // ITSTPCTOF does not provide tracks, only matchInfo
+    dataRequestV2T.requestITSTPCTracks(false);
+  }
+  if (src[GTrackID::ITSTPCTOF]) {
+    dataRequestV2T.requestTOFMatches(false);
+    dataRequestV2T.requestTOFClusters(false);
+  }
+  if (src[GTrackID::TPCTOF]) {
+    dataRequestV2T.requestTPCTOFTracks(false);
+  }
+
   auto& inputs = dataRequestV2T.inputs;
   inputs.emplace_back("vertices", "GLO", "PVTX", 0, Lifetime::Timeframe);
   inputs.emplace_back("vtxTracks", "GLO", "PVTX_CONTID", 0, Lifetime::Timeframe);
diff --git a/Detectors/GlobalTrackingWorkflow/src/primary-vertexing-workflow.cxx b/Detectors/GlobalTrackingWorkflow/src/primary-vertexing-workflow.cxx
@@ -17,12 +17,14 @@
 #include "TOFWorkflow/TOFMatchedReaderSpec.h"
 #include "TOFWorkflowUtils/ClusterReaderSpec.h"
 #include "FT0Workflow/RecPointReaderSpec.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "DetectorsCommonDataFormats/DetID.h"
 #include "CommonUtils/ConfigurableParam.h"
 #include "Framework/CompletionPolicy.h"
 #include "Framework/ConfigParamSpec.h"
 
 using namespace o2::framework;
+using GID = o2::dataformats::GlobalTrackID;
 using DetID = o2::detectors::DetID;
 // ------------------------------------------------------------------
 
@@ -34,10 +36,9 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
     {"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation"}},
     {"disable-root-input", o2::framework::VariantType::Bool, false, {"disable root-files input reader"}},
     {"disable-root-output", o2::framework::VariantType::Bool, false, {"disable root-files output writer"}},
-    {"onlyDet", VariantType::String, std::string{DetID::NONE}, {"comma-separated list of detectors to use. Overrides skipDet"}},
-    {"skipDet", VariantType::String, std::string{DetID::NONE}, {"comma-separate list of detectors to skip"}},
+    {"vertexing-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use in vertexing"}},
     {"validate-with-ft0", o2::framework::VariantType::Bool, false, {"use FT0 time for vertex validation"}},
-    {"disable-vertex-track-matching", o2::framework::VariantType::Bool, false, {"disable matching of vertex to non-contributor tracks"}},
+    {"vetex-track-matching-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use in vertex-track associations or \"none\" to disable matching"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
 
   std::swap(workflowOptions, options);
@@ -50,81 +51,61 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)
 WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 {
   WorkflowSpec specs;
-  DetID::mask_t dets = DetID::getMask("ITS,TPC,TRD,TOF,FT0");
+
+  GID::mask_t alowedSourcesPV = GID::getSourcesMask("ITS,ITS-TPC,ITS-TPC-TOF");
+  GID::mask_t alowedSourcesVT = GID::getSourcesMask("ITS,ITS-TPC,ITS-TPC-TOF,TPC,TPC-TOF");
 
   // Update the (declared) parameters if changed from the command line
   o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
   // write the configuration used for the workflow
   o2::conf::ConfigurableParam::writeINI("o2primary-vertexing-workflow_configuration.ini");
 
-  if (!configcontext.helpOnCommandLine()) {
-    auto mskOnly = DetID::getMask(configcontext.options().get<std::string>("onlyDet"));
-    auto mskSkip = DetID::getMask(configcontext.options().get<std::string>("skipDet"));
-    if (mskOnly.any()) {
-      dets &= mskOnly;
-    } else {
-      dets ^= mskSkip;
-    }
-  }
 
   auto useMC = !configcontext.options().get<bool>("disable-mc");
   auto disableRootInp = configcontext.options().get<bool>("disable-root-input");
   auto disableRootOut = configcontext.options().get<bool>("disable-root-output");
   auto validateWithFT0 = configcontext.options().get<bool>("validate-with-ft0");
-  auto disableMatching = configcontext.options().get<bool>("disable-vertex-track-matching");
 
-  bool readerTrackITSDone = false, readerTrackITSTPCDone = false, readerGloTOFDone = false;
+  GID::mask_t srcPV = alowedSourcesPV & GID::getSourcesMask(configcontext.options().get<std::string>("vertexing-sources"));
+  GID::mask_t srcVT = alowedSourcesVT & GID::getSourcesMask(configcontext.options().get<std::string>("vetex-track-matching-sources"));
+  GID::mask_t srcComb = srcPV | srcVT;
 
+  // decide what to read, MC is needed (if requested) only for P.Vertexing
   if (!disableRootInp) {
-    if (dets[DetID::ITS]) {
-      specs.emplace_back(o2::its::getITSTrackReaderSpec(useMC));
-      readerTrackITSDone = true;
+
+    if (srcComb[GID::ITS]) {
+      specs.emplace_back(o2::its::getITSTrackReaderSpec(useMC && srcPV[GID::ITS]));
+    }
+
+    if (srcComb[GID::TPC]) {
+      specs.emplace_back(o2::tpc::getTPCTrackReaderSpec(useMC && srcPV[GID::TPC]));
+    }
+
+    if (srcComb[GID::ITSTPC] || srcComb[GID::ITSTPCTOF]) { // ITSTPCTOF does not provide tracks, only matchInfo
+      specs.emplace_back(o2::globaltracking::getTrackTPCITSReaderSpec(useMC && (srcPV[GID::ITSTPC] || srcPV[GID::ITSTPCTOF])));
+    }
+
+    if (srcComb[GID::ITSTPCTOF]) {
+      specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(useMC && srcPV[GID::ITSTPCTOF], false, false)); // MC, MatchInfo_glo, no TOF_TPCtracks
+      specs.emplace_back(o2::tof::getClusterReaderSpec(false));                                           // RSTODO Needed just to set the time of ITSTPC track, consider moving to MatchInfoTOF
     }
-    if (dets[DetID::TPC]) {
-      specs.emplace_back(o2::globaltracking::getTrackTPCITSReaderSpec(useMC));
-      readerTrackITSTPCDone = true;
-      if (dets[DetID::TRD]) {
-        // RSTODO will add once TRD tracking available
-      }
-      if (dets[DetID::TOF]) {
-        specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(true, false, false)); // MC, MatchInfo_glo, no TOF_TPCtracks
-        readerGloTOFDone = true;
-        specs.emplace_back(o2::tof::getClusterReaderSpec(false)); // RSTODO Needed just to set the time of ITSTPC track, consider moving to MatchInfoTOF
-      }
+
+    if (srcComb[GID::TPCTOF]) {
+      specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(srcPV[GID::TPCTOF], true, true)); // mc, MatchInfo_TPC, TOF_TPCtracks
     }
+
     if (validateWithFT0) {
       specs.emplace_back(o2::ft0::getRecPointReaderSpec(false));
     }
   }
-  specs.emplace_back(o2::vertexing::getPrimaryVertexingSpec(dets, validateWithFT0, useMC));
-
-  if (!disableMatching) {
-    if (!disableRootInp) {
-
-      if (dets[DetID::ITS]) {
-        if (!readerTrackITSDone) {
-          specs.emplace_back(o2::its::getITSTrackReaderSpec(false));
-        }
-      }
-      if (dets[DetID::TPC]) {
-        if (dets[DetID::ITS] && !readerTrackITSTPCDone) {
-          specs.emplace_back(o2::globaltracking::getTrackTPCITSReaderSpec(false));
-        }
-        specs.emplace_back(o2::tpc::getTPCTrackReaderSpec(false));
-        if (dets[DetID::TOF]) {
-          if (!readerGloTOFDone) {
-            specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(false, false, false)); // MC, MatchInfo_glo, no TOF_TPCtracks
-            specs.emplace_back(o2::tof::getClusterReaderSpec(false));                  // RSTODO Needed just to set the time of ITSTPC track, consider moving to MatchInfoTOF
-          }
-          specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(false, true, true)); // mc, MatchInfo_TPC, TOF_TPCtracks
-        }
-      }
-    }
-    specs.emplace_back(o2::vertexing::getVertexTrackMatcherSpec(dets));
+
+  specs.emplace_back(o2::vertexing::getPrimaryVertexingSpec(srcPV, validateWithFT0, useMC));
+  if (!srcVT.none()) {
+    specs.emplace_back(o2::vertexing::getVertexTrackMatcherSpec(srcVT));
   }
 
   if (!disableRootOut) {
-    specs.emplace_back(o2::vertexing::getPrimaryVertexWriterSpec(disableMatching, useMC));
+    specs.emplace_back(o2::vertexing::getPrimaryVertexWriterSpec(srcVT.none(), useMC));
   }
   return std::move(specs);
 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ namespace vertexing`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`using namespace o2::framework;`
	`29`	`+using GTrackID = o2::dataformats::GlobalTrackID;`
`29`	`30`
`30`	`31`	`class VertexTrackMatcherSpec : public Task`
`31`	`32`	`{`
`@@ -42,7 +43,7 @@ class VertexTrackMatcherSpec : public Task`
`42`	`43`	`};`
`43`	`44`
`44`	`45`	`/// create a processor spec`
`45`		`-DataProcessorSpec getVertexTrackMatcherSpec(o2::detectors::DetID::mask_t dets);`
	`46`	`+DataProcessorSpec getVertexTrackMatcherSpec(GTrackID::mask_t src);`
`46`	`47`
`47`	`48`	`} // namespace vertexing`
`48`	`49`	`} // namespace o2`