fix warnings 2

Author: nepeivodaRS

PWGLF/Tasks/Strangeness/CMakeLists.txt

@@ -119,8 +119,8 @@ o2physics_add_dpl_workflow(v0ptinvmassplots
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 
-o2physics_add_dpl_workflow(strange-yield-pbpb
-    SOURCES strange-yield-pbpb.cxx
+o2physics_add_dpl_workflow(derivedupcanalysis
+    SOURCES derivedupcanalysis.cxx
     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
     COMPONENT_NAME Analysis)
 

PWGLF/Tasks/Strangeness/derivedupcanalysis.cxx

@@ -9,7 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-/// \file strange-yield-pbpb.cxx
+/// \file derivedupcanalysis.cxx
 /// \brief Strangeness in UPC analysis task
 /// \author Roman Nepeivoda ([email protected])
 
@@ -200,7 +200,7 @@ struct Derivedupcanalysis {
 
   // Kinematic axes
   ConfigurableAxis axisPt{"axisPt", {VARIABLE_WIDTH, 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, 1.8f, 1.9f, 2.0f, 2.2f, 2.4f, 2.6f, 2.8f, 3.0f, 3.2f, 3.4f, 3.6f, 3.8f, 4.0f, 4.4f, 4.8f, 5.2f, 5.6f, 6.0f, 6.5f, 7.0f, 7.5f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 17.0f, 19.0f, 21.0f, 23.0f, 25.0f, 30.0f, 35.0f, 40.0f, 50.0f}, "pt axis for v0 analysis"};
-  ConfigurableAxis axisPtXi{"axisPtCasc", {VARIABLE_WIDTH, 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, 1.8f, 1.9f, 2.0f, 2.2f, 2.4f, 2.6f, 2.8f, 3.0f, 3.2f, 3.4f, 3.6f, 3.8f, 4.0f, 4.4f, 4.8f, 5.2f, 5.6f, 6.0f, 6.5f, 7.0f, 7.5f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 17.0f, 19.0f, 21.0f, 23.0f, 25.0f, 30.0f, 35.0f, 40.0f, 50.0f}, "pt axis for cascade analysis"};
+  ConfigurableAxis axisPtXi{"axisPtXi", {VARIABLE_WIDTH, 0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, 1.8f, 1.9f, 2.0f, 2.2f, 2.4f, 2.6f, 2.8f, 3.0f, 3.2f, 3.4f, 3.6f, 3.8f, 4.0f, 4.4f, 4.8f, 5.2f, 5.6f, 6.0f, 6.5f, 7.0f, 7.5f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 17.0f, 19.0f, 21.0f, 23.0f, 25.0f, 30.0f, 35.0f, 40.0f, 50.0f}, "pt axis for cascade analysis"};
   ConfigurableAxis axisPtCoarse{"axisPtCoarse", {VARIABLE_WIDTH, 0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 7.0f, 10.0f, 15.0f}, "pt axis for QA"};
   ConfigurableAxis axisEta{"axisEta", {100, -2.0f, 2.0f}, "#eta"};
   ConfigurableAxis axisRap{"axisRap", {100, -2.0f, 2.0f}, "y"};
@@ -248,7 +248,7 @@ struct Derivedupcanalysis {
   // Track quality axes
   ConfigurableAxis axisTPCrows{"axisTPCrows", {160, -0.5f, 159.5f}, "N TPC rows"};
   ConfigurableAxis axisITSclus{"axisITSclus", {7, -0.5f, 6.5f}, "N ITS Clusters"};
-  ConfigurableAxis axisITScluMap{"axisITSMap", {128, -0.5f, 127.5f}, "ITS Cluster map"};
+  ConfigurableAxis axisITScluMap{"axisITScluMap", {128, -0.5f, 127.5f}, "ITS Cluster map"};
   ConfigurableAxis axisDetMap{"axisDetMap", {16, -0.5f, 15.5f}, "Detector use map"};
   ConfigurableAxis axisITScluMapCoarse{"axisITScluMapCoarse", {16, -3.5f, 12.5f}, "ITS Coarse cluster map"};
   ConfigurableAxis axisDetMapCoarse{"axisDetMapCoarse", {5, -0.5f, 4.5f}, "Detector Coarse user map"};
@@ -890,7 +890,7 @@ struct Derivedupcanalysis {
     }
 
     if (doprocessGenerated) {
-      for (Int_t partID = 0; partID <= 6; partID++) {
+      for (int partID = 0; partID <= 6; partID++) {
         histos.add(Form("%s/mc/h6dGen", kParticlenames[partID].data()), "h6dGen", kTHnSparseF, {axisFT0Cqa, axisNchInvMass, axisNchInvMass, axisPt, axisSelGap, axisRap});
       }
     }
@@ -1216,9 +1216,9 @@ struct Derivedupcanalysis {
     auto negpt = std::sqrt(std::pow(casc.pxneg(), 2) + std::pow(casc.pyneg(), 2));
     auto bachpt = std::sqrt(std::pow(casc.pxbach(), 2) + std::pow(casc.pybach(), 2));
 
-    double posDcaXYLimit = 0.0105f + 0.035f / pow(pospt, 1.1f);
-    double negDcaXYLimit = 0.0105f + 0.035f / pow(negpt, 1.1f);
-    double bachDcaXYLimit = 0.0105f + 0.035f / pow(bachpt, 1.1f);
+    double posDcaXYLimit = 0.0105f + 0.035f / std::pow(pospt, 1.1f);
+    double negDcaXYLimit = 0.0105f + 0.035f / std::pow(negpt, 1.1f);
+    double bachDcaXYLimit = 0.0105f + 0.035f / std::pow(bachpt, 1.1f);
 
     // TODO: separate xy and z //
     if ((std::abs(casc.dcapostopv()) > posDcaXYLimit) &&
@@ -1376,8 +1376,8 @@ struct Derivedupcanalysis {
     auto pospt = std::sqrt(std::pow(v0.pxpos(), 2) + std::pow(v0.pypos(), 2));
     auto negpt = std::sqrt(std::pow(v0.pxneg(), 2) + std::pow(v0.pyneg(), 2));
 
-    double posDcaXYLimit = 0.0105f + 0.035f / pow(pospt, 1.1f);
-    double negDcaXYLimit = 0.0105f + 0.035f / pow(negpt, 1.1f);
+    double posDcaXYLimit = 0.0105f + 0.035f / std::pow(pospt, 1.1f);
+    double negDcaXYLimit = 0.0105f + 0.035f / std::pow(negpt, 1.1f);
 
     // TODO: separate xy and z //
     if ((std::abs(v0.dcapostopv()) > posDcaXYLimit) &&

PWGLF/Utils/strangenessMasks.h

@@ -1,4 +1,4 @@
-// Copyright 2019-2024 CERN and copyright holders of ALICE O2.
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -8,14 +8,15 @@
 // 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.
-///
+//
+/// \file strangenessMasks.cxx
+/// \brief Defines selection criteria and bit masks for identifying v0 and cascade particles
 /// \author Roman Nepeivoda ([email protected])
-/// \since August 27, 2024
 
 #ifndef PWGLF_UTILS_STRANGENESSMASKS_H_
 #define PWGLF_UTILS_STRANGENESSMASKS_H_
 
-enum selectionsCombined : int { selV0CosPA = 0,
+enum SelectionsCombined : int { selV0CosPA = 0,
                                 selV0Radius,
                                 selV0RadiusMax,
                                 selDCANegToPV,
@@ -116,36 +117,36 @@ enum selectionsCombined : int { selV0CosPA = 0,
                                 selCount,
 };
 
-static constexpr int selNum = static_cast<int>(selectionsCombined::selCount);
+static constexpr int kSelNum = static_cast<int>(SelectionsCombined::selCount);
 
 // constants
 const float ctauxiPDG = 4.91;     // from PDG
 const float ctauomegaPDG = 2.461; // from PDG
 
 // bit masks
-std::bitset<selNum> maskTopologicalV0;
-std::bitset<selNum> maskTopologicalCasc;
+std::bitset<kSelNum> maskTopologicalV0;
+std::bitset<kSelNum> maskTopologicalCasc;
 
-std::bitset<selNum> maskKinematicV0;
-std::bitset<selNum> maskKinematicCasc;
+std::bitset<kSelNum> maskKinematicV0;
+std::bitset<kSelNum> maskKinematicCasc;
 
-std::bitset<selNum> maskTrackPropertiesV0;
-std::bitset<selNum> maskTrackPropertiesCasc;
+std::bitset<kSelNum> maskTrackPropertiesV0;
+std::bitset<kSelNum> maskTrackPropertiesCasc;
 
-std::bitset<selNum> maskK0ShortSpecific;
-std::bitset<selNum> maskLambdaSpecific;
-std::bitset<selNum> maskAntiLambdaSpecific;
-std::bitset<selNum> maskXiSpecific;
-std::bitset<selNum> maskAntiXiSpecific;
-std::bitset<selNum> maskOmegaSpecific;
-std::bitset<selNum> maskAntiOmegaSpecific;
+std::bitset<kSelNum> maskK0ShortSpecific;
+std::bitset<kSelNum> maskLambdaSpecific;
+std::bitset<kSelNum> maskAntiLambdaSpecific;
+std::bitset<kSelNum> maskXiSpecific;
+std::bitset<kSelNum> maskAntiXiSpecific;
+std::bitset<kSelNum> maskOmegaSpecific;
+std::bitset<kSelNum> maskAntiOmegaSpecific;
 
-std::bitset<selNum> maskSelectionK0Short;
-std::bitset<selNum> maskSelectionLambda;
-std::bitset<selNum> maskSelectionAntiLambda;
-std::bitset<selNum> maskSelectionXi;
-std::bitset<selNum> maskSelectionAntiXi;
-std::bitset<selNum> maskSelectionOmega;
-std::bitset<selNum> maskSelectionAntiOmega;
+std::bitset<kSelNum> maskSelectionK0Short;
+std::bitset<kSelNum> maskSelectionLambda;
+std::bitset<kSelNum> maskSelectionAntiLambda;
+std::bitset<kSelNum> maskSelectionXi;
+std::bitset<kSelNum> maskSelectionAntiXi;
+std::bitset<kSelNum> maskSelectionOmega;
+std::bitset<kSelNum> maskSelectionAntiOmega;
 
 #endif // PWGLF_UTILS_STRANGENESSMASKS_H_