Iprovements in formatting

Author: Christopher Klumm

PWGCF/FemtoDream/Core/femtoDreamResoSelectionK0Short.h

@@ -4,7 +4,11 @@
 //
 // This software is distributed under the terms of the GNU General Public
 // License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+<<<<<<< HEAD
 //
+=======
+// kPhiPosdaughTOF_NegdaughTPC
+>>>>>>> c6a3f815b (Iprovements in formatting)
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
@@ -33,8 +37,13 @@
 #include <array>
 #include <cstdint>
 #include <fstream>
+<<<<<<< HEAD
 #include <string>
 #include <utility>
+=======
+#include <iostream>
+#include <string>
+>>>>>>> c6a3f815b (Iprovements in formatting)
 #include <vector>
 
 using namespace o2;
@@ -95,10 +104,17 @@ class FemtoDreamResoSelection
   void setDaughterPIDSpecies(T const& daugh, V& pids);
 
   template <typename V>
+<<<<<<< HEAD
   bool daughterSelectionPos(V const& track1, bool useThreshold);
 
   template <typename V>
   bool daughterSelectionNeg(V const& track2, bool useThreshold);
+=======
+  bool DaughterSelectionPos(V const& track1, bool UseThreshold);
+
+  template <typename V>
+  bool DaughterSelectionNeg(V const& track2, bool UseThreshold);
+>>>>>>> c6a3f815b (Iprovements in formatting)
 
   template <typename cutContainerType, typename V>
   std::array<cutContainerType, 5> getCutContainer(V const& track1, V const& track2, float sign);
@@ -119,9 +135,15 @@ class FemtoDreamResoSelection
   void setDaughternSigmaPIDOffset(femtoDreamResoSelection::Daughtertype daugh, float offsetTPC, float offsetTOF)
   {
     if (daugh == femtoDreamResoSelection::kPosdaugh) {
+<<<<<<< HEAD
       posDaughTrack.setnSigmaPIDOffset(offsetTPC, offsetTOF);
     } else if (daugh == femtoDreamResoSelection::kNegdaugh) {
       negDaughTrack.setnSigmaPIDOffset(offsetTPC, offsetTOF);
+=======
+      PosDaughTrack.setnSigmaPIDOffset(offsetTPC, offsetTOF);
+    } else if (daugh == femtoDreamResoSelection::kNegdaugh) {
+      NegDaughTrack.setnSigmaPIDOffset(offsetTPC, offsetTOF);
+>>>>>>> c6a3f815b (Iprovements in formatting)
     }
     mPIDoffsetTPC = offsetTPC;
     mPIDoffsetTOF = offsetTOF;
@@ -155,7 +177,11 @@ class FemtoDreamResoSelection
                                       std::string_view suffix = "")
   {
     std::string outString = static_cast<std::string>(prefix);
+<<<<<<< HEAD
     outString += static_cast<std::string>(kSelectionNames[iSel]);
+=======
+    outString += static_cast<std::string>(mSelectionNames[iSel]);
+>>>>>>> c6a3f815b (Iprovements in formatting)
     outString += suffix;
     return outString;
   }
@@ -168,7 +194,11 @@ class FemtoDreamResoSelection
   {
     for (int index = 0; index < kNresoSelection; index++) {
       std::string comp = static_cast<std::string>(prefix) +
+<<<<<<< HEAD
                          static_cast<std::string>(kSelectionNames[index]);
+=======
+                         static_cast<std::string>(mSelectionNames[index]);
+>>>>>>> c6a3f815b (Iprovements in formatting)
       std::string_view cmp{comp};
       if (obs.compare(cmp) == 0)
         return index;
@@ -182,7 +212,11 @@ class FemtoDreamResoSelection
   static femtoDreamSelection::SelectionType
     getSelectionType(femtoDreamResoSelection::ResoSel iSel)
   {
+<<<<<<< HEAD
     return kSelectionTypes[iSel];
+=======
+    return mSelectionTypes[iSel];
+>>>>>>> c6a3f815b (Iprovements in formatting)
   }
 
   /// for consistent description of the configurables
@@ -192,7 +226,11 @@ class FemtoDreamResoSelection
                                         std::string_view prefix = "")
   {
     std::string outString = static_cast<std::string>(prefix);
+<<<<<<< HEAD
     outString += static_cast<std::string>(kSelectionHelper[iSel]);
+=======
+    outString += static_cast<std::string>(mSelectionHelper[iSel]);
+>>>>>>> c6a3f815b (Iprovements in formatting)
     return outString;
   }
 
@@ -201,6 +239,7 @@ class FemtoDreamResoSelection
   float mPIDoffsetTPC;
   float mPIDoffsetTOF;
 
+<<<<<<< HEAD
   FemtoDreamTrackSelection posDaughTrack;
   FemtoDreamTrackSelection negDaughTrack;
 
@@ -212,6 +251,19 @@ class FemtoDreamResoSelection
     femtoDreamSelection::kEqual};
 
   static constexpr std::string_view kSelectionHelper[kNresoSelection] = {
+=======
+  FemtoDreamTrackSelection PosDaughTrack;
+  FemtoDreamTrackSelection NegDaughTrack;
+
+  static constexpr int kNresoSelection = 1;
+
+  static constexpr std::string_view mSelectionNames[kNresoSelection] = {"Sign"};
+
+  static constexpr femtoDreamSelection::SelectionType mSelectionTypes[kNresoSelection]{
+    femtoDreamSelection::kEqual};
+
+  static constexpr std::string_view mSelectionHelper[kNresoSelection] = {
+>>>>>>> c6a3f815b (Iprovements in formatting)
     "+1 for Reso, -1 for AntiReso"};
 
 }; // namespace femtoDream
@@ -254,12 +306,20 @@ void FemtoDreamResoSelection::init(HistogramRegistry* QAregistry, HistogramRegis
     this->mHistogramRegistry = Registry;
     this->mQAHistogramRegistry = QAregistry;
 
+<<<<<<< HEAD
     posDaughTrack.init<PartDaugh,
+=======
+    PosDaughTrack.init<PartDaugh,
+>>>>>>> c6a3f815b (Iprovements in formatting)
                        aod::femtodreamparticle::kPosChild,
                        aod::femtodreamparticle::cutContainerType>(
       mQAHistogramRegistry, mHistogramRegistry);
 
+<<<<<<< HEAD
     negDaughTrack.init<PartDaugh,
+=======
+    NegDaughTrack.init<PartDaugh,
+>>>>>>> c6a3f815b (Iprovements in formatting)
                        aod::femtodreamparticle::kNegChild,
                        aod::femtodreamparticle::cutContainerType>(
       mQAHistogramRegistry, mHistogramRegistry);
@@ -271,34 +331,54 @@ template <aod::femtodreamparticle::ParticleType part,
           aod::femtodreamparticle::TrackType trackType2, typename T>
 void FemtoDreamResoSelection::fillQA(T const& track1, T const& track2)
 {
+<<<<<<< HEAD
   posDaughTrack.fillQA<part, trackType1>(track1);
   negDaughTrack.fillQA<part, trackType2>(track2);
+=======
+  PosDaughTrack.fillQA<part, trackType1>(track1);
+  NegDaughTrack.fillQA<part, trackType2>(track2);
+>>>>>>> c6a3f815b (Iprovements in formatting)
 }
 
 template <typename T, typename V>
 void FemtoDreamResoSelection::setDaughterCuts(femtoDreamResoSelection::Daughtertype daugh, T selVal,
                                               V selVar, femtoDreamSelection::SelectionType selType)
 {
   if (daugh == femtoDreamResoSelection::kPosdaugh) {
+<<<<<<< HEAD
     posDaughTrack.setSelection(selVal, selVar, selType);
   }
   if (daugh == femtoDreamResoSelection::kNegdaugh) {
     negDaughTrack.setSelection(selVal, selVar, selType);
+=======
+    PosDaughTrack.setSelection(selVal, selVar, selType);
+  };
+  if (daugh == femtoDreamResoSelection::kNegdaugh) {
+    NegDaughTrack.setSelection(selVal, selVar, selType);
+>>>>>>> c6a3f815b (Iprovements in formatting)
   }
 }
 
 template <typename T, typename V>
 void FemtoDreamResoSelection::setDaughterPIDSpecies(T const& daugh, V& pids)
 {
   if (daugh == femtoDreamResoSelection::kPosdaugh) {
+<<<<<<< HEAD
     posDaughTrack.setPIDSpecies(pids);
   }
   if (daugh == femtoDreamResoSelection::kNegdaugh) {
     negDaughTrack.setPIDSpecies(pids);
+=======
+    PosDaughTrack.setPIDSpecies(pids);
+  }
+  if (daugh == femtoDreamResoSelection::kNegdaugh) {
+    NegDaughTrack.setPIDSpecies(pids);
+>>>>>>> c6a3f815b (Iprovements in formatting)
   }
 }
 
 template <typename V>
+<<<<<<< HEAD
 bool FemtoDreamResoSelection::daughterSelectionPos(V const& track1, bool useThreshold)
 {
   return posDaughTrack.isSelectedMinimal(track1, useThreshold);
@@ -308,6 +388,17 @@ template <typename V>
 bool FemtoDreamResoSelection::daughterSelectionNeg(V const& track2, bool useThreshold)
 {
   return negDaughTrack.isSelectedMinimal(track2, useThreshold);
+=======
+bool FemtoDreamResoSelection::DaughterSelectionPos(V const& track1, bool UseThreshold)
+{
+  return PosDaughTrack.isSelectedMinimal(track1, UseThreshold);
+}
+
+template <typename V>
+bool FemtoDreamResoSelection::DaughterSelectionNeg(V const& track2, bool UseThreshold)
+{
+  return NegDaughTrack.isSelectedMinimal(track2, UseThreshold);
+>>>>>>> c6a3f815b (Iprovements in formatting)
 }
 
 template <typename T>
@@ -319,13 +410,23 @@ std::pair<bool, bool> FemtoDreamResoSelection::checkCombination(T const& PosTrac
   auto [part1, part2] = getPIDPairFromMother(mother);
 
   float nSigPosTPC1 = o2::aod::pidutils::tpcNSigma(part1, PosTrack) - mPIDoffsetTPC;
+<<<<<<< HEAD
   float nSigPosTOF1 = posDaughTrack.getNsigmaTOF(PosTrack, part1) - mPIDoffsetTOF; /// for TOF use function in TrackSelection, because it also checks hasTOF()
   float nSigPosTPC2 = o2::aod::pidutils::tpcNSigma(part2, PosTrack) - mPIDoffsetTPC;
   float nSigPosTOF2 = posDaughTrack.getNsigmaTOF(PosTrack, part2) - mPIDoffsetTOF;
   float nSigNegTPC1 = o2::aod::pidutils::tpcNSigma(part1, NegTrack) - mPIDoffsetTPC;
   float nSigNegTOF1 = negDaughTrack.getNsigmaTOF(NegTrack, part1) - mPIDoffsetTOF;
   float nSigNegTPC2 = o2::aod::pidutils::tpcNSigma(part2, NegTrack) - mPIDoffsetTPC;
   float nSigNegTOF2 = negDaughTrack.getNsigmaTOF(NegTrack, part2) - mPIDoffsetTOF;
+=======
+  float nSigPosTOF1 = PosDaughTrack.getNsigmaTOF(PosTrack, part1) - mPIDoffsetTOF; /// for TOF use function in TrackSelection, because it also checks hasTOF()
+  float nSigPosTPC2 = o2::aod::pidutils::tpcNSigma(part2, PosTrack) - mPIDoffsetTPC;
+  float nSigPosTOF2 = PosDaughTrack.getNsigmaTOF(PosTrack, part2) - mPIDoffsetTOF;
+  float nSigNegTPC1 = o2::aod::pidutils::tpcNSigma(part1, NegTrack) - mPIDoffsetTPC;
+  float nSigNegTOF1 = NegDaughTrack.getNsigmaTOF(NegTrack, part1) - mPIDoffsetTOF;
+  float nSigNegTPC2 = o2::aod::pidutils::tpcNSigma(part2, NegTrack) - mPIDoffsetTPC;
+  float nSigNegTOF2 = NegDaughTrack.getNsigmaTOF(NegTrack, part2) - mPIDoffsetTOF;
+>>>>>>> c6a3f815b (Iprovements in formatting)
 
   if (checkPID(PosTrack, nSigPosTPC1, nSigPosTOF1, nSigPosTPC2, nSigPosTOF2) && checkPID(NegTrack, nSigNegTPC2, nSigNegTOF2, nSigNegTPC1, nSigNegTOF1)) {
     return {true, false};
@@ -390,11 +491,19 @@ std::array<cutContainerType, 5> FemtoDreamResoSelection::getCutContainer(V const
     }
   }
 
+<<<<<<< HEAD
   const auto dCA1 = std::sqrt(track1.dcaXY() * track1.dcaXY() + track1.dcaZ() * track1.dcaZ());
   const auto dCA2 = std::sqrt(track2.dcaXY() * track2.dcaXY() + track2.dcaZ() * track2.dcaZ());
 
   auto outputPosTrack = posDaughTrack.getCutContainer<false, cutContainerType>(track1, track1.pt(), track1.eta(), dCA1); // false for useItsPid
   auto outputNegTrack = negDaughTrack.getCutContainer<false, cutContainerType>(track2, track2.pt(), track2.eta(), dCA2);
+=======
+  const auto DCA1 = std::sqrt(track1.dcaXY() * track1.dcaXY() + track1.dcaZ() * track1.dcaZ());
+  const auto DCA2 = std::sqrt(track2.dcaXY() * track2.dcaXY() + track2.dcaZ() * track2.dcaZ());
+
+  auto outputPosTrack = PosDaughTrack.getCutContainer<false, cutContainerType>(track1, track1.pt(), track1.eta(), DCA1); // false for useItsPid
+  auto outputNegTrack = NegDaughTrack.getCutContainer<false, cutContainerType>(track2, track2.pt(), track2.eta(), DCA2);
+>>>>>>> c6a3f815b (Iprovements in formatting)
 
   const auto shiftvalue = numBitsUsed(outputSign);
   outputPID = (outputNegTrack.at(femtoDreamTrackSelection::TrackContainerPosition::kPID) << shiftvalue) | outputSign;
@@ -408,4 +517,8 @@ std::array<cutContainerType, 5> FemtoDreamResoSelection::getCutContainer(V const
 }
 } // namespace o2::analysis::femtoDream
 
+<<<<<<< HEAD
 #endif // PWGCF_FEMTODREAM_CORE_FEMTODREAMRESOSELECTIONK0SHORT_H_
+=======
+#endif // PWGCF_FEMTODREAM_CORE_FEMTODREAMRESOSELECTION_H_
+>>>>>>> c6a3f815b (Iprovements in formatting)

PWGCF/FemtoDream/TableProducer/femtoDreamProducerTaskResoKshort.cxx

@@ -51,6 +51,8 @@
 
 #include <fairlogger/Logger.h>
 
+#include <fstream>  // delete after debugging
+#include <iostream> // delete in the end
 #include <string>
 #include <vector>
 
@@ -1051,6 +1053,10 @@ struct femtoDreamProducerTaskResoKshort {
     // fill the tables
     auto tracksWithItsPid = soa::Attach<aod::FemtoFullTracks, aod::pidits::ITSNSigmaEl, aod::pidits::ITSNSigmaPi, aod::pidits::ITSNSigmaKa,
                                         aod::pidits::ITSNSigmaPr, aod::pidits::ITSNSigmaDe, aod::pidits::ITSNSigmaTr, aod::pidits::ITSNSigmaHe>(tracks);
+<<<<<<< HEAD
+=======
+
+>>>>>>> c6a3f815b (Iprovements in formatting)
     if (ConfUseItsPid.value) {
       fillCollisionsAndTracksAndV0<false, true, true, true>(col, tracks, tracksWithItsPid, fullV0s);
     } else {