Skip to content

Commit 974f618

Browse files
jmcarcelljmcarcell
committed
Update .clang-format
1 parent 7c4403c commit 974f618

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+260
-248
lines changed

‎.clang-format

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ ForEachMacros:
5959
- foreach
6060
- Q_FOREACH
6161
- BOOST_FOREACH
62-
IncludeBlocks: Preserve
62+
IncludeBlocks: Regroup
6363
IncludeCategories:
64+
- Regex: '<[[:alnum:]._]+>'
65+
Priority: 5
6466
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
6567
Priority: 4
6668
- Regex: '.*'

‎include/podio/CollectionBufferFactory.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#ifndef PODIO_COLLECTIONBUFFERFACTORY_H
22
#define PODIO_COLLECTIONBUFFERFACTORY_H
33

4+
#include "podio/CollectionBuffers.h"
5+
#include "podio/SchemaEvolution.h"
6+
47
#include <functional>
58
#include <optional>
69
#include <string>
710
#include <unordered_map>
811
#include <vector>
912

10-
#include "podio/CollectionBuffers.h"
11-
#include "podio/SchemaEvolution.h"
12-
1313
namespace podio {
1414

1515
/// The CollectionBufferFactory allows one to create buffers of known datatypes,

‎include/podio/GenericParameters.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#ifndef PODIO_GENERICPARAMETERS_H
33
#define PODIO_GENERICPARAMETERS_H 1
44

5+
#include "podio/utilities/TypeHelpers.h"
6+
57
#include <algorithm>
68
#include <cstddef>
79
#include <cstdint>
@@ -17,8 +19,6 @@
1719
#include <utility>
1820
#include <vector>
1921

20-
#include "podio/utilities/TypeHelpers.h"
21-
2222
namespace sio {
2323
class read_device;
2424
class write_device;

‎include/podio/RNTupleReader.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
#ifndef PODIO_RNTUPLEREADER_H
22
#define PODIO_RNTUPLEREADER_H
33

4+
#include "podio/GenericParameters.h"
5+
#include "podio/ROOTFrameData.h"
6+
#include "podio/SchemaEvolution.h"
7+
#include "podio/podioVersion.h"
8+
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
9+
410
#include <ROOT/RNTuple.hxx>
511
#include <ROOT/RNTupleModel.hxx>
12+
613
#include <RVersion.h>
714
#include <memory>
815
#include <string>
916
#include <string_view>
1017
#include <unordered_map>
1118
#include <vector>
12-
13-
#include "podio/GenericParameters.h"
14-
#include "podio/ROOTFrameData.h"
15-
#include "podio/SchemaEvolution.h"
16-
#include "podio/podioVersion.h"
17-
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
1819
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 31, 0)
1920
#include <ROOT/RNTupleReader.hxx>
2021
#endif

‎include/podio/RNTupleWriter.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#ifndef PODIO_RNTUPLEWRITER_H
22
#define PODIO_RNTUPLEWRITER_H
33

4-
#include <ROOT/RNTuple.hxx>
5-
#include <ROOT/RNTupleModel.hxx>
6-
#include <RVersion.h>
7-
#include <cstdint>
8-
94
#include "TFile.h"
105
#include "podio/CollectionBase.h"
116
#include "podio/Frame.h"
127
#include "podio/GenericParameters.h"
138
#include "podio/SchemaEvolution.h"
149
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
1510

11+
#include <ROOT/RNTuple.hxx>
12+
#include <ROOT/RNTupleModel.hxx>
13+
14+
#include <RVersion.h>
15+
#include <cstdint>
16+
1617
namespace ROOT {
1718
namespace Experimental {
1819
class REntry;

‎include/podio/ROOTLegacyReader.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#ifndef PODIO_ROOTLEGACYREADER_H
22
#define PODIO_ROOTLEGACYREADER_H
33

4+
#include "TChain.h"
45
#include "podio/CollectionBranches.h"
56
#include "podio/ROOTFrameData.h"
67
#include "podio/podioVersion.h"
78

8-
#include "TChain.h"
9-
109
#include <memory>
1110
#include <string>
1211
#include <tuple>

‎include/podio/ROOTReader.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
#ifndef PODIO_ROOTREADER_H
22
#define PODIO_ROOTREADER_H
33

4+
#include "TChain.h"
5+
#include "podio/CollectionBranches.h"
6+
#include "podio/ROOTFrameData.h"
7+
#include "podio/SchemaEvolution.h"
8+
#include "podio/podioVersion.h"
9+
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
10+
411
#include <cstddef>
512
#include <memory>
613
#include <string>
@@ -10,13 +17,6 @@
1017
#include <utility>
1118
#include <vector>
1219

13-
#include "TChain.h"
14-
#include "podio/CollectionBranches.h"
15-
#include "podio/ROOTFrameData.h"
16-
#include "podio/SchemaEvolution.h"
17-
#include "podio/podioVersion.h"
18-
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
19-
2020
// forward declarations
2121
class TClass;
2222
class TFile;

‎include/podio/ROOTWriter.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
#ifndef PODIO_ROOTWRITER_H
22
#define PODIO_ROOTWRITER_H
33

4+
#include "TFile.h"
5+
#include "podio/CollectionBranches.h"
6+
#include "podio/CollectionIDTable.h"
7+
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
8+
49
#include <cstdint>
510
#include <memory>
611
#include <string>
@@ -9,11 +14,6 @@
914
#include <utility>
1015
#include <vector>
1116

12-
#include "TFile.h"
13-
#include "podio/CollectionBranches.h"
14-
#include "podio/CollectionIDTable.h"
15-
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
16-
1717
// forward declarations
1818
class TTree;
1919

‎include/podio/SIOBlock.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
#ifndef PODIO_SIOBLOCK_H
22
#define PODIO_SIOBLOCK_H
33

4-
#include <cstddef>
5-
#include <cstdint>
6-
#include <functional>
7-
#include <map>
8-
#include <memory>
4+
#include "podio/CollectionBuffers.h"
5+
96
#include <podio/CollectionBase.h>
107
#include <podio/CollectionIDTable.h>
118
#include <podio/GenericParameters.h>
@@ -15,15 +12,19 @@
1512
#include <sio/definitions.h>
1613
#include <sio/io_device.h>
1714
#include <sio/version.h>
15+
16+
#include <cstddef>
17+
#include <cstdint>
18+
#include <functional>
19+
#include <map>
20+
#include <memory>
1821
#include <string>
1922
#include <string_view>
2023
#include <tuple>
2124
#include <unordered_map>
2225
#include <utility>
2326
#include <vector>
2427

25-
#include "podio/CollectionBuffers.h"
26-
2728
namespace podio {
2829
class GenericParameters;
2930

‎include/podio/SIOBlockUserData.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
#ifndef PODIO_SIOBLOCKUSERDATA_H
22
#define PODIO_SIOBLOCKUSERDATA_H
33

4-
#include <algorithm>
4+
#include "podio/CollectionBufferFactory.h"
5+
#include "podio/CollectionBuffers.h"
6+
#include "podio/GenericParameters.h"
7+
#include "podio/SIOBlock.h"
8+
#include "podio/UserDataCollection.h"
9+
510
#include <sio/api.h>
611
#include <sio/definitions.h>
712
#include <sio/io_device.h>
813
#include <sio/version.h>
14+
15+
#include <algorithm>
916
#include <string>
1017
#include <typeindex>
1118
#include <vector>
1219

13-
#include "podio/CollectionBufferFactory.h"
14-
#include "podio/CollectionBuffers.h"
15-
#include "podio/GenericParameters.h"
16-
#include "podio/SIOBlock.h"
17-
#include "podio/UserDataCollection.h"
18-
1920
namespace podio {
2021
namespace detail {
2122

‎include/podio/SIOFrameData.h

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
#ifndef PODIO_SIOFRAMEDATA_H
22
#define PODIO_SIOFRAMEDATA_H
33

4+
#include "podio/CollectionBuffers.h"
5+
#include "podio/CollectionIDTable.h"
6+
#include "podio/GenericParameters.h"
7+
#include "podio/SIOBlock.h"
8+
9+
#include <sio/buffer.h>
10+
#include <sio/definitions.h>
11+
412
#include <cstddef>
513
#include <memory>
614
#include <numeric>
715
#include <optional>
8-
#include <sio/buffer.h>
9-
#include <sio/definitions.h>
1016
#include <string>
1117
#include <utility>
1218
#include <vector>
1319

14-
#include "podio/CollectionBuffers.h"
15-
#include "podio/CollectionIDTable.h"
16-
#include "podio/GenericParameters.h"
17-
#include "podio/SIOBlock.h"
18-
1920
namespace podio {
2021
/// The Frame data container for the SIO backend. It is constructed from the
2122
/// compressed sio::buffers that is read from file and does all the necessary

‎include/podio/SIOLegacyReader.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#ifndef PODIO_SIOLEGACYREADER_H
22
#define PODIO_SIOLEGACYREADER_H
33

4-
#include <fstream>
5-
#include <memory>
4+
#include "podio/SIOBlock.h"
5+
#include "podio/SIOFrameData.h"
6+
#include "podio/podioVersion.h"
7+
68
#include <sio/buffer.h>
79
#include <sio/definitions.h>
10+
11+
#include <fstream>
12+
#include <memory>
813
#include <string>
914
#include <string_view>
1015
#include <vector>
1116

12-
#include "podio/SIOBlock.h"
13-
#include "podio/SIOFrameData.h"
14-
#include "podio/podioVersion.h"
15-
1617
namespace podio {
1718

1819
class CollectionIDTable;

‎include/podio/SIOReader.h

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
#ifndef PODIO_SIOREADER_H
22
#define PODIO_SIOREADER_H
33

4+
#include "podio/SIOBlock.h"
5+
#include "podio/SIOFrameData.h"
6+
#include "podio/podioVersion.h"
7+
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
8+
9+
#include <sio/definitions.h>
10+
411
#include <fstream>
512
#include <memory>
6-
#include <sio/definitions.h>
713
#include <string>
814
#include <string_view>
915
#include <unordered_map>
1016
#include <vector>
1117

12-
#include "podio/SIOBlock.h"
13-
#include "podio/SIOFrameData.h"
14-
#include "podio/podioVersion.h"
15-
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
16-
1718
namespace podio {
1819

1920
class CollectionIDTable;

‎include/podio/SIOWriter.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#ifndef PODIO_SIOWRITER_H
22
#define PODIO_SIOWRITER_H
33

4-
#include <fstream>
4+
#include "podio/SIOBlock.h"
5+
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
6+
57
#include <sio/definitions.h>
8+
9+
#include <fstream>
610
#include <string>
711
#include <utility>
812
#include <vector>
913

10-
#include "podio/SIOBlock.h"
11-
#include "podio/utilities/DatamodelRegistryIOHelpers.h"
12-
1314
namespace podio {
1415

1516
class Frame;

‎include/podio/UserDataCollection.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
#ifndef PODIO_USERDATACOLLECTION_H
22
#define PODIO_USERDATACOLLECTION_H
33

4+
#include "podio/CollectionBase.h"
5+
#include "podio/CollectionBuffers.h"
6+
#include "podio/DatamodelRegistry.h"
7+
#include "podio/SchemaEvolution.h"
8+
#include "podio/utilities/TypeHelpers.h"
9+
410
#include <cstddef>
511
#include <cstdint>
612
#include <iostream>
@@ -10,12 +16,6 @@
1016
#include <utility>
1117
#include <vector>
1218

13-
#include "podio/CollectionBase.h"
14-
#include "podio/CollectionBuffers.h"
15-
#include "podio/DatamodelRegistry.h"
16-
#include "podio/SchemaEvolution.h"
17-
#include "podio/utilities/TypeHelpers.h"
18-
1919
namespace podio {
2020
class ICollectionProvider;
2121
} // namespace podio

‎include/podio/utilities/DatamodelRegistryIOHelpers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
22
#define PODIO_UTILITIES_DATAMODELREGISTRYIOHELPERS_H
33

4+
#include "podio/CollectionBase.h"
5+
46
#include <cstddef>
57
#include <set>
68
#include <string>
@@ -9,8 +11,6 @@
911
#include <utility>
1012
#include <vector>
1113

12-
#include "podio/CollectionBase.h"
13-
1414
namespace podio {
1515
class CollectionBase;
1616

‎python/CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
SET(podio_PYTHON_INSTALLDIR python)
2-
SET(podio_PYTHON_INSTALLDIR ${podio_PYTHON_INSTALLDIR} PARENT_SCOPE)
1+
find_package(Python3 REQUIRED)
2+
set(PYTHON_LIB_DIR lib)
3+
if("${Python3_SITEARCH}" MATCHES "/lib64/")
4+
set(PYTHON_LIB_DIR lib64)
5+
endif()
6+
7+
set(podio_PYTHON_INSTALLDIR "${CMAKE_INSTALL_PREFIX}/${PYTHON_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages")
8+
set(podio_PYTHON_INSTALLDIR ${podio_PYTHON_INSTALLDIR} PARENT_SCOPE)
39

410
set(to_install
511
podio_class_generator.py

0 commit comments

Comments
 (0)