NucleiTask - Fix O2Lint errors

Author: giovannimalfattore

PWGLF/DataModel/LFNucleiTables.h

@@ -38,7 +38,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt0, isInelGt0, // is INEL > 0
                            [](int multPveta1) -> bool { return multPveta1 > 0; });
 DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt1, isInelGt1, // is INEL > 1
                            [](int multPveta1) -> bool { return multPveta1 > 1; });
-DECLARE_SOA_DYNAMIC_COLUMN(Selection_Bit, selection_bit, //! Dummy
+DECLARE_SOA_DYNAMIC_COLUMN(Selection_Bit, selection_bit, // o2-linter: disable=name/o2-column
                            [](o2::aod::evsel::EventSelectionFlags /*v*/) -> bool { return true; });
 } // namespace fullEvent
 DECLARE_SOA_TABLE(LfNuclEvents, "AOD", "LFNUCLEvent",

PWGLF/TableProducer/Nuspex/LFTreeCreatorNuclei.cxx

@@ -94,7 +94,7 @@ struct LfTreeCreatorNuclei {
   Configurable<float> cfgHighCutVertex{"cfgHighCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgLowCutVertex{"cfgLowCutVertex", -10.0f, "Accepted z-vertex range"};
   Configurable<bool> useSel8{"useSel8", true, "Use Sel8 for run3 Event Selection"};
-  Configurable<bool> TvxTrigger{"TvxTrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
+  Configurable<bool> useTVXtrigger{"useTVXtrigger", false, "Use TVX for Event Selection (default w/ Sel8)"};
   Configurable<bool> removeTFBorder{"removeTFBorder", false, "Remove TimeFrame border (default w/ Sel8)"};
   Configurable<bool> removeITSROFBorder{"removeITSROFBorder", false, "Remove ITS Read-Out Frame border (default w/ Sel8)"};
 
@@ -119,7 +119,7 @@ struct LfTreeCreatorNuclei {
                        (trackSelType.value == 1 && requireGlobalTrackInFilter()) ||      // o2-linter: disable=magic-number (filters)
                        (trackSelType.value == 2) ||                                      // o2-linter: disable=magic-number (filters)
                        (trackSelType.value == 3);                                        // o2-linter: disable=magic-number (filters)
-  Filter DCAcutFilter = (nabs(aod::track::dcaXY) < cfgCutDCAxy) && (nabs(aod::track::dcaZ) < cfgCutDCAz);
+  Filter dcaFilter = (nabs(aod::track::dcaXY) < cfgCutDCAxy) && (nabs(aod::track::dcaZ) < cfgCutDCAz);
   using EventCandidates = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Ms, aod::CentFV0As>;
   using TrackCandidates = soa::Join<aod::Tracks, aod::TracksExtra, aod::TracksDCA, aod::TrackSelection, aod::TrackSelectionExtension,
                                     aod::pidTOFbeta, aod::TOFSignal, aod::pidEvTimeFlags,
@@ -143,7 +143,7 @@ struct LfTreeCreatorNuclei {
       if (!track.hasTPC()) {
         continue;
       }
-      if (track.tpcNClsCrossedRows() < 90) {
+      if (track.tpcNClsCrossedRows() < 90) { // o2-linter: disable=magic-number (filters)
         continue;
       }
       if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) {
@@ -218,16 +218,16 @@ struct LfTreeCreatorNuclei {
       if (track.itsNClsInnerBarrel() < nITSInnerBarrelHits) {
         continue;
       }
-      if (trackSelType.value == 2) { // custom track selection mode
+      if (trackSelType.value == 2) { // custom track selection mode // o2-linter: disable=magic-number (filters)
         if (!customTrackSelection.IsSelected(track)) {
           continue;
         }
       }
-      if (trackSelType.value == 3) { // Filtering mode
+      if (trackSelType.value == 3) { // Filtering mode // o2-linter: disable=magic-number (filters)
         if (!track.hasTPC()) {
           continue;
         }
-        if (track.tpcNClsCrossedRows() < 90) {
+        if (track.tpcNClsCrossedRows() < 90) { // o2-linter: disable=magic-number (filters)
           continue;
         }
         if ((track.pt() < ptcutLow.value) || (track.pt() > ptcutHigh.value)) {
@@ -277,7 +277,7 @@ struct LfTreeCreatorNuclei {
           bool itsPassed = isITStrack(track);
           bool tpcPassed = isTPCtrack(track);
           bool hasFakeHit = false;
-          for (int i = 0; i < 10; i++) { // From ITS to TPC
+          for (int i = 0; i < 10; i++) { // From ITS to TPC // o2-linter: disable=magic-number (fake hit loop)
             if (track.mcMask() & 1 << i) {
               hasFakeHit = true;
               break;
@@ -313,7 +313,7 @@ struct LfTreeCreatorNuclei {
       hEvents.fill(HIST("eventSelection"), 0);
 
       if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
-        if (TvxTrigger)
+        if (useTVXtrigger)
           continue;
       } else {
         hEvents.fill(HIST("eventSelection"), 1);
@@ -349,11 +349,11 @@ struct LfTreeCreatorNuclei {
       hEvents.fill(HIST("eventSelection"), 6);
 
       // Fill the norm. column with good events with |z| < 10 cm before skimming
-      if (collision.posZ() < 10 && collision.posZ() > -10) { // o2-linter: disable=magic-number (10 cm vertex cut)
+      if (collision.posZ() < cfgHighCutVertex && collision.posZ() > cfgLowCutVertex) {
         hEvents.fill(HIST("eventSelection"), 7);
       }
 
-      if (doSkim && (trackSelType.value == 3) && !checkQuality<false>(collision, tracksInCollision))
+      if (doSkim && (trackSelType.value == 3) && !checkQuality<false>(collision, tracksInCollision)) // o2-linter: disable=magic-number (filters)
         continue;
       fillForOneEvent<false>(collision, tracksInCollision);
       hEvents.fill(HIST("eventSelection"), 8);
@@ -371,7 +371,7 @@ struct LfTreeCreatorNuclei {
       hEvents.fill(HIST("eventSelection"), 0);
 
       if (!collision.selection_bit(aod::evsel::kIsTriggerTVX)) {
-        if (TvxTrigger)
+        if (useTVXtrigger)
           continue;
       } else {
         hEvents.fill(HIST("eventSelection"), 1);
@@ -402,7 +402,7 @@ struct LfTreeCreatorNuclei {
       hEvents.fill(HIST("eventSelection"), 5);
 
       // Fill the norm. column with good events with |z| < 10 cm before skimming
-      if (collision.posZ() < 10 && collision.posZ() > -10) {
+      if (collision.posZ() < cfgHighCutVertex && collision.posZ() > cfgLowCutVertex) {
         hEvents.fill(HIST("eventSelection"), 7);
       }
 

PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx

@@ -238,6 +238,7 @@ struct LFNucleiBATask {
 
   Configurable<bool> enablePtShiftPID{"enablePtShiftPID", true, "Flag to enable wrong PID in tracking pT correction shift"};
   Configurable<std::vector<float>> parShiftPtPID{"parShiftPtPID", {0.0f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f, 0.1f}, "Parameters for helium3-Pt wrong pid shift (if enabled)."};
+  Configurable<float> CfgPtShiftPID{"CfgPtShiftPID", 1.25f, "Default upper limit for PID pt-shift correction"};
 
   Configurable<bool> enableCentrality{"enableCentrality", true, "Flag to enable centrality 3D histos)"};
 
@@ -2577,7 +2578,7 @@ struct LFNucleiBATask {
           }
           if (enablePtShiftPID && fShiftPtPID) {
             shiftPtPID = fShiftPtPID->Eval(2 * track.pt());
-            if (tritonPID && (track.pt() <= 1.25f)) {
+            if (tritonPID && (track.pt() <= CfgPtShiftPID)) {
               hePt = track.pt() - shiftPtPID / 2.f;
               antihePt = track.pt() - shiftPtPID / 2.f;
             }