Run again

AIDASoft · Jul 1, 2024 · e537456 · e537456
1 parent d4edbf9
commit e537456
Show file tree

Hide file tree

Showing 28 changed files with 100 additions and 38 deletions.
diff --git a/include/podio/RNTupleReader.h b/include/podio/RNTupleReader.h
@@ -1,24 +1,25 @@
 #ifndef PODIO_RNTUPLEREADER_H
 #define PODIO_RNTUPLEREADER_H
 
+#include "podio/GenericParameters.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 
+#include <ROOT/RVersion.hxx>
+
+#include <memory>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 #include <vector>
-
-#include <ROOT/RNTuple.hxx>
-#include <ROOT/RNTupleModel.hxx>
-#include <RVersion.h>
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleReader.hxx>
 #endif
 
 namespace podio {
+class CollectionIDTable;
 
 /**
 This class has the function to read available data from disk

diff --git a/include/podio/RNTupleWriter.h b/include/podio/RNTupleWriter.h
@@ -1,25 +1,34 @@
 #ifndef PODIO_RNTUPLEWRITER_H
 #define PODIO_RNTUPLEWRITER_H
 
-#include "podio/Frame.h"
-#include "podio/GenericParameters.h"
+#include "TFile.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TFile.h"
-#include <ROOT/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
-#include <RVersion.h>
+#include <ROOT/RVersion.hxx>
+
+#include <stdint.h>
+
+namespace ROOT {
+namespace Experimental {
+  class REntry;
+} // namespace Experimental
+} // namespace ROOT
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleWriter.hxx>
 #endif
 
+#include <memory>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <vector>
 
 namespace podio {
+class Frame;
+class GenericParameters;
 
 /// The RNTupleWriter writes podio files into ROOT files using the new RNTuple
 /// format.

diff --git a/include/podio/ROOTFrameData.h b/include/podio/ROOTFrameData.h
@@ -9,6 +9,7 @@
 #include <optional>
 #include <string>
 #include <unordered_map>
+#include <vector>
 
 namespace podio {
 

diff --git a/include/podio/ROOTLegacyReader.h b/include/podio/ROOTLegacyReader.h
@@ -1,12 +1,11 @@
 #ifndef PODIO_ROOTLEGACYREADER_H
 #define PODIO_ROOTLEGACYREADER_H
 
+#include "TChain.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TChain.h"
-
 #include <memory>
 #include <string>
 #include <tuple>

diff --git a/include/podio/ROOTReader.h b/include/podio/ROOTReader.h
@@ -1,25 +1,22 @@
 #ifndef PODIO_ROOTREADER_H
 #define PODIO_ROOTREADER_H
 
+#include "TChain.h"
 #include "podio/ROOTFrameData.h"
+#include "podio/SchemaEvolution.h"
 #include "podio/podioVersion.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TChain.h"
-
 #include <memory>
+#include <stddef.h>
 #include <string>
 #include <string_view>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
 #include <vector>
 
-// forward declarations
-class TClass;
-class TFile;
-class TTree;
-
 namespace podio {
 
 namespace detail {
@@ -30,7 +27,6 @@ namespace detail {
 
 } // namespace detail
 
-class CollectionBase;
 class CollectionIDTable;
 class GenericParameters;
 struct CollectionReadBuffers;

diff --git a/include/podio/ROOTWriter.h b/include/podio/ROOTWriter.h
@@ -1,12 +1,11 @@
 #ifndef PODIO_ROOTWRITER_H
 #define PODIO_ROOTWRITER_H
 
+#include "TFile.h"
 #include "podio/CollectionIDTable.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #include "podio/utilities/RootHelpers.h"
 
-#include "TFile.h"
-
 #include <memory>
 #include <string>
 #include <tuple>
@@ -18,7 +17,6 @@ class TTree;
 
 namespace podio {
 class Frame;
-class CollectionBase;
 class GenericParameters;
 
 /// The ROOTWriter writes podio files into ROOT files using TTrees.

diff --git a/include/podio/Reader.h b/include/podio/Reader.h
@@ -2,8 +2,16 @@
 #define PODIO_READER_H
 
 #include "podio/Frame.h"
+#include "podio/FrameCategories.h"
 #include "podio/podioVersion.h"
 
+#include <memory>
+#include <stddef.h>
+#include <stdexcept>
+#include <string>
+#include <string_view>
+#include <vector>
+
 namespace podio {
 
 class Reader {

diff --git a/include/podio/UserDataCollection.h b/include/podio/UserDataCollection.h
@@ -13,7 +13,6 @@
 #include <string_view>
 #include <tuple>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
 namespace podio {

diff --git a/include/podio/Writer.h b/include/podio/Writer.h
@@ -2,6 +2,11 @@
 #define PODIO_WRITER_H
 
 #include "podio/Frame.h"
+#include "podio/FrameCategories.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace podio {
 

diff --git a/include/podio/utilities/DatamodelRegistryIOHelpers.h b/include/podio/utilities/DatamodelRegistryIOHelpers.h
@@ -1,8 +1,6 @@
 #ifndef PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 #define PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 
-#include "podio/CollectionBase.h"
-
 #include <cstddef>
 #include <set>
 #include <string>

diff --git a/include/podio/utilities/RootHelpers.h b/include/podio/utilities/RootHelpers.h
@@ -3,13 +3,19 @@
 
 #include "podio/GenericParameters.h"
 
-#include "ROOT/RVec.hxx"
-#include "TBranch.h"
-
+#include <stdint.h>
 #include <string>
 #include <tuple>
 #include <vector>
 
+class TBranch;
+namespace ROOT {
+namespace VecOps {
+  template <typename T>
+  class RVec;
+} // namespace VecOps
+} // namespace ROOT
+
 namespace podio {
 class CollectionBase;
 

diff --git a/src/DatamodelRegistryIOHelpers.cc b/src/DatamodelRegistryIOHelpers.cc
@@ -4,6 +4,7 @@
 #include "podio/DatamodelRegistry.h"
 
 #include <algorithm>
+#include <iostream>
 #include <iterator>
 
 namespace podio {

diff --git a/src/RNTupleReader.cc b/src/RNTupleReader.cc
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
+#include <format>
 #include <iostream>
 #include <memory>
 #include <numeric>

diff --git a/src/RNTupleWriter.cc b/src/RNTupleWriter.cc
@@ -13,9 +13,11 @@
 #include <ROOT/RError.hxx>
 #include <ROOT/RField.hxx>
 #include <ROOT/RNTupleModel.hxx>
+#include <ROOT/RNTupleWriteOptions.hxx>
 
 #include <Compression.h>
 #include <stdexcept>
+#include <utility>
 
 namespace podio {
 class GenericParameters;

diff --git a/src/ROOTFrameData.cc b/src/ROOTFrameData.cc
@@ -1,5 +1,8 @@
 #include "podio/ROOTFrameData.h"
 
+#include <functional>
+#include <utility>
+
 namespace podio {
 
 ROOTFrameData::ROOTFrameData(BufferMap&& buffers, CollIDPtr&& idTable, podio::GenericParameters&& params) :

diff --git a/src/ROOTLegacyReader.cc b/src/ROOTLegacyReader.cc
@@ -4,6 +4,7 @@
 #include "rootUtils.h"
 
 #include <TBranch.h>
+#include <compare>
 #include <cstddef>
 #include <functional>
 #include <iostream>
@@ -26,6 +27,7 @@
 #include "TFile.h"
 #include "TTree.h"
 #include "podio/podioVersion.h"
+#include "podio/utilities/RootHelpers.h"
 
 namespace podio {
 

diff --git a/src/ROOTReader.cc b/src/ROOTReader.cc
@@ -1,14 +1,5 @@
 #include "podio/ROOTReader.h"
 
-#include <TBranch.h>
-#include <TObjArray.h>
-#include <TObject.h>
-#include <algorithm>
-#include <functional>
-#include <optional>
-#include <stdexcept>
-#include <unordered_map>
-
 #include "podio/CollectionBase.h"
 #include "podio/CollectionBufferFactory.h"
 #include "podio/CollectionBuffers.h"
@@ -17,6 +8,16 @@
 #include "podio/GenericParameters.h"
 #include "podio/utilities/RootHelpers.h"
 #include "rootUtils.h"
+
+#include <TBranch.h>
+#include <TObjArray.h>
+#include <TObject.h>
+#include <algorithm>
+#include <compare>
+#include <functional>
+#include <optional>
+#include <stdexcept>
+#include <unordered_map>
 // ROOT specific includes
 #include "TChain.h"
 #include "TClass.h"

diff --git a/src/ROOTWriter.cc b/src/ROOTWriter.cc
@@ -15,6 +15,7 @@
 #include <cstddef>
 #include <optional>
 #include <stdexcept>
+#include <utility>
 
 namespace podio {
 

diff --git a/src/Reader.cc b/src/Reader.cc
@@ -1,6 +1,10 @@
 #include "podio/Reader.h"
 
 #include "podio/ROOTReader.h"
+
+#include <TCollection.h>
+#include <TList.h>
+#include <TObject.h>
 #if PODIO_ENABLE_RNTUPLE
   #include "podio/RNTupleReader.h"
 #endif
@@ -12,6 +16,7 @@
 #include "TKey.h"
 
 #include <memory>
+#include <utility>
 
 namespace podio {
 

diff --git a/src/RootHelpers.cc b/src/RootHelpers.cc
@@ -1,5 +1,9 @@
 #include "podio/utilities/RootHelpers.h"
 
+#include <ROOT/RVec.hxx>
+
+#include <utility>
+
 namespace podio::root_utils {
 GenericParameters
 loadParamsFrom(ROOT::VecOps::RVec<std::string> intKeys, ROOT::VecOps::RVec<std::vector<int>> intValues,

diff --git a/src/Writer.cc b/src/Writer.cc
@@ -8,7 +8,11 @@
   #include "podio/SIOWriter.h"
 #endif
 
+#include <algorithm>
+#include <cctype>
 #include <memory>
+#include <stdexcept>
+#include <utility>
 
 namespace podio {
 

diff --git a/src/rootUtils.h b/src/rootUtils.h
@@ -3,8 +3,8 @@
 
 #include "TBranch.h"
 #include "TTree.h"
-#include "podio/utilities/RootHelpers.h"
 #include "podio/CollectionIDTable.h"
+#include "podio/utilities/RootHelpers.h"
 
 #include <algorithm>
 #include <cctype>

diff --git a/tests/root_io/read_interface_rntuple.cpp b/tests/root_io/read_interface_rntuple.cpp
@@ -1,5 +1,8 @@
+#include "podio/Reader.h"
 #include "read_interface.h"
 
+#include <memory>
+
 int main(int, char**) {
   auto reader = podio::makeReader("example_from_rntuple_interface.root");
   if (read_frames(reader)) {

diff --git a/tests/root_io/read_interface_root.cpp b/tests/root_io/read_interface_root.cpp
@@ -1,5 +1,8 @@
+#include "podio/Reader.h"
 #include "read_interface.h"
 
+#include <memory>
+
 int main(int, char**) {
 
   auto reader = podio::makeReader("example_frame_interface.root");

diff --git a/tests/root_io/write_interface_rntuple.cpp b/tests/root_io/write_interface_rntuple.cpp
@@ -1,5 +1,8 @@
+#include "podio/Writer.h"
 #include "write_interface.h"
 
+#include <memory>
+
 int main(int, char**) {
   auto writer = podio::makeWriter("example_from_rntuple_interface.root", "rntuple");
   write_frames(writer);