Update .clang-format

AIDASoft · May 22, 2024 · 974f618 · 974f618
1 parent 7c4403c
commit 974f618
Show file tree

Hide file tree

Showing 63 changed files with 260 additions and 248 deletions.
diff --git a/.clang-format b/.clang-format
@@ -59,8 +59,10 @@ ForEachMacros:
   - foreach
   - Q_FOREACH
   - BOOST_FOREACH
-IncludeBlocks:   Preserve
+IncludeBlocks:   Regroup
 IncludeCategories:
+  - Regex:           '<[[:alnum:]._]+>'
+    Priority:        5
   - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
     Priority:        4
   - Regex:           '.*'

diff --git a/include/podio/CollectionBufferFactory.h b/include/podio/CollectionBufferFactory.h
@@ -1,15 +1,15 @@
 #ifndef PODIO_COLLECTIONBUFFERFACTORY_H
 #define PODIO_COLLECTIONBUFFERFACTORY_H
 
+#include "podio/CollectionBuffers.h"
+#include "podio/SchemaEvolution.h"
+
 #include <functional>
 #include <optional>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include "podio/CollectionBuffers.h"
-#include "podio/SchemaEvolution.h"
-
 namespace podio {
 
 /// The CollectionBufferFactory allows one to create buffers of known datatypes,

diff --git a/include/podio/GenericParameters.h b/include/podio/GenericParameters.h
@@ -2,6 +2,8 @@
 #ifndef PODIO_GENERICPARAMETERS_H
 #define PODIO_GENERICPARAMETERS_H 1
 
+#include "podio/utilities/TypeHelpers.h"
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
@@ -17,8 +19,6 @@
 #include <utility>
 #include <vector>
 
-#include "podio/utilities/TypeHelpers.h"
-
 namespace sio {
 class read_device;
 class write_device;

diff --git a/include/podio/RNTupleReader.h b/include/podio/RNTupleReader.h
@@ -1,20 +1,21 @@
 #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/RNTuple.hxx>
 #include <ROOT/RNTupleModel.hxx>
+
 #include <RVersion.h>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 #include <vector>
-
-#include "podio/GenericParameters.h"
-#include "podio/ROOTFrameData.h"
-#include "podio/SchemaEvolution.h"
-#include "podio/podioVersion.h"
-#include "podio/utilities/DatamodelRegistryIOHelpers.h"
 #if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
   #include <ROOT/RNTupleReader.hxx>
 #endif

diff --git a/include/podio/RNTupleWriter.h b/include/podio/RNTupleWriter.h
@@ -1,18 +1,19 @@
 #ifndef PODIO_RNTUPLEWRITER_H
 #define PODIO_RNTUPLEWRITER_H
 
-#include <ROOT/RNTuple.hxx>
-#include <ROOT/RNTupleModel.hxx>
-#include <RVersion.h>
-#include <cstdint>
-
 #include "TFile.h"
 #include "podio/CollectionBase.h"
 #include "podio/Frame.h"
 #include "podio/GenericParameters.h"
 #include "podio/SchemaEvolution.h"
 #include "podio/utilities/DatamodelRegistryIOHelpers.h"
 
+#include <ROOT/RNTuple.hxx>
+#include <ROOT/RNTupleModel.hxx>
+
+#include <RVersion.h>
+#include <cstdint>
+
 namespace ROOT {
 namespace Experimental {
   class REntry;

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/CollectionBranches.h"
 #include "podio/ROOTFrameData.h"
 #include "podio/podioVersion.h"
 
-#include "TChain.h"
-
 #include <memory>
 #include <string>
 #include <tuple>

diff --git a/include/podio/ROOTReader.h b/include/podio/ROOTReader.h
@@ -1,6 +1,13 @@
 #ifndef PODIO_ROOTREADER_H
 #define PODIO_ROOTREADER_H
 
+#include "TChain.h"
+#include "podio/CollectionBranches.h"
+#include "podio/ROOTFrameData.h"
+#include "podio/SchemaEvolution.h"
+#include "podio/podioVersion.h"
+#include "podio/utilities/DatamodelRegistryIOHelpers.h"
+
 #include <cstddef>
 #include <memory>
 #include <string>
@@ -10,13 +17,6 @@
 #include <utility>
 #include <vector>
 
-#include "TChain.h"
-#include "podio/CollectionBranches.h"
-#include "podio/ROOTFrameData.h"
-#include "podio/SchemaEvolution.h"
-#include "podio/podioVersion.h"
-#include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 // forward declarations
 class TClass;
 class TFile;

diff --git a/include/podio/ROOTWriter.h b/include/podio/ROOTWriter.h
@@ -1,6 +1,11 @@
 #ifndef PODIO_ROOTWRITER_H
 #define PODIO_ROOTWRITER_H
 
+#include "TFile.h"
+#include "podio/CollectionBranches.h"
+#include "podio/CollectionIDTable.h"
+#include "podio/utilities/DatamodelRegistryIOHelpers.h"
+
 #include <cstdint>
 #include <memory>
 #include <string>
@@ -9,11 +14,6 @@
 #include <utility>
 #include <vector>
 
-#include "TFile.h"
-#include "podio/CollectionBranches.h"
-#include "podio/CollectionIDTable.h"
-#include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 // forward declarations
 class TTree;
 

diff --git a/include/podio/SIOBlock.h b/include/podio/SIOBlock.h
@@ -1,11 +1,8 @@
 #ifndef PODIO_SIOBLOCK_H
 #define PODIO_SIOBLOCK_H
 
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <memory>
+#include "podio/CollectionBuffers.h"
+
 #include <podio/CollectionBase.h>
 #include <podio/CollectionIDTable.h>
 #include <podio/GenericParameters.h>
@@ -15,15 +12,19 @@
 #include <sio/definitions.h>
 #include <sio/io_device.h>
 #include <sio/version.h>
+
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <map>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <tuple>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include "podio/CollectionBuffers.h"
-
 namespace podio {
 class GenericParameters;
 

diff --git a/include/podio/SIOBlockUserData.h b/include/podio/SIOBlockUserData.h
@@ -1,21 +1,22 @@
 #ifndef PODIO_SIOBLOCKUSERDATA_H
 #define PODIO_SIOBLOCKUSERDATA_H
 
-#include <algorithm>
+#include "podio/CollectionBufferFactory.h"
+#include "podio/CollectionBuffers.h"
+#include "podio/GenericParameters.h"
+#include "podio/SIOBlock.h"
+#include "podio/UserDataCollection.h"
+
 #include <sio/api.h>
 #include <sio/definitions.h>
 #include <sio/io_device.h>
 #include <sio/version.h>
+
+#include <algorithm>
 #include <string>
 #include <typeindex>
 #include <vector>
 
-#include "podio/CollectionBufferFactory.h"
-#include "podio/CollectionBuffers.h"
-#include "podio/GenericParameters.h"
-#include "podio/SIOBlock.h"
-#include "podio/UserDataCollection.h"
-
 namespace podio {
 namespace detail {
 

diff --git a/include/podio/SIOFrameData.h b/include/podio/SIOFrameData.h
@@ -1,21 +1,22 @@
 #ifndef PODIO_SIOFRAMEDATA_H
 #define PODIO_SIOFRAMEDATA_H
 
+#include "podio/CollectionBuffers.h"
+#include "podio/CollectionIDTable.h"
+#include "podio/GenericParameters.h"
+#include "podio/SIOBlock.h"
+
+#include <sio/buffer.h>
+#include <sio/definitions.h>
+
 #include <cstddef>
 #include <memory>
 #include <numeric>
 #include <optional>
-#include <sio/buffer.h>
-#include <sio/definitions.h>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "podio/CollectionBuffers.h"
-#include "podio/CollectionIDTable.h"
-#include "podio/GenericParameters.h"
-#include "podio/SIOBlock.h"
-
 namespace podio {
 /// The Frame data container for the SIO backend. It is constructed from the
 /// compressed sio::buffers that is read from file and does all the necessary

diff --git a/include/podio/SIOLegacyReader.h b/include/podio/SIOLegacyReader.h
@@ -1,18 +1,19 @@
 #ifndef PODIO_SIOLEGACYREADER_H
 #define PODIO_SIOLEGACYREADER_H
 
-#include <fstream>
-#include <memory>
+#include "podio/SIOBlock.h"
+#include "podio/SIOFrameData.h"
+#include "podio/podioVersion.h"
+
 #include <sio/buffer.h>
 #include <sio/definitions.h>
+
+#include <fstream>
+#include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "podio/SIOBlock.h"
-#include "podio/SIOFrameData.h"
-#include "podio/podioVersion.h"
-
 namespace podio {
 
 class CollectionIDTable;

diff --git a/include/podio/SIOReader.h b/include/podio/SIOReader.h
@@ -1,19 +1,20 @@
 #ifndef PODIO_SIOREADER_H
 #define PODIO_SIOREADER_H
 
+#include "podio/SIOBlock.h"
+#include "podio/SIOFrameData.h"
+#include "podio/podioVersion.h"
+#include "podio/utilities/DatamodelRegistryIOHelpers.h"
+
+#include <sio/definitions.h>
+
 #include <fstream>
 #include <memory>
-#include <sio/definitions.h>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 #include <vector>
 
-#include "podio/SIOBlock.h"
-#include "podio/SIOFrameData.h"
-#include "podio/podioVersion.h"
-#include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 namespace podio {
 
 class CollectionIDTable;

diff --git a/include/podio/SIOWriter.h b/include/podio/SIOWriter.h
@@ -1,15 +1,16 @@
 #ifndef PODIO_SIOWRITER_H
 #define PODIO_SIOWRITER_H
 
-#include <fstream>
+#include "podio/SIOBlock.h"
+#include "podio/utilities/DatamodelRegistryIOHelpers.h"
+
 #include <sio/definitions.h>
+
+#include <fstream>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "podio/SIOBlock.h"
-#include "podio/utilities/DatamodelRegistryIOHelpers.h"
-
 namespace podio {
 
 class Frame;

diff --git a/include/podio/UserDataCollection.h b/include/podio/UserDataCollection.h
@@ -1,6 +1,12 @@
 #ifndef PODIO_USERDATACOLLECTION_H
 #define PODIO_USERDATACOLLECTION_H
 
+#include "podio/CollectionBase.h"
+#include "podio/CollectionBuffers.h"
+#include "podio/DatamodelRegistry.h"
+#include "podio/SchemaEvolution.h"
+#include "podio/utilities/TypeHelpers.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <iostream>
@@ -10,12 +16,6 @@
 #include <utility>
 #include <vector>
 
-#include "podio/CollectionBase.h"
-#include "podio/CollectionBuffers.h"
-#include "podio/DatamodelRegistry.h"
-#include "podio/SchemaEvolution.h"
-#include "podio/utilities/TypeHelpers.h"
-
 namespace podio {
 class ICollectionProvider;
 } // namespace podio

diff --git a/include/podio/utilities/DatamodelRegistryIOHelpers.h b/include/podio/utilities/DatamodelRegistryIOHelpers.h
@@ -1,6 +1,8 @@
 #ifndef PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 #define PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
 
+#include "podio/CollectionBase.h"
+
 #include <cstddef>
 #include <set>
 #include <string>
@@ -9,8 +11,6 @@
 #include <utility>
 #include <vector>
 
-#include "podio/CollectionBase.h"
-
 namespace podio {
 class CollectionBase;
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -1,5 +1,11 @@
-SET(podio_PYTHON_INSTALLDIR python)
-SET(podio_PYTHON_INSTALLDIR ${podio_PYTHON_INSTALLDIR} PARENT_SCOPE)
+find_package(Python3 REQUIRED)
+set(PYTHON_LIB_DIR lib)
+if("${Python3_SITEARCH}" MATCHES "/lib64/")
+  set(PYTHON_LIB_DIR lib64)
+endif()
+
+set(podio_PYTHON_INSTALLDIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages")
+set(podio_PYTHON_INSTALLDIR ${podio_PYTHON_INSTALLDIR} PARENT_SCOPE)
 
 set(to_install
   podio_class_generator.py