Merge branch 'AliceO2Group:master' into Add-preselection-and-centrality-to-STTree-creatore

Author: FDUEnrich

.github/labeler.yml

@@ -1,69 +1,89 @@
 ---
-alice3:
+infrastructure:
   - changed-files:
-      - any-glob-to-any-file: ['ALICE3/**']
+      - any-glob-to-any-file:
+          - ".checkov.yml"
+          - ".clang-format"
+          - ".clang-tidy"
+          - ".flake8"
+          - ".git-blame-ignore-revs"
+          - ".github/**"
+          - ".gitignore"
+          - ".mega-linter.yml"
+          - ".pre-commit-config.yaml"
+          - "cmake/**"
+          - "CMakeLists.txt"
+          - "CODEOWNERS"
+          - "COPYING"
+          - "cppcheck_config"
+          - "CPPLINT.cfg"
+          - "dependencies/**"
+          - "o2linter_config"
+          - "packaging/**"
+          - "pyproject.toml"
+          - "README.md"
 
-common:
+datamodel:
   - changed-files:
-      - any-glob-to-any-file: ['Common/**']
+      - any-glob-to-any-file: ["DataModel/**", "**/DataModel/**"]
 
-infrastructure:
+alice3:
   - changed-files:
-      - any-glob-to-any-file:
-          - '.clang-format'
-          - '.clang-tidy'
-          - '.flake8'
-          - '.github/**'
-          - '.checkov.yml'
-          - '.mega-linter.yml'
-          - '.pre-commit-config.yaml'
-          - 'cmake/**'
-          - 'CODEOWNERS'
-          - 'CPPLINT.cfg'
-          - 'dependencies/**'
-          - 'packaging/**'
-          - 'pyproject.toml'
+      - any-glob-to-any-file: ["ALICE3/**"]
 
-datamodel:
+common:
   - changed-files:
-      - any-glob-to-any-file: ['DataModel/**', '**/DataModel/**']
+      - any-glob-to-any-file: ["Common/**"]
 
 dpg:
   - changed-files:
-      - any-glob-to-any-file: ['DPG/**']
+      - any-glob-to-any-file: ["DPG/**"]
 
 pwgcf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGCF/**', '*/PWGCF/**']
+      - any-glob-to-any-file: ["PWGCF/**", "*/PWGCF/**"]
 
 pwgdq:
   - changed-files:
-      - any-glob-to-any-file: ['PWGDQ/**', '*/PWGDQ/**']
+      - any-glob-to-any-file: ["PWGDQ/**", "*/PWGDQ/**"]
 
 pwgem:
   - changed-files:
-      - any-glob-to-any-file: ['PWGEM/**', '*/PWGEM/**']
+      - any-glob-to-any-file: ["PWGEM/**", "*/PWGEM/**"]
 
 pwghf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGHF/**', '*/PWGHF/**']
+      - any-glob-to-any-file: ["PWGHF/**", "*/PWGHF/**"]
 
 pwgje:
   - changed-files:
-      - any-glob-to-any-file: ['PWGJE/**', '*/PWGJE/**']
+      - any-glob-to-any-file: ["PWGJE/**", "*/PWGJE/**"]
 
 pwglf:
   - changed-files:
-      - any-glob-to-any-file: ['PWGLF/**', '*/PWGLF/**', 'PWGMM/**', '*/PWGMM/**']
+      - any-glob-to-any-file:
+          ["PWGLF/**", "*/PWGLF/**", "PWGMM/**", "*/PWGMM/**"]
+
+pwgmm:
+  - changed-files:
+      - any-glob-to-any-file: ["PWGMM/**", "*/PWGMM/**"]
 
 pwgud:
   - changed-files:
-      - any-glob-to-any-file: ['PWGUD/**', '*/PWGUD/**']
+      - any-glob-to-any-file: ["PWGUD/**", "*/PWGUD/**"]
+
+scripts:
+  - changed-files:
+      - any-glob-to-any-file: ["Scripts/**"]
+
+tools:
+  - changed-files:
+      - any-glob-to-any-file: ["Tools/**"]
 
 trigger:
   - changed-files:
-      - any-glob-to-any-file: ['EventFiltering/**']
+      - any-glob-to-any-file: ["EventFiltering/**"]
 
 tutorial:
   - changed-files:
-      - any-glob-to-any-file: ['Tutorials/**']
+      - any-glob-to-any-file: ["Tutorials/**"]

.github/workflows/mega-linter.yml

@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v9.1.0
+        uses: oxsecurity/megalinter@v9.2.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

ALICE3/Core/FastTracker.cxx

@@ -236,6 +236,42 @@ void FastTracker::AddTPC(float phiResMean, float zResMean)
   }
 }
 
+std::map<std::string, std::map<std::string, std::string>> FastTracker::parseTEnvConfiguration(std::string filename)
+{
+  std::map<std::string, std::map<std::string, std::string>> configMap;
+
+  TEnv env(filename.c_str());
+  THashList* table = env.GetTable();
+  std::vector<std::string> layers;
+  for (int i = 0; i < table->GetEntries(); ++i) {
+    const std::string key = table->At(i)->GetName();
+    // key should contain exactly one dot
+    if (key.find('.') == std::string::npos || key.find('.') != key.rfind('.')) {
+      LOG(fatal) << "Key " << key << " does not contain exactly one dot";
+      continue;
+    }
+    const std::string firstPart = key.substr(0, key.find('.'));
+    if (std::find(layers.begin(), layers.end(), firstPart) == layers.end()) {
+      layers.push_back(firstPart);
+    }
+  }
+  env.Print();
+
+  // Layers
+  for (const auto& layer : layers) {
+    LOG(info) << " Reading layer " << layer;
+    for (int i = 0; i < table->GetEntries(); ++i) {
+      const std::string key = table->At(i)->GetName();
+      if (key.find(layer + ".") == 0) {
+        const std::string paramName = key.substr(key.find('.') + 1);
+        const std::string value = env.GetValue(key.c_str(), "");
+        configMap[layer][paramName] = value;
+      }
+    }
+  }
+  return configMap;
+}
+
 void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBManager* ccdbManager)
 {
   LOG(info) << " Adding generic detector from file " << filename;
@@ -263,54 +299,27 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
     return;
   }
 
-  TEnv env(filename.c_str());
-  THashList* table = env.GetTable();
-  std::vector<std::string> layers;
-  for (int i = 0; i < table->GetEntries(); ++i) {
-    const std::string key = table->At(i)->GetName();
-    // key should contain exactly one dot
-    if (key.find('.') == std::string::npos || key.find('.') != key.rfind('.')) {
-      LOG(fatal) << "Key " << key << " does not contain exactly one dot";
-      continue;
-    }
-    const std::string firstPart = key.substr(0, key.find('.'));
-    if (std::find(layers.begin(), layers.end(), firstPart) == layers.end()) {
-      layers.push_back(firstPart);
-    }
-  }
-  // env.Print();
+  std::map<std::string, std::map<std::string, std::string>> configMap = parseTEnvConfiguration(filename);
   // Layers
-  for (const auto& layer : layers) {
-    LOG(info) << " Reading layer " << layer;
-
-    auto getKey = [&layer, &env](const std::string& name, const bool required = true) {
-      std::string key = layer + "." + name;
-      if (!env.Defined(key.c_str())) {
-        if (required) {
-          LOG(fatal) << "Key " << key << " not defined in configuration file";
-        }
-        LOG(debug) << "Key " << key << " not defined in configuration file, getting the default value";
-      }
-      LOG(debug) << " Getting key " << key << " from configuration file";
-      return key;
-    };
-    const float r = env.GetValue(getKey("r").c_str(), -1.0f);
-    LOG(info) << " Layer " << layer << " has radius " << r;
-    const float z = env.GetValue(getKey("z").c_str(), -1.0f);
-    const float x0 = env.GetValue(getKey("x0").c_str(), 0.0f);
-    const float xrho = env.GetValue(getKey("xrho").c_str(), 0.0f);
-    const float resRPhi = env.GetValue(getKey("resRPhi").c_str(), 0.0f);
-    const float resZ = env.GetValue(getKey("resZ").c_str(), 0.0f);
-    const float eff = env.GetValue(getKey("eff").c_str(), 0.0f);
-    const int type = env.GetValue(getKey("type").c_str(), 0);
-    const char* deadPhiRegions = env.GetValue(getKey("deadPhiRegions", false).c_str(), "");
+  for (const auto& layer : configMap) {
+    LOG(info) << " Reading layer " << layer.first;
+    const float r = std::stof(layer.second.at("r"));
+    LOG(info) << " Layer " << layer.first << " has radius " << r;
+    const float z = std::stof(layer.second.at("z"));
+    const float x0 = std::stof(layer.second.at("x0"));
+    const float xrho = std::stof(layer.second.at("xrho"));
+    const float resRPhi = std::stof(layer.second.at("resRPhi"));
+    const float resZ = std::stof(layer.second.at("resZ"));
+    const float eff = std::stof(layer.second.at("eff"));
+    const int type = std::stoi(layer.second.at("type"));
+    const std::string deadPhiRegions = layer.second.at("deadPhiRegions");
 
     // void AddLayer(TString name, float r, float z, float x0, float xrho, float resRPhi = 0.0f, float resZ = 0.0f, float eff = 0.0f, int type = 0);
-    LOG(info) << " Adding layer " << layer << " r=" << r << " z=" << z << " x0=" << x0 << " xrho=" << xrho << " resRPhi=" << resRPhi << " resZ=" << resZ << " eff=" << eff << " type=" << type << " deadPhiRegions=" << deadPhiRegions;
+    LOG(info) << " Adding layer " << layer.first << " r=" << r << " z=" << z << " x0=" << x0 << " xrho=" << xrho << " resRPhi=" << resRPhi << " resZ=" << resZ << " eff=" << eff << " type=" << type << " deadPhiRegions=" << deadPhiRegions;
 
-    DetLayer* addedLayer = AddLayer(layer.c_str(), r, z, x0, xrho, resRPhi, resZ, eff, type);
-    if (strlen(deadPhiRegions) > 0) { // Taking it as ccdb path or local file
-                                      // Check if it begins with ccdb:
+    DetLayer* addedLayer = AddLayer(layer.first.c_str(), r, z, x0, xrho, resRPhi, resZ, eff, type);
+    if (!deadPhiRegions.empty()) { // Taking it as ccdb path or local file
+                                   // Check if it begins with ccdb:
       if (std::string(deadPhiRegions).rfind("ccdb:", 0) == 0) {
         std::string ccdbPath = std::string(deadPhiRegions).substr(5); // remove "ccdb:" prefix
         if (ccdbManager == nullptr) {
@@ -321,7 +330,7 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
         addedLayer->setDeadPhiRegions(g);
       } else {
         // Taking it as local file
-        TFile infile(deadPhiRegions, "READ");
+        TFile infile(deadPhiRegions.c_str(), "READ");
         if (!infile.IsOpen()) {
           LOG(fatal) << "Cannot open dead phi regions file " << deadPhiRegions;
           return;
@@ -331,7 +340,7 @@ void FastTracker::AddGenericDetector(std::string filename, o2::ccdb::BasicCCDBMa
         addedLayer->setDeadPhiRegions(g);
       }
     } else {
-      LOG(debug) << " No dead phi regions for layer " << layer;
+      LOG(debug) << " No dead phi regions for layer " << layer.first;
     }
   }
 }

ALICE3/Core/FastTracker.h

@@ -19,6 +19,7 @@
 
 #include <fairlogger/Logger.h>
 
+#include <map>
 #include <string>
 #include <vector>
 
@@ -68,6 +69,14 @@ class FastTracker
   void AddSiliconALICE3v2(std::vector<float> pixelResolution);
   void AddSiliconALICE3(float scaleX0VD, std::vector<float> pixelResolution);
   void AddTPC(float phiResMean, float zResMean);
+
+  /**
+   * @brief Parses a TEnv configuration file and returns the key-value pairs split per entry
+   * @param filename Path to the TEnv configuration file
+   * @return A map where each key is a layer name and the value is another map of key-value pairs for that layer
+   */
+  std::map<std::string, std::map<std::string, std::string>> parseTEnvConfiguration(std::string filename);
+
   /**
    * @brief Adds a generic detector configuration from the specified file.
    *

ALICE3/TableProducer/alice3-decayfinder.cxx

@@ -79,7 +79,7 @@ struct alice3decayFinder {
 
   // Vertexing
   Configurable<bool> propagateToPCA{"propagateToPCA", true, "create tracks version propagated to PCA"};
-  Configurable<bool> useAbsDCA{"useAbsDCA", false, "Minimise abs. distance rather than chi2"};
+  Configurable<bool> useAbsDCA{"useAbsDCA", true, "Minimise abs. distance rather than chi2"};
   Configurable<bool> useWeightedFinalPCA{"useWeightedFinalPCA", false, "Recalculate vertex position using track covariances, effective only if useAbsDCA is true"};
   Configurable<double> maxR{"maxR", 200., "reject PCA's above this radius"};
   Configurable<double> maxDZIni{"maxDZIni", 1e9, "reject (if>0) PCA candidate if tracks DZ exceeds threshold"};
@@ -324,19 +324,21 @@ struct alice3decayFinder {
     o2::track::TrackParCov trackParVar0 = getTrackParCov(prong0);
     o2::track::TrackParCov trackParVar1 = getTrackParCov(prong1);
     o2::track::TrackParCov trackParVar2 = getTrackParCov(prong2);
-
     //}-{}-{}-{}-{}-{}-{}-{}-{}-{}
     // Move close to minima
     int nCand = 0;
     try {
+      histos.fill(HIST("hCandidateBuilderStatus3Prong"), 0.f); // builds candidate
       nCand = fitter3.process(trackParVar0, trackParVar1, trackParVar2);
     } catch (...) {
       LOG(info) << "Second vertex fit failed";
       return false;
     }
+    histos.fill(HIST("hCandidateBuilderStatus3Prong"), 1.f); // builds candidate
     if (nCand == 0) {
       return false;
     }
+    histos.fill(HIST("hCandidateBuilderStatus3Prong"), 2.f); // builds candidate
     //}-{}-{}-{}-{}-{}-{}-{}-{}-{}
 
     auto covMatrixPCA = fitter3.calcPCACovMatrixFlat();
@@ -345,6 +347,7 @@ struct alice3decayFinder {
     if (cand3prong.dcaDau > dcaDaughtersSelection) {
       return false;
     }
+    histos.fill(HIST("hCandidateBuilderStatus3Prong"), 3.f); // builds candidate
 
     cand3prong.primaryVertex = {primaryVertex.getX(), primaryVertex.getY(), primaryVertex.getZ()};
     auto secondaryVertex = fitter3.getPCACandidate();
@@ -571,6 +574,7 @@ struct alice3decayFinder {
       }
     }
     if (doprocessFindLc) {
+      histos.add("hCandidateBuilderStatus3Prong", "hCandidateBuilderStatus3Prong", kTH1D, {{10, -0.5, 9.5}});
       histos.add("h2dGen3Prong", "h2dGen3Prong", kTH2F, {axisPt, axisEta});
       histos.add("h2dGen3ProngBar", "h2dGen3ProngBar", kTH2F, {axisPt, axisEta});
       histos.add("h3dRec3Prong", "h3dRec3Prong", kTH3F, {axisPt, axisEta, axisLcMass});

ALICE3/TableProducer/alice3-decaypreselector.cxx

@@ -17,36 +17,38 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <vector>
-#include <utility>
+#include "PWGLF/DataModel/LFParticleIdentification.h"
+#include "PWGLF/DataModel/LFStrangenessTables.h"
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "ALICE3/DataModel/A3DecayFinderTables.h"
+#include "ALICE3/DataModel/OTFRICH.h"
+#include "ALICE3/DataModel/OTFTOF.h"
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
-#include "PWGLF/DataModel/LFParticleIdentification.h"
 #include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "DetectorsBase/Propagator.h"
-#include "DetectorsBase/GeometryManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsCalibration/MeanVertexObject.h"
-#include "ALICE3/DataModel/OTFTOF.h"
-#include "ALICE3/DataModel/OTFRICH.h"
-#include "ALICE3/DataModel/A3DecayFinderTables.h"
+
+#include <CCDB/BasicCCDBManager.h>
+#include <DCAFitter/DCAFitterN.h>
+#include <DataFormatsCalibration/MeanVertexObject.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+#include <DetectorsBase/GeometryManager.h>
+#include <DetectorsBase/Propagator.h>
+#include <Framework/ASoAHelpers.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/RunningWorkflowInfo.h>
+#include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/Track.h>
+
+#include <array>
+#include <cmath>
+#include <cstdlib>
+#include <iterator>
+#include <map>
+#include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;