Merge branch 'AliceO2Group:master' into master

Author: MartijnLaarhoven

.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.h

@@ -19,6 +19,7 @@
 
 #include <fairlogger/Logger.h>
 
+#include <map>
 #include <string>
 #include <vector>
 

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;

ALICE3/TableProducer/alice3HfSelector3Prong.cxx

@@ -120,6 +120,7 @@ struct Alice3HfSelector3Prong {
       labels[1 + aod::SelectionStep::RecoMl] = "ML selection";
       static const AxisSpec axisSelections = {kNBinsSelections, 0.5, kNBinsSelections + 0.5, ""};
       registry.add("hSelections", "Selections;;#it{p}_{T} (GeV/#it{c})", {HistType::kTH2F, {axisSelections, {(std::vector<double>)binsPt, "#it{p}_{T} (GeV/#it{c})"}}});
+      registry.add("hSelectionsTopology", "hSelectionsTopology", {HistType::kTH1D, {{10, -0.5, 9.5, "Selection step"}}});
       for (int iBin = 0; iBin < kNBinsSelections; ++iBin) {
         registry.get<TH2>(HIST("hSelections"))->GetXaxis()->SetBinLabel(iBin + 1, labels[iBin].data());
       }
@@ -151,52 +152,66 @@ struct Alice3HfSelector3Prong {
   bool selectionTopol(const T& cand, float candPt)
   {
     int const ptBin = findBin(binsPt, candPt);
-
+    auto fillQAHistogram = [&](float bin) {
+      if (activateQA) {
+        registry.fill(HIST("hSelectionsTopology"), bin);
+      }
+    };
+    fillQAHistogram(0.f);
     // check that the cand pT is within the analysis range
     if (candPt < ptCandMin || candPt >= ptCandMax) {
       return false;
     }
+    fillQAHistogram(1.f);
 
     // cut on daughter pT
     if (cand.ptProng0() < cuts->get(ptBin, "pT prong 0") ||
         cand.ptProng1() < cuts->get(ptBin, "pT prong 1") ||
         cand.ptProng2() < cuts->get(ptBin, "pT prong 2")) {
       return false;
     }
+    fillQAHistogram(2.f);
 
     // cosine of pointing angle
     if (cand.cpa() <= cuts->get(ptBin, "cos pointing angle")) {
       return false;
     }
+    fillQAHistogram(3.f);
 
     // cand chi2PCA
     if (cand.chi2PCA() > cuts->get(ptBin, "Chi2PCA")) {
       return false;
     }
+    fillQAHistogram(4.f);
 
     if (cand.decayLength() <= cuts->get(ptBin, "decay length")) {
       return false;
     }
+    fillQAHistogram(5.f);
 
     // cand decay length XY
     if (cand.decayLengthXY() <= cuts->get(ptBin, "decLengthXY")) {
       return false;
     }
+    fillQAHistogram(6.f);
 
     // cand normalized decay length XY
     if (cand.decayLengthXYNormalised() < cuts->get(ptBin, "normDecLXY")) {
       return false;
     }
+    fillQAHistogram(7.f);
 
     // cand impact parameter XY
     if (std::abs(cand.impactParameterXY()) > cuts->get(ptBin, "impParXY")) {
       return false;
     }
+    fillQAHistogram(8.f);
 
     // cand daughter prong DCA
     if (!isSelectedCandidateProngDca(cand)) {
       return false;
     }
+    fillQAHistogram(9.f);
 
     return true;
   }
@@ -292,6 +307,9 @@ struct Alice3HfSelector3Prong {
 
     // looping over 3-prong cands
     for (const auto& cand : cands) {
+      if (activateQA) {
+        registry.fill(HIST("hSelections"), 1, cand.pt());
+      }
       outputMl = {-1.f, -1.f, -1.f};
       pidMask = 0;
 

ALICE3/Tasks/CMakeLists.txt

@@ -66,7 +66,7 @@ o2physics_add_dpl_workflow(alice3-multicharm
 
 o2physics_add_dpl_workflow(alice3-hf-task-3prong
                     SOURCES alice3HfTask3Prong.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::SGCutParHolder O2Physics::MLCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::MLCore
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-efficiency

ALICE3/Tasks/alice3-qa-singleparticle.cxx

@@ -23,6 +23,8 @@
 #include <TDatabasePDG.h>
 #include <TMCProcess.h>
 
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;