Fixes in TPC-ITS matching + lost fixes discussed in PR5329

shahor02 · shahor02 · commit 9edc749ae5b6 · 2021-02-17T08:52:45.000+01:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/WorkflowHelper.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/WorkflowHelper.h
@@ -62,21 +62,6 @@ struct getWorkflowTPCInput_ret {
 };
 } // namespace internal
 
-static auto getWorkflowTPCInputEmpryPtr()
-{
-  /*
-  In case the need of TPCInput is conditional, this will allow to define an empty unique_ptr to this complex structure outside 
-  of the "if" scope, i.e. 
-  auto inp = getWorkflowTPCInputEmpryPtr();
-  if (want_TPCInput) {
-    inp = getWorkflowTPCInput(...);
-    consumer->setInp(inp);
-  }
-*/
-  std::unique_ptr<internal::getWorkflowTPCInput_ret> ptr;
-  return ptr;
-}
-
 static auto getWorkflowTPCInput(o2::framework::ProcessingContext& pc, int verbosity = 0, bool do_mcLabels = false, bool do_clusters = true, unsigned long tpcSectorMask = 0xFFFFFFFFF, bool do_digits = false)
 {
   auto retVal = std::make_unique<internal::getWorkflowTPCInput_ret>();
diff --git a/Detectors/GlobalTracking/src/MatchTPCITS.cxx b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
@@ -418,7 +418,6 @@ void MatchTPCITS::selectBestMatches()
   do {
     nValidated = 0;
     int ntpc = mTPCWork.size(), nremaining = 0;
-    ;
     for (int it = 0; it < ntpc; it++) {
       auto& tTPC = mTPCWork[it];
       if (isDisabledTPC(tTPC) || isValidatedTPC(tTPC)) {
diff --git a/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/TPCITSMatchingSpec.h b/Detectors/GlobalTrackingWorkflow/include/GlobalTrackingWorkflow/TPCITSMatchingSpec.h
@@ -48,7 +48,7 @@ class TPCITSMatchingDPL : public Task
 };
 
 /// create a processor spec
-framework::DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC, const std::vector<int>& tpcClusLanes);
+framework::DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC);
 
 } // namespace globaltracking
 } // namespace o2
diff --git a/Detectors/GlobalTrackingWorkflow/src/MatchTPCITSWorkflow.cxx b/Detectors/GlobalTrackingWorkflow/src/MatchTPCITSWorkflow.cxx
@@ -32,16 +32,12 @@ framework::WorkflowSpec getMatchTPCITSWorkflow(bool useFT0, bool useMC, bool dis
 {
   framework::WorkflowSpec specs;
 
-  bool passFullITSClusters = false; // temporarily pass full clusters,
-  bool passCompITSClusters = true;  // eventually only compact of recpoints will be passed
-  bool passITSClusPatterns = true;
-
   std::vector<int> tpcClusSectors = o2::RangeTokenizer::tokenize<int>("0-35");
   std::vector<int> tpcClusLanes = tpcClusSectors;
 
   if (!disableRootInp) {
     specs.emplace_back(o2::its::getITSTrackReaderSpec(useMC));
-    specs.emplace_back(o2::itsmft::getITSClusterReaderSpec(useMC, passITSClusPatterns));
+    specs.emplace_back(o2::itsmft::getITSClusterReaderSpec(useMC, true));
     specs.emplace_back(o2::tpc::getTPCTrackReaderSpec(useMC));
     specs.emplace_back(o2::tpc::getPublisherSpec(o2::tpc::PublisherConf{
                                                    "tpc-native-cluster-reader",
@@ -61,7 +57,7 @@ framework::WorkflowSpec getMatchTPCITSWorkflow(bool useFT0, bool useMC, bool dis
     }
   }
 
-  specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(useFT0, calib, useMC, tpcClusLanes));
+  specs.emplace_back(o2::globaltracking::getTPCITSMatchingSpec(useFT0, calib, useMC));
 
   if (!disableRootOut) {
     specs.emplace_back(o2::globaltracking::getTrackWriterTPCITSSpec(useMC));
diff --git a/Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx b/Detectors/GlobalTrackingWorkflow/src/TPCITSMatchingSpec.cxx
@@ -190,7 +190,7 @@ void TPCITSMatchingDPL::endOfStream(EndOfStreamContext& ec)
        mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);
 }
 
-DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC, const std::vector<int>& tpcClusLanes)
+DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC)
 {
 
   std::vector<InputSpec> inputs;
diff --git a/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowWithTPCSpec.cxx b/Detectors/GlobalTrackingWorkflow/tofworkflow/src/RecoWorkflowWithTPCSpec.cxx
@@ -97,7 +97,7 @@ class TOFDPLRecoWorkflowWithTPCTask
       toflab = std::move(*toflabel);
     }
 
-    auto inputsTPCclusters = o2::tpc::getWorkflowTPCInputEmpryPtr();
+    std::decay_t<decltype(o2::tpc::getWorkflowTPCInput(pc))> inputsTPCclusters;
     if (mDoTPCRefit) {
       mMatcher.setTPCTrackClusIdxInp(pc.inputs().get<gsl::span<o2::tpc::TPCClRefElem>>("trackTPCClRefs"));
       mMatcher.setTPCClustersSharingMap(pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap"));

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ void TPCITSMatchingDPL::endOfStream(EndOfStreamContext& ec)`
`190`	`190`	`mTimer.CpuTime(), mTimer.RealTime(), mTimer.Counter() - 1);`
`191`	`191`	`}`
`192`	`192`
`193`		`-DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC, const std::vector<int>& tpcClusLanes)`
	`193`	`+DataProcessorSpec getTPCITSMatchingSpec(bool useFT0, bool calib, bool useMC)`
`194`	`194`	`{`
`195`	`195`
`196`	`196`	`std::vector<InputSpec> inputs;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class TOFDPLRecoWorkflowWithTPCTask`
`97`	`97`	`toflab = std::move(*toflabel);`
`98`	`98`	`}`
`99`	`99`
`100`		`- auto inputsTPCclusters = o2::tpc::getWorkflowTPCInputEmpryPtr();`
	`100`	`+ std::decay_t<decltype(o2::tpc::getWorkflowTPCInput(pc))> inputsTPCclusters;`
`101`	`101`	`if (mDoTPCRefit) {`
`102`	`102`	`mMatcher.setTPCTrackClusIdxInp(pc.inputs().get<gsl::span<o2::tpc::TPCClRefElem>>("trackTPCClRefs"));`
`103`	`103`	`mMatcher.setTPCClustersSharingMap(pc.inputs().get<gsl::span<unsigned char>>("clusTPCshmap"));`