IT3 some1

Author: f3sch

Detectors/Upgrades/ITS3/workflow/include/ITS3Workflow/DigitReaderSpec.h

@@ -54,7 +54,7 @@ class ITS3DigitReader final : public Task
 
   const o2::header::DataOrigin mOrigin = o2::header::gDataOriginIT3;
 
-  std::string getBranchName(const std::string& base, int index)
+  std::string getBranchName(const std::string& base, int index) const
   {
     if (mDoStaggering) {
       return base + "_" + std::to_string(index);

Detectors/Upgrades/ITS3/workflow/src/DigitWriterSpec.cxx

@@ -27,20 +27,16 @@
 using namespace o2::framework;
 using SubSpecificationType = o2::framework::DataAllocator::SubSpecificationType;
 
-namespace o2
-{
-namespace its3
+namespace o2::its3
 {
 
 template <typename T>
 using BranchDefinition = MakeRootTreeWriterSpec::BranchDefinition<T>;
 using MCCont = o2::dataformats::ConstMCTruthContainer<o2::MCCompLabel>;
 
-/// create the processor spec
-/// describing a processor receiving digits for ITS/MFT and writing them to file
-DataProcessorSpec getDigitWriterSpec(bool mctruth, bool doStag, bool dec, bool calib, o2::header::DataOrigin detOrig, o2::detectors::DetID detId)
+DataProcessorSpec getITS3DigitWriterSpec(bool mctruth, bool doStag, bool dec, bool calib)
 {
-  std::string detStr = o2::detectors::DetID::getName(detId);
+  std::string detStr = o2::detectors::DetID::getName(o2::detectors::DetID::IT3);
   std::string detStrL = dec ? "o2_" : ""; // for decoded digits prepend by o2
   const int mLayers = doStag ? 7 : 1;
   detStrL += detStr;
@@ -112,7 +108,7 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool doStag, bool dec, bool c
 
   return MakeRootTreeWriterSpec((detStr + "DigitWriter" + (dec ? "_dec" : "")).c_str(),
                                 (detStrL + "digits.root").c_str(),
-                                MakeRootTreeWriterSpec::TreeAttributes{"o2sim", "Digits tree"},
+                                MakeRootTreeWriterSpec::TreeAttributes{.name = "o2sim", .title = "Digits tree"},
                                 MakeRootTreeWriterSpec::CustomClose(finishWriting),
                                 // in case of labels we first read them as std::vector<char> and process them correctly in the fillLabels hook
                                 BranchDefinition<std::vector<itsmft::Digit>>{vecInpSpecDig,
@@ -135,10 +131,5 @@ DataProcessorSpec getDigitWriterSpec(bool mctruth, bool doStag, bool dec, bool c
                                                                     getName})();
 }
 
-DataProcessorSpec getITS3DigitWriterSpec(bool mctruth, bool doStag, bool dec, bool calib)
-{
-  return getDigitWriterSpec(mctruth, doStag, dec, calib, o2::header::gDataOriginIT3, o2::detectors::DetID::IT3);
-}
-
-} // end namespace its3
-} // end namespace o2
+} // namespace o2::its3
+  // end namespace o2