Merge pull request #54 from shahor02/its_stag

Avoid wildcarded subspecs in Digit/ClusterWriter

Author: f3sch

Detectors/ITSMFT/common/workflow/src/ClusterWriterSpec.cxx

@@ -69,27 +69,39 @@ DataProcessorSpec getClusterWriterSpec(bool useMC, bool doStag)
   };
   auto detNameLC = detName;
   std::transform(detNameLC.begin(), detNameLC.end(), detNameLC.begin(), [](unsigned char c) { return std::tolower(c); });
+  std::vector<InputSpec> vecInpSpecClus, vecInpSpecPatt, vecInpSpecROF, vecInpSpecLbl;
+  vecInpSpecClus.reserve(nLayers);
+  vecInpSpecPatt.reserve(nLayers);
+  vecInpSpecROF.reserve(nLayers);
+  vecInpSpecLbl.reserve(nLayers);
+  for (int iLayer = 0; iLayer < nLayers; iLayer++) {
+    vecInpSpecClus.emplace_back(getName("compclus", iLayer), Origin, "COMPCLUSTERS", iLayer);
+    vecInpSpecPatt.emplace_back(getName("patterns", iLayer), Origin, "PATTERNS", iLayer);
+    vecInpSpecROF.emplace_back(getName("ROframes", iLayer), Origin, "CLUSTERSROF", iLayer);
+    vecInpSpecLbl.emplace_back(getName("labels", iLayer), Origin, "CLUSTERSMCTR", iLayer);
+  }
+
   return MakeRootTreeWriterSpec(std::format("{}-cluster-writer", detNameLC).c_str(),
                                 (o2::detectors::DetID::ITS == N) ? "o2clus_its.root" : "mftclusters.root",
                                 MakeRootTreeWriterSpec::TreeAttributes{.name = "o2sim", .title = std::format("Tree with {} clusters", detName)},
-                                BranchDefinition<CompClusType>{InputSpec{"compclus", ConcreteDataTypeMatcher{Origin, "COMPCLUSTERS"}},
+                                BranchDefinition<CompClusType>{vecInpSpecClus,
                                                                (detName + "ClusterComp").c_str(), "compact-cluster-branch",
                                                                nLayers,
                                                                compClustersSizeGetter,
                                                                getIndex,
                                                                getName},
-                                BranchDefinition<PatternsType>{InputSpec{"patterns", ConcreteDataTypeMatcher{Origin, "PATTERNS"}},
+                                BranchDefinition<PatternsType>{vecInpSpecPatt,
                                                                (detName + "ClusterPatt").c_str(), "cluster-pattern-branch",
                                                                nLayers,
                                                                getIndex,
                                                                getName},
-                                BranchDefinition<ROFrameRType>{InputSpec{"ROframes", ConcreteDataTypeMatcher{Origin, "CLUSTERSROF"}},
+                                BranchDefinition<ROFrameRType>{vecInpSpecROF,
                                                                (detName + "ClustersROF").c_str(), "cluster-rof-branch",
                                                                nLayers,
                                                                logger,
                                                                getIndex,
                                                                getName},
-                                BranchDefinition<LabelsType>{InputSpec{"labels", ConcreteDataTypeMatcher{Origin, "CLUSTERSMCTR"}},
+                                BranchDefinition<LabelsType>{vecInpSpecLbl,
                                                              (detName + "ClusterMCTruth").c_str(), "cluster-label-branch",
                                                              (useMC ? nLayers : 0),
                                                              getIndex,

Detectors/ITSMFT/common/workflow/src/DigitWriterSpec.cxx

@@ -108,23 +108,34 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool doStag, bool dec, bool c
     }
     return base;
   };
+
+  std::vector<InputSpec> vecInpSpecDig, vecInpSpecROF, vecInpSpecLbl;
+  vecInpSpecDig.reserve(mLayers);
+  vecInpSpecROF.reserve(mLayers);
+  vecInpSpecLbl.reserve(mLayers);
+  for (int iLayer = 0; iLayer < mLayers; iLayer++) {
+    vecInpSpecDig.emplace_back(getName(detStr + "digits", iLayer), Origin, "DIGITS", iLayer);
+    vecInpSpecROF.emplace_back(getName(detStr + "digitsROF", iLayer), Origin, "DIGITSROF", iLayer);
+    vecInpSpecLbl.emplace_back(getName(detStr + "_digitsMCTR", iLayer), Origin, "DIGITSMCTR", iLayer);
+  }
+
   return MakeRootTreeWriterSpec((detStr + "DigitWriter" + (dec ? "_dec" : "")).c_str(),
                                 (detStrL + "digits.root").c_str(),
                                 MakeRootTreeWriterSpec::TreeAttributes{.name = "o2sim", .title = detStr + " Digits tree"},
                                 MakeRootTreeWriterSpec::CustomClose(finishWriting),
-                                BranchDefinition<std::vector<itsmft::Digit>>{InputSpec{detStr + "digits", ConcreteDataTypeMatcher{Origin, "DIGITS"}},
+                                BranchDefinition<std::vector<itsmft::Digit>>{vecInpSpecDig,
                                                                              detStr + "Digit", "digit-branch",
                                                                              mLayers,
                                                                              digitSizeGetter,
                                                                              getIndex,
                                                                              getName},
-                                BranchDefinition<std::vector<itsmft::ROFRecord>>{InputSpec{detStr + "digitsROF", ConcreteDataTypeMatcher{Origin, "DIGITSROF"}},
+                                BranchDefinition<std::vector<itsmft::ROFRecord>>{vecInpSpecROF,
                                                                                  detStr + "DigitROF", "digit-rof-branch",
                                                                                  mLayers,
                                                                                  rofSizeGetter,
                                                                                  getIndex,
                                                                                  getName},
-                                BranchDefinition<std::vector<char>>{InputSpec{detStr + "_digitsMCTR", ConcreteDataTypeMatcher{Origin, "DIGITSMCTR"}},
+                                BranchDefinition<std::vector<char>>{vecInpSpecLbl,
                                                                     detStr + "DigitMCTruth", "digit-mctruth-branch",
                                                                     (mctruth ? mLayers : 0),
                                                                     fillLabels,