Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Detectors/ITSMFT/ITS/tracking/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ o2_add_library(ITStracking
SOURCES src/ClusterLines.cxx
src/Cluster.cxx
src/Configuration.cxx
src/ROframe.cxx
src/TimeFrame.cxx
src/IOUtils.cxx
src/Label.cxx
src/Tracker.cxx
src/TrackerTraits.cxx
src/TrackingConfigParam.cxx
Expand Down
53 changes: 0 additions & 53 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/ArrayUtils.h

This file was deleted.

43 changes: 3 additions & 40 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/IOUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,62 +16,27 @@
#ifndef TRACKINGITSU_INCLUDE_EVENTLOADER_H_
#define TRACKINGITSU_INCLUDE_EVENTLOADER_H_

#include <iosfwd>
#include <string>
#include <unordered_map>
#include <vector>

#include "DataFormatsITSMFT/ROFRecord.h"
#include "ITStracking/Configuration.h"
#include "ITStracking/ROframe.h"
#include "ITStracking/Label.h"
#include "ITStracking/Road.h"
#include "ITStracking/TrackingConfigParam.h"
#include "ITSMFTBase/SegmentationAlpide.h"
#include "ReconstructionDataFormats/BaseCluster.h"
#include "ITSMFTReconstruction/ChipMappingITS.h"
#include "DataFormatsITSMFT/CompCluster.h"
#include "DataFormatsITSMFT/TopologyDictionary.h"
#include "DataFormatsITSMFT/ROFRecord.h" // TODO this is just included since the alignment code include it now

namespace o2
namespace o2::its::ioutils
{

class MCCompLabel;

namespace dataformats
{
template <typename T>
class MCTruthContainer;
}

namespace its
{

namespace ioutils
{
constexpr float DefClusErrorRow = o2::itsmft::SegmentationAlpide::PitchRow * 0.5;
constexpr float DefClusErrorCol = o2::itsmft::SegmentationAlpide::PitchCol * 0.5;
constexpr float DefClusError2Row = DefClusErrorRow * DefClusErrorRow;
constexpr float DefClusError2Col = DefClusErrorCol * DefClusErrorCol;

void loadEventData(ROframe& events, gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt, const itsmft::TopologyDictionary* dict,
const dataformats::MCTruthContainer<MCCompLabel>* clsLabels = nullptr);
int loadROFrameData(const o2::itsmft::ROFRecord& rof, ROframe& events, gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt, const itsmft::TopologyDictionary* dict,
const dataformats::MCTruthContainer<MCCompLabel>* mClsLabels = nullptr);

void convertCompactClusters(gsl::span<const itsmft::CompClusterExt> clusters,
gsl::span<const unsigned char>::iterator& pattIt,
std::vector<o2::BaseCluster<float>>& output,
const itsmft::TopologyDictionary* dict);

inline static const o2::itsmft::ChipMappingITS& getChipMappingITS()
{
static const o2::itsmft::ChipMappingITS MP;
return MP;
}

template <class iterator, typename T>
o2::math_utils::Point3D<T> extractClusterData(const itsmft::CompClusterExt& c, iterator& iter, const itsmft::TopologyDictionary* dict, T& sig2y, T& sig2z)
{
Expand Down Expand Up @@ -115,8 +80,6 @@ std::array<T, 3> extractClusterDataA(const itsmft::CompClusterExt& c, iterator&
}
}

} // namespace ioutils
} // namespace its
} // namespace o2
} // namespace o2::its::ioutils

#endif /* TRACKINGITSU_INCLUDE_EVENTLOADER_H_ */
41 changes: 0 additions & 41 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Label.h

This file was deleted.

190 changes: 0 additions & 190 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/ROframe.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "ReconstructionDataFormats/Track.h"
#include "DataFormatsITS/TrackITS.h"
#include "DetectorsBase/Propagator.h"
#include "ITStracking/ROframe.h"

namespace o2
{
Expand All @@ -28,14 +27,14 @@ template <unsigned int D>
class Smoother
{
public:
Smoother(TrackITSExt& track, size_t layer, const ROframe& event, float bZ, o2::base::PropagatorF::MatCorrType corr);
// Smoother(TrackITSExt& track, size_t layer, const ROframe& event, float bZ, o2::base::PropagatorF::MatCorrType corr);
~Smoother();

bool isValidInit() const
{
return mInitStatus;
}
bool testCluster(const int clusterId, const ROframe& event);
// bool testCluster(const int clusterId, const ROframe& event);
bool getSmoothedTrack();
float getChi2() const { return mBestChi2; }
float getLastChi2() const { return mLastChi2; }
Expand Down
Loading