Skip to content

Commit 40ca036

Browse files
davidrohrdavidrohr
committed
Remove unnecessary includes and fix compiler warnings
1 parent d3f1998 commit 40ca036

25 files changed

Lines changed: 10 additions & 31 deletions

File tree

‎DataFormats/Detectors/TPC/include/DataFormatsTPC/ClusterNativeHelper.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "DataFormatsTPC/ClusterNative.h"
1919
#include "DataFormatsTPC/ClusterGroupAttribute.h"
2020
#include "DataFormatsTPC/Constants.h"
21-
#include "SimulationDataFormat/MCTruthContainer.h"
2221
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2322
#include "SimulationDataFormat/MCCompLabel.h"
2423
#include <gsl/gsl>

‎DataFormats/simulation/include/SimulationDataFormat/ConstMCTruthContainer.h‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#define O2_CONSTMCTRUTHCONTAINER_H
1717

1818
#include <SimulationDataFormat/MCTruthContainer.h>
19+
#ifndef GPUCA_STANDALONE
1920
#include <Framework/Traits.h>
21+
#endif
2022

2123
namespace o2
2224
{
@@ -77,7 +79,7 @@ class ConstMCTruthContainer : public std::vector<char>
7779
/// Restore internal vectors from a raw buffer
7880
/// The two vectors are resized according to the information in the \a FlatHeader
7981
/// struct at the beginning of the buffer. Data is copied to the vectors.
80-
TruthElement const* const getLabelStart() const
82+
TruthElement const* getLabelStart() const
8183
{
8284
auto* source = &(*this)[0];
8385
auto flatheader = getHeader();
@@ -94,7 +96,7 @@ class ConstMCTruthContainer : public std::vector<char>
9496
return flatheader;
9597
}
9698

97-
MCTruthHeaderElement const* const getHeaderStart() const
99+
MCTruthHeaderElement const* getHeaderStart() const
98100
{
99101
auto* source = &(*this)[0];
100102
source += sizeof(FlatHeader);
@@ -108,12 +110,14 @@ class ConstMCTruthContainer : public std::vector<char>
108110
// In particular in enables
109111
// a) --> snapshot without ROOT dictionary (as a flat buffer)
110112
// b) --> requesting the resource in shared mem using make<T>
113+
#ifndef GPUCA_STANDALONE
111114
namespace o2::framework
112115
{
113116
template <typename T>
114117
struct is_specialization<o2::dataformats::ConstMCTruthContainer<T>, std::vector> : std::true_type {
115118
};
116119
} // namespace o2::framework
120+
#endif
117121

118122
namespace o2
119123
{
@@ -149,10 +153,10 @@ class ConstMCTruthContainerView
149153
}
150154

151155
// return the number of original data indexed here
152-
size_t getIndexedSize() const { return mStorage.size() >= sizeof(FlatHeader) ? getHeader().nofHeaderElements : 0; }
156+
size_t getIndexedSize() const { return (size_t)mStorage.size() >= sizeof(FlatHeader) ? getHeader().nofHeaderElements : 0; }
153157

154158
// return the number of labels managed in this container
155-
size_t getNElements() const { return mStorage.size() >= sizeof(FlatHeader) ? getHeader().nofTruthElements : 0; }
159+
size_t getNElements() const { return (size_t)mStorage.size() >= sizeof(FlatHeader) ? getHeader().nofTruthElements : 0; }
156160

157161
// return underlying buffer
158162
const gsl::span<const char>& getBuffer() const { return mStorage; }
@@ -174,7 +178,7 @@ class ConstMCTruthContainerView
174178
/// Restore internal vectors from a raw buffer
175179
/// The two vectors are resized according to the information in the \a FlatHeader
176180
/// struct at the beginning of the buffer. Data is copied to the vectors.
177-
TruthElement const* const getLabelStart() const
181+
TruthElement const* getLabelStart() const
178182
{
179183
auto* source = &(mStorage)[0];
180184
auto flatheader = getHeader();
@@ -191,7 +195,7 @@ class ConstMCTruthContainerView
191195
return flatheader;
192196
}
193197

194-
MCTruthHeaderElement const* const getHeaderStart() const
198+
MCTruthHeaderElement const* getHeaderStart() const
195199
{
196200
auto* source = &(mStorage)[0];
197201
source += sizeof(FlatHeader);

‎DataFormats/simulation/test/testMCTruthContainer.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#define BOOST_TEST_MAIN
1313
#define BOOST_TEST_DYN_LINK
1414
#include <boost/test/unit_test.hpp>
15-
#include "SimulationDataFormat/MCTruthContainer.h"
1615
#include "SimulationDataFormat/MCCompLabel.h"
1716
#include "SimulationDataFormat/ConstMCTruthContainer.h"
1817
#include "SimulationDataFormat/LabelContainer.h"

‎Detectors/ITSMFT/ITS/workflow/src/ClustererSpec.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "DataFormatsITSMFT/CompCluster.h"
2222
#include "SimulationDataFormat/MCCompLabel.h"
2323
#include "SimulationDataFormat/ConstMCTruthContainer.h"
24-
#include "SimulationDataFormat/MCTruthContainer.h"
2524
#include "DataFormatsITSMFT/ROFRecord.h"
2625
#include "DataFormatsParameters/GRPObject.h"
2726
#include "ITSMFTReconstruction/DigitPixelReader.h"

‎Detectors/ITSMFT/ITS/workflow/src/DigitReaderSpec.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/// @file DigitReaderSpec.cxx
1212

1313
#include <vector>
14-
#include <SimulationDataFormat/ConstMCTruthContainer.h>
1514

1615
#include "TTree.h"
1716

‎Detectors/ITSMFT/MFT/workflow/src/ClustererSpec.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "ITSMFTReconstruction/ChipMappingMFT.h"
2020
#include "DataFormatsITSMFT/CompCluster.h"
2121
#include "SimulationDataFormat/MCCompLabel.h"
22-
#include "SimulationDataFormat/MCTruthContainer.h"
2322
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2423
#include "DataFormatsITSMFT/ROFRecord.h"
2524
#include "DataFormatsParameters/GRPObject.h"

‎Detectors/TPC/reconstruction/include/TPCReconstruction/Clusterer.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <vector>
1818
#include <memory>
1919

20-
#include "SimulationDataFormat/MCTruthContainer.h"
2120
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2221
#include "SimulationDataFormat/MCCompLabel.h"
2322

‎Detectors/TPC/reconstruction/include/TPCReconstruction/ClustererTask.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "DataFormatsTPC/Digit.h"
2222
#include "TPCReconstruction/HwClusterer.h"
23-
#include "SimulationDataFormat/MCTruthContainer.h"
2423
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2524
#include "SimulationDataFormat/MCCompLabel.h"
2625
#include "DataFormatsTPC/Helpers.h"

‎Detectors/TPC/reconstruction/include/TPCReconstruction/HwClusterer.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include "TPCReconstruction/Clusterer.h"
2121
#include "DataFormatsTPC/Helpers.h"
2222

23-
#include "SimulationDataFormat/MCTruthContainer.h"
2423
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2524
#include "SimulationDataFormat/MCCompLabel.h"
2625

‎Detectors/TPC/reconstruction/src/GPUCATracking.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "FairLogger.h"
1717
#include "ReconstructionDataFormats/Track.h"
1818
#include "SimulationDataFormat/MCCompLabel.h"
19-
#include "SimulationDataFormat/MCTruthContainer.h"
2019
#include "SimulationDataFormat/ConstMCTruthContainer.h"
2120
#include "TChain.h"
2221
#include "TClonesArray.h"

0 commit comments

Comments
 (0)