Skip to content

TRD tracker can handle time frames instead of single collisions only #4297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 6 commits into from
Sep 25, 2020
Merged

TRD tracker can handle time frames instead of single collisions only #4297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cbc1eb
Slow reset of TRD tracker not required anymore
martenole Jun 11, 2020
9f30127
Add TF support to TRD tracker
martenole Jun 17, 2020
6a779cf
Remove erroneous chi2 calculation causing FPEs
martenole Sep 7, 2020
526ac15
Adapt TRD tracker steering macro to new data type
martenole Sep 15, 2020
dbc7467
Add missing LinkDef for Tracklet64 class
martenole Sep 16, 2020
a176447
Disable material correction for O2 tracking
martenole Sep 25, 2020
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
1 change: 1 addition & 0 deletions DataFormats/Detectors/TRD/src/DataFormatsTRDLinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#pragma link C++ struct o2::trd::TrackletMCMHeader + ;
#pragma link C++ struct o2::trd::TrackletMCMData + ;
#pragma link C++ class o2::trd::Tracklet64 + ;
#pragma link C++ class std::vector < o2::trd::Tracklet64> + ;
#pragma link C++ class std::vector < o2::trd::TriggerRecord > +;
#pragma link C++ class std::vector < o2::trd::LinkRecord > +;

Expand Down
12 changes: 9 additions & 3 deletions GPU/GPUTracking/TRDTracking/GPUTRDInterfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class trackInterface<AliExternalTrackParam> : public AliExternalTrackParam

const My_Float* getPar() const { return GetParameter(); }
const My_Float* getCov() const { return GetCovariance(); }
float getTime() const { return -1.f; }
bool CheckNumericalQuality() const { return true; }

// parameter manipulation
Expand Down Expand Up @@ -179,11 +180,16 @@ class trackInterface<o2::dataformats::TrackTPCITS> : public o2::dataformats::Tra
}
}

const float* getPar() { return getParams(); }
const float* getPar() const { return getParams(); }
float getTime() const { return mTime; }
void setTime(float t) { mTime = t; }

bool CheckNumericalQuality() const { return true; }

typedef o2::dataformats::TrackTPCITS baseClass;

private:
float mTime;
};

template <>
Expand All @@ -194,7 +200,7 @@ class propagatorInterface<o2::base::Propagator>
propagatorInterface<o2::base::Propagator>(const propagatorInterface<o2::base::Propagator>&) = delete;
propagatorInterface<o2::base::Propagator>& operator=(const propagatorInterface<o2::base::Propagator>&) = delete;

bool propagateToX(float x, float maxSnp, float maxStep) { return mProp->PropagateToXBxByBz(*mParam, x, 0.13957, maxSnp, maxStep); }
bool propagateToX(float x, float maxSnp, float maxStep) { return mProp->PropagateToXBxByBz(*mParam, x, 0.13957, maxSnp, maxStep, o2::base::Propagator::MatCorrType::USEMatCorrNONE); }
int getPropagatedYZ(My_Float x, My_Float& projY, My_Float& projZ) { return static_cast<int>(mParam->getYZAt(x, mProp->getNominalBz(), projY, projZ)); }

void setTrack(trackInterface<o2::dataformats::TrackTPCITS>* trk) { mParam = trk; }
Expand Down Expand Up @@ -294,6 +300,7 @@ class trackInterface<GPUTPCGMTrackParam> : public GPUTPCGMTrackParam

GPUd() const float* getPar() const { return GetPar(); }
GPUd() const float* getCov() const { return GetCov(); }
GPUd() float getTime() const { return -1.f; }

GPUd() void setAlpha(float alpha) { mAlpha = alpha; }
GPUd() void set(float x, float alpha, const float param[5], const float cov[15])
Expand Down Expand Up @@ -338,7 +345,6 @@ class propagatorInterface<GPUTPCGMPropagator> : public GPUTPCGMPropagator
{
//bool ok = PropagateToXAlpha(x, GetAlpha(), true) == 0 ? true : false;
int retVal = PropagateToXAlpha(x, GetAlpha(), true);
printf("Return value of PropagateToXAlpha: %i\n", retVal);
bool ok = (retVal == 0) ? true : false;
ok = mTrack->CheckNumericalQuality();
return ok;
Expand Down
Loading