Add selection of track sources for cosmics matching

Author: shahor02

Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/CosmicsMatchingSpec.h

@@ -16,7 +16,7 @@
 #include "GlobalTracking/MatchCosmics.h"
 #include "DataFormatsITSMFT/TopologyDictionary.h"
 #include "DataFormatsTPC/Constants.h"
-#include "DetectorsCommonDataFormats/DetID.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
 #include "Framework/DataProcessorSpec.h"
 #include "Framework/Task.h"
 #include <string>
@@ -46,7 +46,7 @@ class CosmicsMatchingSpec : public Task
 };
 
 /// create a processor spec
-framework::DataProcessorSpec getCosmicsMatchingSpec(o2::detectors::DetID::mask_t dets, bool useMC);
+framework::DataProcessorSpec getCosmicsMatchingSpec(o2::dataformats::GlobalTrackID::mask_t src, bool useMC);
 
 } // namespace globaltracking
 } // namespace o2

Detectors/GlobalTrackingWorkflow/src/CosmicsMatchingSpec.cxx

@@ -115,28 +115,35 @@ void CosmicsMatchingSpec::endOfStream(EndOfStreamContext& ec)
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
 
-DataProcessorSpec getCosmicsMatchingSpec(DetID::mask_t dets, bool useMC)
+DataProcessorSpec getCosmicsMatchingSpec(GTrackID::mask_t src, bool useMC)
 {
 
   std::vector<InputSpec> inputs;
   std::vector<OutputSpec> outputs;
-  if (dets[DetID::ITS]) {
+
+  if (src[GTrackID::ITS]) {
     dataRequest.requestITSTracks(useMC);
-    dataRequest.requestITSClusters(false);
   }
-  if (dets[DetID::TPC]) {
+  if (src[GTrackID::TPC]) {
     dataRequest.requestTPCTracks(useMC);
-    dataRequest.requestTPCClusters(false);
   }
-  if (dets[DetID::ITS] && dets[DetID::TPC]) {
+  if (src[GTrackID::ITSTPC]) {
     dataRequest.requestITSTPCTracks(useMC);
   }
-  if (dets[DetID::TPC] && dets[DetID::TOF]) {
+  if (src[GTrackID::TPCTOF]) {
     dataRequest.requestTPCTOFTracks(useMC);
+  }
+  if (src[GTrackID::ITSTPCTOF]) {
+    dataRequest.requestTOFMatches(useMC);
     dataRequest.requestTOFClusters(false); // RSTODO Needed just to set the time of ITSTPC track, consider moving to MatchInfoTOF
-    if (dets[DetID::ITS]) {
-      dataRequest.requestTOFMatches(useMC);
-    }
+  }
+
+  // clusters needed for refits
+  if (GTrackID::includesDet(DetID::ITS, src)) {
+    dataRequest.requestITSClusters(false);
+  }
+  if (GTrackID::includesDet(DetID::TPC, src)) {
+    dataRequest.requestTPCClusters(false);
   }
 
   outputs.emplace_back("GLO", "COSMICTRC", 0, Lifetime::Timeframe);

Detectors/GlobalTrackingWorkflow/src/cosmics-match-workflow.cxx

@@ -19,13 +19,16 @@
 #include "TOFWorkflowUtils/ClusterReaderSpec.h"
 #include "TOFWorkflow/TOFMatchedReaderSpec.h"
 #include "TOFWorkflowUtils/ClusterReaderSpec.h"
+#include "ReconstructionDataFormats/GlobalTrackID.h"
+#include "DetectorsCommonDataFormats/DetID.h"
 #include "GlobalTrackingWorkflow/TrackTPCITSReaderSpec.h"
 #include "GlobalTrackingWorkflow/CosmicsMatchingSpec.h"
 #include "GlobalTrackingWorkflow/TrackCosmicsWriterSpec.h"
 #include "Algorithm/RangeTokenizer.h"
 
 using namespace o2::framework;
 using DetID = o2::detectors::DetID;
+using GID = o2::dataformats::GlobalTrackID;
 // ------------------------------------------------------------------
 
 // we need to add workflow options before including Framework/runDataProcessing
@@ -36,8 +39,7 @@ void customize(std::vector<o2::framework::ConfigParamSpec>& workflowOptions)
     {"disable-mc", o2::framework::VariantType::Bool, false, {"disable MC propagation even if available"}},
     {"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"}},
+    {"track-sources", VariantType::String, std::string{GID::ALL}, {"comma-separated list of sources to use"}},
     {"configKeyValues", VariantType::String, "", {"Semicolon separated key=value strings ..."}}};
 
   std::swap(workflowOptions, options);
@@ -62,18 +64,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
 WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
 {
   WorkflowSpec specs;
-  DetID::mask_t dets;
-  dets.set(); // by default read all
-
-  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;
-    }
-  }
+  GID::mask_t alowedSources = GID::getSourcesMask("ITS,TPC,ITS-TPC,TPC-TOF,ITS-TPC-TOF");
 
   // Update the (declared) parameters if changed from the command line
   o2::conf::ConfigurableParam::updateFromString(configcontext.options().get<std::string>("configKeyValues"));
@@ -87,16 +78,36 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
   std::vector<int> tpcClusSectors = o2::RangeTokenizer::tokenize<int>("0-35");
   std::vector<int> tpcClusLanes = tpcClusSectors;
 
+  GID::mask_t src = alowedSources & GID::getSourcesMask(configcontext.options().get<std::string>("track-sources"));
+
   if (!disableRootInp) {
-    // ITS tracks and clusters
-    if (dets[DetID::ITS]) {
+
+    if (src[GID::ITS]) {
       specs.emplace_back(o2::its::getITSTrackReaderSpec(useMC));
-      specs.emplace_back(o2::itsmft::getITSClusterReaderSpec(false, true)); // mc not neaded
     }
 
-    // TPC tracks and clusters
-    if (dets[DetID::TPC]) {
+    if (src[GID::TPC]) {
       specs.emplace_back(o2::tpc::getTPCTrackReaderSpec(useMC));
+    }
+
+    if (src[GID::ITSTPC] || src[GID::ITSTPCTOF]) { // ITSTPCTOF does not provide tracks, only matchInfo
+      specs.emplace_back(o2::globaltracking::getTrackTPCITSReaderSpec(useMC));
+    }
+
+    if (src[GID::ITSTPCTOF]) {
+      specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(useMC, 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 (src[GID::TPCTOF]) {
+      specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(useMC, true, true)); // mc, MatchInfo_TPC, TOF_TPCtracks
+    }
+
+    // clusters for refit
+    if (GID::includesDet(DetID::ITS, src)) {
+      specs.emplace_back(o2::itsmft::getITSClusterReaderSpec(false, true)); // mc not neaded
+    }
+    if (GID::includesDet(DetID::TPC, src)) {
       specs.emplace_back(o2::tpc::getPublisherSpec(o2::tpc::PublisherConf{
                                                      "tpc-native-cluster-reader",
                                                      "tpc-native-clusters.root",
@@ -110,25 +121,9 @@ WorkflowSpec defineDataProcessing(ConfigContext const& configcontext)
                                                    false));
       specs.emplace_back(o2::tpc::getClusterSharingMapSpec());
     }
-
-    // ITS-TPC matches
-    if (dets[DetID::ITS] && dets[DetID::TPC]) {
-      specs.emplace_back(o2::globaltracking::getTrackTPCITSReaderSpec(true));
-    }
-
-    if (dets[DetID::TPC] && dets[DetID::TOF]) {
-      // TPC-TOF matches
-      specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(true, true, true)); // MC info here is redundant
-      // TOF clusters
-      specs.emplace_back(o2::tof::getClusterReaderSpec(false)); // RSTODO Needed just to set the time of ITSTPC track, consider moving to MatchInfoTOF
-      // ITS-TPC-TOF matches
-      if (dets[DetID::ITS]) {
-        specs.emplace_back(o2::tof::getTOFMatchedReaderSpec(true, false, false)); // MC info here is redundant
-      }
-    }
   }
 
-  specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(dets, useMC));
+  specs.emplace_back(o2::globaltracking::getCosmicsMatchingSpec(src, useMC));
 
   if (!disableRootOut) {
     specs.emplace_back(o2::globaltracking::getTrackCosmicsWriterSpec(useMC));