Skip to content

Commit a9f151b

Browse files
committed
ITS: cleanup unused classes
Signed-off-by: Felix Schlepper <felix.schlepper@cern.ch>
1 parent 82d072d commit a9f151b

File tree

17 files changed

+144
-665
lines changed

17 files changed

+144
-665
lines changed

Detectors/ITSMFT/ITS/tracking/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ o2_add_library(ITStracking
1515
SOURCES src/ClusterLines.cxx
1616
src/Cluster.cxx
1717
src/Configuration.cxx
18-
src/ROframe.cxx
1918
src/TimeFrame.cxx
2019
src/IOUtils.cxx
21-
src/Label.cxx
2220
src/Tracker.cxx
2321
src/TrackerTraits.cxx
2422
src/TrackingConfigParam.cxx

Detectors/ITSMFT/ITS/tracking/include/ITStracking/ArrayUtils.h

Lines changed: 0 additions & 53 deletions
This file was deleted.

Detectors/ITSMFT/ITS/tracking/include/ITStracking/IOUtils.h

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -16,62 +16,27 @@
1616
#ifndef TRACKINGITSU_INCLUDE_EVENTLOADER_H_
1717
#define TRACKINGITSU_INCLUDE_EVENTLOADER_H_
1818

19-
#include <iosfwd>
20-
#include <string>
21-
#include <unordered_map>
2219
#include <vector>
2320

24-
#include "DataFormatsITSMFT/ROFRecord.h"
25-
#include "ITStracking/Configuration.h"
26-
#include "ITStracking/ROframe.h"
27-
#include "ITStracking/Label.h"
28-
#include "ITStracking/Road.h"
29-
#include "ITStracking/TrackingConfigParam.h"
3021
#include "ITSMFTBase/SegmentationAlpide.h"
3122
#include "ReconstructionDataFormats/BaseCluster.h"
32-
#include "ITSMFTReconstruction/ChipMappingITS.h"
3323
#include "DataFormatsITSMFT/CompCluster.h"
3424
#include "DataFormatsITSMFT/TopologyDictionary.h"
25+
#include "DataFormatsITSMFT/ROFRecord.h" // TODO this is just included since the alignment code include it now
3526

36-
namespace o2
27+
namespace o2::its::ioutils
3728
{
3829

39-
class MCCompLabel;
40-
41-
namespace dataformats
42-
{
43-
template <typename T>
44-
class MCTruthContainer;
45-
}
46-
47-
namespace its
48-
{
49-
50-
namespace ioutils
51-
{
5230
constexpr float DefClusErrorRow = o2::itsmft::SegmentationAlpide::PitchRow * 0.5;
5331
constexpr float DefClusErrorCol = o2::itsmft::SegmentationAlpide::PitchCol * 0.5;
5432
constexpr float DefClusError2Row = DefClusErrorRow * DefClusErrorRow;
5533
constexpr float DefClusError2Col = DefClusErrorCol * DefClusErrorCol;
5634

57-
void loadEventData(ROframe& events, gsl::span<const itsmft::CompClusterExt> clusters,
58-
gsl::span<const unsigned char>::iterator& pattIt, const itsmft::TopologyDictionary* dict,
59-
const dataformats::MCTruthContainer<MCCompLabel>* clsLabels = nullptr);
60-
int loadROFrameData(const o2::itsmft::ROFRecord& rof, ROframe& events, gsl::span<const itsmft::CompClusterExt> clusters,
61-
gsl::span<const unsigned char>::iterator& pattIt, const itsmft::TopologyDictionary* dict,
62-
const dataformats::MCTruthContainer<MCCompLabel>* mClsLabels = nullptr);
63-
6435
void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
6536
gsl::span<const unsigned char>::iterator& pattIt,
6637
std::vector<o2::BaseCluster<float>>& output,
6738
const itsmft::TopologyDictionary* dict);
6839

69-
inline static const o2::itsmft::ChipMappingITS& getChipMappingITS()
70-
{
71-
static const o2::itsmft::ChipMappingITS MP;
72-
return MP;
73-
}
74-
7540
template <class iterator, typename T>
7641
o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const itsmft::TopologyDictionary* dict, T& sig2y, T& sig2z)
7742
{
@@ -115,8 +80,6 @@ std::array<T, 3> extractClusterDataA(const itsmft::CompClusterExt& c, iterator&
11580
}
11681
}
11782

118-
} // namespace ioutils
119-
} // namespace its
120-
} // namespace o2
83+
} // namespace o2::its::ioutils
12184

12285
#endif /* TRACKINGITSU_INCLUDE_EVENTLOADER_H_ */

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Label.h

Lines changed: 0 additions & 41 deletions
This file was deleted.

Detectors/ITSMFT/ITS/tracking/include/ITStracking/ROframe.h

Lines changed: 0 additions & 190 deletions
This file was deleted.

Detectors/ITSMFT/ITS/tracking/include/ITStracking/Smoother.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "ReconstructionDataFormats/Track.h"
1818
#include "DataFormatsITS/TrackITS.h"
1919
#include "DetectorsBase/Propagator.h"
20-
#include "ITStracking/ROframe.h"
2120

2221
namespace o2
2322
{
@@ -28,14 +27,14 @@ template <unsigned int D>
2827
class Smoother
2928
{
3029
public:
31-
Smoother(TrackITSExt& track, size_t layer, const ROframe& event, float bZ, o2::base::PropagatorF::MatCorrType corr);
30+
// Smoother(TrackITSExt& track, size_t layer, const ROframe& event, float bZ, o2::base::PropagatorF::MatCorrType corr);
3231
~Smoother();
3332

3433
bool isValidInit() const
3534
{
3635
return mInitStatus;
3736
}
38-
bool testCluster(const int clusterId, const ROframe& event);
37+
// bool testCluster(const int clusterId, const ROframe& event);
3938
bool getSmoothedTrack();
4039
float getChi2() const { return mBestChi2; }
4140
float getLastChi2() const { return mLastChi2; }

0 commit comments

Comments
 (0)