TPC Workflow: filter inputs by tpc sector mask

davidrohr · davidrohr · commit 99595db81584 · 2021-04-01T00:10:12.000+02:00
diff --git a/DataFormats/Detectors/TPC/include/DataFormatsTPC/WorkflowHelper.h b/DataFormats/Detectors/TPC/include/DataFormatsTPC/WorkflowHelper.h
@@ -90,7 +90,7 @@ static auto getWorkflowTPCInput(o2::framework::ProcessingContext& pc, int verbos
       if (recvMask & sectorHeader->sectorBits) {
         throw std::runtime_error("can only have one MC data set per sector");
       }
-      recvMask |= sectorHeader->sectorBits;
+      recvMask |= (sectorHeader->sectorBits & tpcSectorMask);
       retVal->internal.inputrefs[sector].labels = ref;
       if (do_digits) {
         retVal->internal.inputDigitsMCIndex[sector] = retVal->internal.inputDigitsMC.size();
@@ -132,7 +132,7 @@ static auto getWorkflowTPCInput(o2::framework::ProcessingContext& pc, int verbos
       if (recvMask & sectorHeader->sectorBits) {
         throw std::runtime_error("can only have one cluster data set per sector");
       }
-      recvMask |= sectorHeader->sectorBits;
+      recvMask |= (sectorHeader->sectorBits & tpcSectorMask);
       retVal->internal.inputrefs[sector].data = ref;
       if (do_digits) {
         if (tpcSectorMask & (1ul << sector)) {
diff --git a/Detectors/TPC/workflow/include/TPCWorkflow/TPCSectorCompletionPolicy.h b/Detectors/TPC/workflow/include/TPCWorkflow/TPCSectorCompletionPolicy.h
@@ -87,7 +87,8 @@ class TPCSectorCompletionPolicy
       return std::regex_match(device.name.begin(), device.name.end(), std::regex(expression.c_str()));
     };
 
-    auto callback = [bRequireAll = mRequireAll, inputMatchers = mInputMatchers, externalInputMatchers = mExternalInputMatchers](framework::CompletionPolicy::InputSet inputs) -> framework::CompletionPolicy::CompletionOp {
+    auto callback = [bRequireAll = mRequireAll, inputMatchers = mInputMatchers, externalInputMatchers = mExternalInputMatchers, pTpcSectorMask = mTpcSectorMask](framework::CompletionPolicy::InputSet inputs) -> framework::CompletionPolicy::CompletionOp {
+      unsigned long tpcSectorMask = pTpcSectorMask ? *pTpcSectorMask : 0xFFFFFFFFF;
       std::bitset<NSectors> validSectors = 0;
       bool haveMatchedInput = false;
       uint64_t activeSectors = 0;
@@ -126,8 +127,8 @@ class TPCSectorCompletionPolicy
               if (sectorHeader == nullptr) {
                 throw std::runtime_error("TPC sector header missing on header stack");
               }
-              activeSectors |= sectorHeader->activeSectors;
-              validSectors |= sectorHeader->sectorBits;
+              activeSectors |= (sectorHeader->activeSectors & tpcSectorMask);
+              validSectors |= (sectorHeader->sectorBits & tpcSectorMask);
               break;
             }
           }
@@ -141,8 +142,8 @@ class TPCSectorCompletionPolicy
                 if (sectorHeader == nullptr) {
                   throw std::runtime_error("TPC sector header missing on header stack");
                 }
-                activeSectors |= sectorHeader->activeSectors;
-                validSectorsExternal[idx] |= sectorHeader->sectorBits;
+                activeSectors |= (sectorHeader->activeSectors & tpcSectorMask);
+                validSectorsExternal[idx] |= (sectorHeader->sectorBits & tpcSectorMask);
                 break;
               }
             }
@@ -208,6 +209,8 @@ class TPCSectorCompletionPolicy
       }
     } else if constexpr (std::is_same<Type, std::vector<o2::framework::InputSpec>*>::value) {
       mExternalInputMatchers = arg;
+    } else if constexpr (std::is_same<Type, unsigned long*>::value) {
+      mTpcSectorMask = arg;
     } else {
       static_assert(framework::always_static_assert_v<Type>);
     }
@@ -222,6 +225,7 @@ class TPCSectorCompletionPolicy
   // - They are controlled externally and the external entity can modify them, e.g. after parsing command line arguments.
   // - They are all matched independently, it is not sufficient that one of them is present for all sectors
   const std::vector<framework::InputSpec>* mExternalInputMatchers = nullptr;
+  unsigned long* mTpcSectorMask = nullptr;
   bool mRequireAll = false;
 };
 } // namespace tpc
diff --git a/Detectors/TPC/workflow/src/tpc-reco-workflow.cxx b/Detectors/TPC/workflow/src/tpc-reco-workflow.cxx
@@ -90,7 +90,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)
   policies.push_back(CompletionPolicyHelpers::defineByName("tpc-cluster-decoder.*", CompletionPolicy::CompletionOp::Consume));
   policies.push_back(CompletionPolicyHelpers::defineByName("tpc-clusterer.*", CompletionPolicy::CompletionOp::Consume));
   // the custom completion policy for the tracker
-  policies.push_back(o2::tpc::TPCSectorCompletionPolicy("tpc-tracker.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData)());
+  policies.push_back(o2::tpc::TPCSectorCompletionPolicy("tpc-tracker.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData, &gTpcSectorMask)());
 }
 
 #include "Framework/runDataProcessing.h" // the main driver

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ class TPCSectorCompletionPolicy`
`87`	`87`	`return std::regex_match(device.name.begin(), device.name.end(), std::regex(expression.c_str()));`
`88`	`88`	`};`
`89`	`89`
`90`		`- auto callback = [bRequireAll = mRequireAll, inputMatchers = mInputMatchers, externalInputMatchers = mExternalInputMatchers](framework::CompletionPolicy::InputSet inputs) -> framework::CompletionPolicy::CompletionOp {`
	`90`	`+ auto callback = [bRequireAll = mRequireAll, inputMatchers = mInputMatchers, externalInputMatchers = mExternalInputMatchers, pTpcSectorMask = mTpcSectorMask](framework::CompletionPolicy::InputSet inputs) -> framework::CompletionPolicy::CompletionOp {`
	`91`	`+ unsigned long tpcSectorMask = pTpcSectorMask ? *pTpcSectorMask : 0xFFFFFFFFF;`
`91`	`92`	`std::bitset<NSectors> validSectors = 0;`
`92`	`93`	`bool haveMatchedInput = false;`
`93`	`94`	`uint64_t activeSectors = 0;`
`@@ -126,8 +127,8 @@ class TPCSectorCompletionPolicy`
`126`	`127`	`if (sectorHeader == nullptr) {`
`127`	`128`	`throw std::runtime_error("TPC sector header missing on header stack");`
`128`	`129`	`}`
`129`		`- activeSectors \|= sectorHeader->activeSectors;`
`130`		`- validSectors \|= sectorHeader->sectorBits;`
	`130`	`+ activeSectors \|= (sectorHeader->activeSectors & tpcSectorMask);`
	`131`	`+ validSectors \|= (sectorHeader->sectorBits & tpcSectorMask);`
`131`	`132`	`break;`
`132`	`133`	`}`
`133`	`134`	`}`
`@@ -141,8 +142,8 @@ class TPCSectorCompletionPolicy`
`141`	`142`	`if (sectorHeader == nullptr) {`
`142`	`143`	`throw std::runtime_error("TPC sector header missing on header stack");`
`143`	`144`	`}`
`144`		`- activeSectors \|= sectorHeader->activeSectors;`
`145`		`- validSectorsExternal[idx] \|= sectorHeader->sectorBits;`
	`145`	`+ activeSectors \|= (sectorHeader->activeSectors & tpcSectorMask);`
	`146`	`+ validSectorsExternal[idx] \|= (sectorHeader->sectorBits & tpcSectorMask);`
`146`	`147`	`break;`
`147`	`148`	`}`
`148`	`149`	`}`
`@@ -208,6 +209,8 @@ class TPCSectorCompletionPolicy`
`208`	`209`	`}`
`209`	`210`	`} else if constexpr (std::is_same<Type, std::vector<o2::framework::InputSpec>*>::value) {`
`210`	`211`	`mExternalInputMatchers = arg;`
	`212`	`+ } else if constexpr (std::is_same<Type, unsigned long*>::value) {`
	`213`	`+ mTpcSectorMask = arg;`
`211`	`214`	`} else {`
`212`	`215`	`static_assert(framework::always_static_assert_v<Type>);`
`213`	`216`	`}`
`@@ -222,6 +225,7 @@ class TPCSectorCompletionPolicy`
`222`	`225`	`// - They are controlled externally and the external entity can modify them, e.g. after parsing command line arguments.`
`223`	`226`	`// - They are all matched independently, it is not sufficient that one of them is present for all sectors`
`224`	`227`	`const std::vector<framework::InputSpec>* mExternalInputMatchers = nullptr;`
	`228`	`+ unsigned long* mTpcSectorMask = nullptr;`
`225`	`229`	`bool mRequireAll = false;`
`226`	`230`	`};`
`227`	`231`	`} // namespace tpc`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void customize(std::vector<o2::framework::CompletionPolicy>& policies)`
`90`	`90`	`policies.push_back(CompletionPolicyHelpers::defineByName("tpc-cluster-decoder.*", CompletionPolicy::CompletionOp::Consume));`
`91`	`91`	`policies.push_back(CompletionPolicyHelpers::defineByName("tpc-clusterer.*", CompletionPolicy::CompletionOp::Consume));`
`92`	`92`	`// the custom completion policy for the tracker`
`93`		`- policies.push_back(o2::tpc::TPCSectorCompletionPolicy("tpc-tracker.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData)());`
	`93`	`+ policies.push_back(o2::tpc::TPCSectorCompletionPolicy("tpc-tracker.*", o2::tpc::TPCSectorCompletionPolicy::Config::RequireAll, &gPolicyData, &gTpcSectorMask)());`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`#include "Framework/runDataProcessing.h" // the main driver`