NucleiTask - Fix O2Lint errors

Author: giovannimalfattore

PWGLF/Tasks/Nuspex/LFNucleiBATask.cxx

@@ -15,6 +15,11 @@
 /// \brief  Analysis task for the measurement of the coalescence parameter B2/B3 in pp collisions for (anti)deuteron/(anti)helium-3
 ///
 /// \author Giovanni Malfattore <giovanni.malfattore@cern.ch> and Rutuparna Rath <rutuparna.rath@cern.ch>
+<<<<<<< HEAD
+=======
+
+// o2-linter: disable=name/workflow-file
+>>>>>>> 5678d3143 (NucleiTask - Fix O2Lint errors)
 
 #include "PWGLF/DataModel/LFNucleiTables.h"
 #include "PWGLF/DataModel/LFParticleIdentification.h"
@@ -237,11 +242,15 @@ 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)."};
+<<<<<<< HEAD
 <<<<<<< HEAD
   Configurable<float> cfgPtShiftPID{"cfgPtShiftPID", 1.25f, "Default upper limit for PID pt-shift correction"};
 =======
   Configurable<float> CfgPtShiftPID{"CfgPtShiftPID", 1.25f, "Default upper limit for PID pt-shift correction"};
 >>>>>>> 4b515a987 (NucleiTask - Fix O2Lint errors)
+=======
+  Configurable<float> cfgPtShiftPID{"cfgPtShiftPID", 1.25f, "Default upper limit for PID pt-shift correction"};
+>>>>>>> 5678d3143 (NucleiTask - Fix O2Lint errors)
 
   Configurable<bool> enableCentrality{"enableCentrality", true, "Flag to enable centrality 3D histos)"};
 
@@ -2581,11 +2590,15 @@ struct lfNucleiBATask {
           }
           if (enablePtShiftPID && fShiftPtPID) {
             shiftPtPID = fShiftPtPID->Eval(2 * track.pt());
+<<<<<<< HEAD
 <<<<<<< HEAD
             if (tritonPID && (track.pt() <= cfgPtShiftPID)) {
 =======
             if (tritonPID && (track.pt() <= CfgPtShiftPID)) {
 >>>>>>> 4b515a987 (NucleiTask - Fix O2Lint errors)
+=======
+            if (tritonPID && (track.pt() <= cfgPtShiftPID)) {
+>>>>>>> 5678d3143 (NucleiTask - Fix O2Lint errors)
               hePt = track.pt() - shiftPtPID / 2.f;
               antihePt = track.pt() - shiftPtPID / 2.f;
             }