Skip to content

Rename GlobalTrack to Track + code checker #5843

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
jgrosseo merged 2 commits into from
Apr 1, 2021
Merged

Rename GlobalTrack to Track + code checker #5843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71fb555
GlobalTrack renamned to Track
jgrosseo Apr 1, 2021
394abdc
code checker
jgrosseo Apr 1, 2021
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: 1 addition & 1 deletion Analysis/Core/include/AnalysisCore/TrackSelection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class TrackSelection
private:
bool FulfillsITSHitRequirements(uint8_t itsClusterMap);

o2::aod::track::TrackTypeEnum mTrackType{o2::aod::track::TrackTypeEnum::GlobalTrack};
o2::aod::track::TrackTypeEnum mTrackType{o2::aod::track::TrackTypeEnum::Track};

// kinematic cuts
float mMinPt{0.f}, mMaxPt{1e10f}; // range in pT
Expand Down
2 changes: 1 addition & 1 deletion Analysis/Core/include/AnalysisCore/TrackSelectionDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
TrackSelection getGlobalTrackSelection()
{
TrackSelection selectedTracks;
selectedTracks.SetTrackType(o2::aod::track::Run2GlobalTrack);
selectedTracks.SetTrackType(o2::aod::track::Run2Track);
selectedTracks.SetPtRange(0.1f, 1e10f);
selectedTracks.SetEtaRange(-0.8f, 0.8f);
selectedTracks.SetRequireITSRefit(true);
Expand Down
16 changes: 9 additions & 7 deletions Analysis/Core/src/AODMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ int main(int argc, char* argv[])
int this_option_optind = optind ? optind : 1;
int option_index = 0;
static struct option long_options[] = {
{"input", required_argument, 0, 0},
{"output", required_argument, 0, 1},
{"max-size", required_argument, 0, 2},
{"help", no_argument, 0, 3},
{0, 0, 0, 0}};
{"input", required_argument, nullptr, 0},
{"output", required_argument, nullptr, 1},
{"max-size", required_argument, nullptr, 2},
{"help", no_argument, nullptr, 3},
{nullptr, 0, nullptr, 0}};

while (true) {
int c = getopt_long(argc, argv, "", long_options, &option_index);
Expand Down Expand Up @@ -74,8 +74,9 @@ int main(int argc, char* argv[])
while (in.good()) {
in >> line;

if (line.Length() == 0)
if (line.Length() == 0) {
continue;
}

printf("Processing input file: %s\n", line.Data());

Expand All @@ -84,8 +85,9 @@ int main(int argc, char* argv[])
keyList->Sort();

for (auto key1 : *keyList) {
if (!((TObjString*)key1)->GetString().BeginsWith("DF_"))
if (!((TObjString*)key1)->GetString().BeginsWith("DF_")) {
continue;
}

auto dfName = ((TObjString*)key1)->GetString().Data();

Expand Down
2 changes: 1 addition & 1 deletion Analysis/Tasks/trackextension.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct TrackExtensionTask {

std::array<float, 2> dca{1e10f, 1e10f};
// FIXME: temporary solution to remove tracks that should not be there after conversion
if (track.trackType() == o2::aod::track::TrackTypeEnum::Run2GlobalTrack && track.itsChi2NCl() != 0.f && track.tpcChi2NCl() != 0.f && std::abs(track.x()) < 10.f) {
if (track.trackType() == o2::aod::track::TrackTypeEnum::Run2Track && track.itsChi2NCl() != 0.f && track.tpcChi2NCl() != 0.f && std::abs(track.x()) < 10.f) {
float magField = 5.0; // in kG (FIXME: get this from CCDB)
auto trackPar = getTrackPar(track);
trackPar.propagateParamToDCA({collision.posX(), collision.posY(), collision.posZ()}, magField, &dca);
Expand Down
4 changes: 2 additions & 2 deletions Framework/Core/include/Framework/DataTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ enum CollisionFlagsRun2 : uint16_t {
namespace o2::aod::track
{
enum TrackTypeEnum : uint8_t {
GlobalTrack = 0,
Track = 0,
ITSStandaloneTrack,
Run2GlobalTrack = 254,
Run2Track = 254,
Run2Tracklet = 255
};
enum TrackFlagsRun2Enum {
Expand Down