Added ZDC tree in the AOD reader (#3144)

nburmaso · nburmaso · web-flow · commit bae31411e584 · 2020-03-13T00:10:47.000+01:00
Co-authored-by: nburmaso &lt;nburmaso@github.com&gt;
diff --git a/Framework/Core/src/AODReaderHelpers.cxx b/Framework/Core/src/AODReaderHelpers.cxx
@@ -98,10 +98,11 @@ enum AODTypeMask : uint64_t {
   Calo = 1 << 3,
   Muon = 1 << 4,
   VZero = 1 << 5,
-  Collisions = 1 << 6,
-  Timeframe = 1 << 7,
-  DZeroFlagged = 1 << 8,
-  Unknown = 1 << 9
+  Zdc = 1 << 6,
+  Collisions = 1 << 7,
+  Timeframe = 1 << 8,
+  DZeroFlagged = 1 << 9,
+  Unknown = 1 << 10
 };
 
 uint64_t getMask(header::DataDescription description)
@@ -119,6 +120,8 @@ uint64_t getMask(header::DataDescription description)
     return AODTypeMask::Muon;
   } else if (description == header::DataDescription{"VZERO"}) {
     return AODTypeMask::VZero;
+  } else if (description == header::DataDescription{"ZDC"}) {
+    return AODTypeMask::Zdc;
   } else if (description == header::DataDescription{"COLLISION"}) {
     return AODTypeMask::Collisions;
   } else if (description == header::DataDescription{"TIMEFRAME"}) {
@@ -254,6 +257,8 @@ AlgorithmSpec AODReaderHelpers::run2ESDConverterCallback()
             writer = outputs.make<arrow::ipc::RecordBatchWriter>(Output{"AOD", "MUON"}, batch->schema());
           } else if (meta["description"] == "VZERO" && (readMask & AODTypeMask::VZero)) {
             writer = outputs.make<arrow::ipc::RecordBatchWriter>(Output{"AOD", "VZERO"}, batch->schema());
+          } else if (meta["description"] == "ZDC" && (readMask & AODTypeMask::Zdc)) {
+            writer = outputs.make<arrow::ipc::RecordBatchWriter>(Output{"AOD", "ZDC"}, batch->schema());
           } else if (meta["description"] == "COLLISION" && (readMask & AODTypeMask::Collisions)) {
             writer = outputs.make<arrow::ipc::RecordBatchWriter>(Output{"AOD", "COLLISION"}, batch->schema());
           } else if (meta["description"] == "TIMEFRAME" && (readMask & AODTypeMask::Timeframe)) {
@@ -370,7 +375,13 @@ AlgorithmSpec AODReaderHelpers::rootFileReaderCallback()
       if (readMask & AODTypeMask::VZero) {
         std::unique_ptr<TTreeReader> vzReader = std::make_unique<TTreeReader>("O2vzero", infile.get());
         auto& vzBuilder = outputs.make<TableBuilder>(Output{"AOD", "VZERO"});
-        RootTableBuilderHelpers::convertASoA<o2::aod::Muons>(vzBuilder, *vzReader);
+        RootTableBuilderHelpers::convertASoA<o2::aod::VZeros>(vzBuilder, *vzReader);
+      }
+
+      if (readMask & AODTypeMask::Zdc) {
+        std::unique_ptr<TTreeReader> zdcReader = std::make_unique<TTreeReader>("O2zdc", infile.get());
+        auto& zdcBuilder = outputs.make<TableBuilder>(Output{"AOD", "ZDC"});
+        RootTableBuilderHelpers::convertASoA<o2::aod::Zdc>(zdcBuilder, *zdcReader);
       }
 
       // Candidates as described by Gianmichele example
