The issue with the macOS-arm checks has been resolved

Author: Paola Vargas Torres

PWGLF/Tasks/Nuspex/dedxPidAnalysis.cxx

@@ -203,19 +203,11 @@ struct DedxPidAnalysis {
 
   void init(InitContext const&)
   {
-<<<<<<< HEAD
-    if (V0SelectionMode == v0TPC) {
-      LOGF(info, "V0 seleccion using TPC only");
-    } else if (V0SelectionMode == v0TOF) {
-      LOGF(info, "V0 seleccion using TOF only");
-    } else if (V0SelectionMode == v0TPCTOF) {
-=======
     if (v0SelectionMode == v0TPC) {
       LOGF(info, "V0 seleccion using TPC only");
     } else if (v0SelectionMode == v0TOF) {
       LOGF(info, "V0 seleccion using TOF only");
     } else if (v0SelectionMode == v0TPCTOF) {
->>>>>>> 0a9044196 (The issue with the macOS-arm checks has been resolved)
       LOGF(info, "V0 seleccion using TOF + TPC");
     }
 
@@ -459,23 +451,13 @@ struct DedxPidAnalysis {
     double sigmap = 0.0;
     double sigman = 0.0;
 
-<<<<<<< HEAD
-    if (V0SelectionMode == v0TPC) {
-      sigmap = ptrack.tpcNSigmaPi();
-      sigman = ntrack.tpcNSigmaPi();
-    } else if (V0SelectionMode == v0TOF) {
-      sigmap = ptrack.tofNSigmaPi();
-      sigman = ntrack.tofNSigmaPi();
-    } else if (V0SelectionMode == v0TPCTOF) {
-=======
     if (v0SelectionMode == v0TPC) {
       sigmap = ptrack.tpcNSigmaPi();
       sigman = ntrack.tpcNSigmaPi();
     } else if (v0SelectionMode == v0TOF) {
       sigmap = ptrack.tofNSigmaPi();
       sigman = ntrack.tofNSigmaPi();
     } else if (v0SelectionMode == v0TPCTOF) {
->>>>>>> 0a9044196 (The issue with the macOS-arm checks has been resolved)
       sigmap = std::sqrt(std::pow(ptrack.tpcNSigmaPi(), 2) + std::pow(ptrack.tofNSigmaPi(), 2));
       sigman = std::sqrt(std::pow(ntrack.tpcNSigmaPi(), 2) + std::pow(ntrack.tofNSigmaPi(), 2));
     }
@@ -515,23 +497,13 @@ struct DedxPidAnalysis {
     double sigmap = 0.0;
     double sigman = 0.0;
 
-<<<<<<< HEAD
-    if (V0SelectionMode == v0TPC) {
-      sigmap = ptrack.tpcNSigmaPr();
-      sigman = ntrack.tpcNSigmaPi();
-    } else if (V0SelectionMode == v0TOF) {
-      sigmap = ptrack.tofNSigmaPr();
-      sigman = ntrack.tofNSigmaPi();
-    } else if (V0SelectionMode == v0TPCTOF) {
-=======
     if (v0SelectionMode == v0TPC) {
       sigmap = ptrack.tpcNSigmaPr();
       sigman = ntrack.tpcNSigmaPi();
     } else if (v0SelectionMode == v0TOF) {
       sigmap = ptrack.tofNSigmaPr();
       sigman = ntrack.tofNSigmaPi();
     } else if (v0SelectionMode == v0TPCTOF) {
->>>>>>> 0a9044196 (The issue with the macOS-arm checks has been resolved)
       sigmap = std::sqrt(std::pow(ptrack.tpcNSigmaPr(), 2) + std::pow(ptrack.tofNSigmaPr(), 2));
       sigman = std::sqrt(std::pow(ntrack.tpcNSigmaPi(), 2) + std::pow(ntrack.tofNSigmaPi(), 2));
     }
@@ -571,23 +543,13 @@ struct DedxPidAnalysis {
     double sigmap = 0.0;
     double sigman = 0.0;
 
-<<<<<<< HEAD
-    if (V0SelectionMode == v0TPC) {
-      sigmap = ptrack.tpcNSigmaPi();
-      sigman = ntrack.tpcNSigmaPr();
-    } else if (V0SelectionMode == v0TOF) {
-      sigmap = ptrack.tofNSigmaPi();
-      sigman = ntrack.tofNSigmaPr();
-    } else if (V0SelectionMode == v0TPCTOF) {
-=======
     if (v0SelectionMode == v0TPC) {
       sigmap = ptrack.tpcNSigmaPi();
       sigman = ntrack.tpcNSigmaPr();
     } else if (v0SelectionMode == v0TOF) {
       sigmap = ptrack.tofNSigmaPi();
       sigman = ntrack.tofNSigmaPr();
     } else if (v0SelectionMode == v0TPCTOF) {
->>>>>>> 0a9044196 (The issue with the macOS-arm checks has been resolved)
       sigmap = std::sqrt(std::pow(ptrack.tpcNSigmaPi(), 2) + std::pow(ptrack.tofNSigmaPi(), 2));
       sigman = std::sqrt(std::pow(ntrack.tpcNSigmaPr(), 2) + std::pow(ntrack.tofNSigmaPr(), 2));
     }
@@ -626,23 +588,13 @@ struct DedxPidAnalysis {
     double sigmap = 0.0;
     double sigman = 0.0;
 
-<<<<<<< HEAD
-    if (V0SelectionMode == v0TPC) {
-      sigmap = ptrack.tpcNSigmaEl();
-      sigman = ntrack.tpcNSigmaEl();
-    } else if (V0SelectionMode == v0TOF) {
-      sigmap = ptrack.tofNSigmaEl();
-      sigman = ntrack.tofNSigmaEl();
-    } else if (V0SelectionMode == v0TPCTOF) {
-=======
     if (v0SelectionMode == v0TPC) {
       sigmap = ptrack.tpcNSigmaEl();
       sigman = ntrack.tpcNSigmaEl();
     } else if (v0SelectionMode == v0TOF) {
       sigmap = ptrack.tofNSigmaEl();
       sigman = ntrack.tofNSigmaEl();
     } else if (v0SelectionMode == v0TPCTOF) {
->>>>>>> 0a9044196 (The issue with the macOS-arm checks has been resolved)
       sigmap = std::sqrt(std::pow(ptrack.tpcNSigmaEl(), 2) + std::pow(ptrack.tofNSigmaEl(), 2));
       sigman = std::sqrt(std::pow(ntrack.tpcNSigmaEl(), 2) + std::pow(ntrack.tofNSigmaEl(), 2));
     }