Merge 5c1a8d6 into sapling-pr-archive-ktf

Author: ktf

Detectors/DCS/testWorkflow/src/dcs-config-proxy.cxx

@@ -34,7 +34,7 @@
 using namespace o2::framework;
 using DetID = o2::detectors::DetID;
 
-std::array<o2::header::DataOrigin, 1> exceptionsDetID{"GRP"};
+std::array<o2::header::DataOrigin, 2> exceptionsDetID{"GRP", "AGD"};
 
 void sendAnswer(const std::string& what, const std::string& ack_chan, fair::mq::Device& device)
 {

Framework/Core/include/Framework/AnalysisDataModel.h

@@ -1892,6 +1892,8 @@ DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/0");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/0");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/1");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/1");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK/0", "TRACKEXTRA/2");
+DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACK_IU/0", "TRACKEXTRA/2");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/0", "TRACKEXTRA/1");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/0", "TRACKEXTRA/2");
 DECLARE_EQUIVALENT_FOR_INDEX_NG("TRACKEXTRA/1", "TRACKEXTRA/2");

Framework/Core/test/o2AO2DToAO3D.cxx

@@ -98,6 +98,13 @@ int main(int argc, char** argv)
       out->WriteTObject(copy);
       continue;
     }
+    if (dk->GetName() == std::string("parentFiles")) {
+      TMap* m = dynamic_cast<TMap*>(in->Get(dk->GetName()));
+      m->Print();
+      auto* copy = m->Clone("parentFiles");
+      out->WriteTObject(copy);
+      continue;
+    }
     auto* d = (TDirectory*)in->Get(dk->GetName());
     std::cout << "Processing: " << dk->GetName() << std::endl;
     // For the moment RNTuple does not support TDirectory, so