Rename GlobalTrack to Track + code checker (#5843)

jgrosseo · web-flow · commit dfdc2a2ea6ab · 2021-04-01T16:06:39.000+02:00
diff --git a/Analysis/Core/include/AnalysisCore/TrackSelection.h b/Analysis/Core/include/AnalysisCore/TrackSelection.h
@@ -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
diff --git a/Analysis/Core/include/AnalysisCore/TrackSelectionDefaults.h b/Analysis/Core/include/AnalysisCore/TrackSelectionDefaults.h
@@ -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);
diff --git a/Analysis/Core/src/AODMerger.cxx b/Analysis/Core/src/AODMerger.cxx
@@ -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);
@@ -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());
 
@@ -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();
 
diff --git a/Analysis/Tasks/trackextension.cxx b/Analysis/Tasks/trackextension.cxx
@@ -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);
diff --git a/Framework/Core/include/Framework/DataTypes.h b/Framework/Core/include/Framework/DataTypes.h
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`TrackSelection getGlobalTrackSelection()`
`24`	`24`	`{`
`25`	`25`	`TrackSelection selectedTracks;`
`26`		`- selectedTracks.SetTrackType(o2::aod::track::Run2GlobalTrack);`
	`26`	`+ selectedTracks.SetTrackType(o2::aod::track::Run2Track);`
`27`	`27`	`selectedTracks.SetPtRange(0.1f, 1e10f);`
`28`	`28`	`selectedTracks.SetEtaRange(-0.8f, 0.8f);`
`29`	`29`	`selectedTracks.SetRequireITSRefit(true);`