Merge branch 'master' into deutInJet

Author: Cristian-Moscatelli

ALICE3/Macros/CMakeLists.txt

@@ -13,6 +13,7 @@ install(FILES Configuration/a3geo.ini
               Configuration/a3geometry_v2_10kG.ini
               Configuration/a3geometry_v2_20kG_dipole.ini
               Configuration/a3geometry_v2_20kG.ini
+              Configuration/a3geometry_v3_extra_ml.ini
               Configuration/a3geometry_v3.ini
               Configuration/a3geometry_v4.ini
         PERMISSIONS GROUP_READ GROUP_EXECUTE OWNER_EXECUTE OWNER_WRITE OWNER_READ WORLD_EXECUTE WORLD_READ

ALICE3/Macros/Configuration/a3geo.ini

@@ -159,4 +159,10 @@ B10.resZ: 0.001
 B10.eff: 1.
 B10.type: 1
 
-global.lutEl: /tmp/lutCovm.el.20kG.rmin20.geometry_v2.dat
+global.lutEl: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/el
+global.lutMu: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/mu
+global.lutPi: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/pi
+global.lutKa: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/ka
+global.lutPr: ccdb:/Users/j/jekarlss/LookUpTables/NoEloss/pr
+
+global.magneticfield: 20

ALICE3/Macros/Configuration/a3geometry_v3.ini

@@ -147,11 +147,11 @@ B10.eff: 1.00
 B10.type: 1
 
 # Lookup tables
-global.lutEl: ccdb:/Users/j/jekarlss/LUTs/v3/extra_ml/el
-global.lutMu: ccdb:/Users/j/jekarlss/LUTs/v3/extra_ml/mu
-global.lutPi: ccdb:/Users/j/jekarlss/LUTs/v3/extra_ml/pi
-global.lutKa: ccdb:/Users/j/jekarlss/LUTs/v3/extra_ml/ka
-global.lutPr: ccdb:/Users/j/jekarlss/LUTs/v3/extra_ml/pr
+global.lutEl: ccdb:/Users/j/jekarlss/LUTs/v3/b/el
+global.lutMu: ccdb:/Users/j/jekarlss/LUTs/v3/b/mu
+global.lutPi: ccdb:/Users/j/jekarlss/LUTs/v3/b/pi
+global.lutKa: ccdb:/Users/j/jekarlss/LUTs/v3/b/ka
+global.lutPr: ccdb:/Users/j/jekarlss/LUTs/v3/b/pr
 
 # in kGauss
 global.magneticfield: 20

ALICE3/TableProducer/alice3MulticharmFinder.cxx

@@ -460,12 +460,12 @@ struct Alice3MulticharmFinder {
     INSERT_HIST(histPath + "hPi2cPt", "hPi2cPt", {kTH1D, {{axisPt}}});
     INSERT_HIST(histPath + "hPiccPt", "hPiccPt", {kTH1D, {{axisPt}}});
 
-    INSERT_HIST(histPath + "hPi1cDCAxy", "hPi1cDCAxy", {kTH1D, {{axisPt}}});
-    INSERT_HIST(histPath + "hPi1cDCAz", "hPi1cDCAz", {kTH1D, {{axisPt}}});
-    INSERT_HIST(histPath + "hPi2cDCAxy", "hPi2cDCAxy", {kTH1D, {{axisPt}}});
-    INSERT_HIST(histPath + "hPi2cDCAz", "hPi2cDCAz", {kTH1D, {{axisPt}}});
-    INSERT_HIST(histPath + "hPiccDCAxy", "hPiccDCAxy", {kTH1D, {{axisPt}}});
-    INSERT_HIST(histPath + "hPiccDCAz", "hPiccDCAz", {kTH1D, {{axisPt}}});
+    INSERT_HIST(histPath + "hPi1cDCAxy", "hPi1cDCAxy", {kTH1D, {{axisDCA}}});
+    INSERT_HIST(histPath + "hPi1cDCAz", "hPi1cDCAz", {kTH1D, {{axisDCA}}});
+    INSERT_HIST(histPath + "hPi2cDCAxy", "hPi2cDCAxy", {kTH1D, {{axisDCA}}});
+    INSERT_HIST(histPath + "hPi2cDCAz", "hPi2cDCAz", {kTH1D, {{axisDCA}}});
+    INSERT_HIST(histPath + "hPiccDCAxy", "hPiccDCAxy", {kTH1D, {{axisDCA}}});
+    INSERT_HIST(histPath + "hPiccDCAz", "hPiccDCAz", {kTH1D, {{axisDCA}}});
 
     INSERT_HIST(histPath + "hMinXiDecayRadius", "hMinXiDecayRadius", {kTH1D, {{axisRadius2DXi}}});
     INSERT_HIST(histPath + "hMinXiCDecayRadius", "hMinXiCDecayRadius", {kTH1D, {{axisRadius}}});

Common/TableProducer/qVectorsTable.cxx

@@ -693,6 +693,14 @@ struct qVectorsTable {
             deltapsiTPCall += ((2. / (1.0 * ishift)) * (-coeffshiftxTPCall * TMath::Cos(ishift * static_cast<float>(nmode) * psidefTPCall) + coeffshiftyTPCall * TMath::Sin(ishift * static_cast<float>(nmode) * psidefTPCall))) / static_cast<float>(nmode);
           }
 
+          deltapsiFT0C *= static_cast<float>(nmode);
+          deltapsiFT0A *= static_cast<float>(nmode);
+          deltapsiFT0M *= static_cast<float>(nmode);
+          deltapsiFV0A *= static_cast<float>(nmode);
+          deltapsiTPCpos *= static_cast<float>(nmode);
+          deltapsiTPCneg *= static_cast<float>(nmode);
+          deltapsiTPCall *= static_cast<float>(nmode);
+
           qvecReShiftedFT0C.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C) - qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C));
           qvecImShiftedFT0C.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Sin(deltapsiFT0C) + qvecIm[(kTPCall + 1) * 4 * id + kFT0C * 4 + 3] * TMath::Cos(deltapsiFT0C));
           qvecReShiftedFT0A.push_back(qvecRe[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Cos(deltapsiFT0A) - qvecIm[(kTPCall + 1) * 4 * id + kFT0A * 4 + 3] * TMath::Sin(deltapsiFT0A));

Common/Tools/EventSelectionModule.h

@@ -159,6 +159,7 @@ class BcSelectionModule
   int mTimeFrameStartBorderMargin = 300; // default value
   int mTimeFrameEndBorderMargin = 4000;  // default value
   std::string strLPMProductionTag = "";  // MC production tag to be retrieved from AO2D metadata
+  bool isMC = false;
 
   TriggerAliases* aliases = nullptr;
   EventSelectionParams* par = nullptr;
@@ -195,6 +196,7 @@ class BcSelectionModule
       }
     }
     strLPMProductionTag = metadataInfo.get("LPMProductionTag"); // to extract info from ccdb by the tag
+    isMC = metadataInfo.isMC();
 
     // add counter
     histos.add("bcselection/hCounterInvalidBCTimestamp", "", o2::framework::kTH1D, {{1, 0., 1.}});
@@ -223,7 +225,10 @@ class BcSelectionModule
         // duration of TF in bcs
         nBCsPerTF = 32; // hard-coded for Run3 MC (no info from ccdb at the moment)
       } else {
-        auto runInfo = o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run, strLPMProductionTag);
+        auto runInfo = (!isMC) ? o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run)
+                               : o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run, strLPMProductionTag);
+        LOGP(info, "BcSelectionModule: isMC = {}, NumberOfOrbitsPerTF extracted from AggregatedRunInfo = {}", isMC, runInfo.orbitsPerTF);
+
         // SOR and EOR timestamps
         sorTimestamp = runInfo.sor;
         eorTimestamp = runInfo.eor;
@@ -751,7 +756,10 @@ class EventSelectionModule
     // extract bc pattern from CCDB for data or anchored MC only
     if (run != lastRun && run >= run3min) {
       lastRun = run;
-      auto runInfo = o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run, strLPMProductionTag);
+      auto runInfo = (!evselOpts.isMC) ? o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run)
+                                       : o2::parameters::AggregatedRunInfo::buildAggregatedRunInfo(o2::ccdb::BasicCCDBManager::instance(), run, strLPMProductionTag);
+      LOGP(info, "EventSelectionModule: isMC = {}, NumberOfOrbitsPerTF extracted from AggregatedRunInfo = {}", (bool)evselOpts.isMC, runInfo.orbitsPerTF);
+
       // first bc of the first orbit
       bcSOR = runInfo.orbitSOR * nBCsPerOrbit;
       // duration of TF in bcs

EventFiltering/PWGHF/H2fromLbFilter.cxx

@@ -16,21 +16,18 @@
 
 #include "../filterTables.h"
 
-#include "PWGLF/DataModel/LFParticleIdentification.h"
-
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelection.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/CollisionAssociationTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CommonConstants/PhysicsConstants.h"
-#include "DCAFitter/DCAFitterN.h"
 #include "DataFormatsParameters/GRPMagField.h"
 #include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/Propagator.h"
@@ -69,14 +66,16 @@ struct H2fromLbFilter {
   o2::framework::Configurable<bool> isNoITSROFrameBorder{"isNoITSROFrameBorder", true, "isNoITSROFrameBorder event selection"};
   o2::framework::Configurable<float> cfgTPCNsigma{"cfgTPCNsigma", 4.0f, "TPC n sigma for deuteron PID"};
   o2::framework::Configurable<float> cfgTOFNsigma{"cfgTOFNsigma", 4.0f, "TOF n sigma for deuteron PID"};
+  o2::framework::Configurable<float> cfgITSNsigma{"cfgITSNsigma", -2.0f, "ITS n sigma for deuteron PID"};
   o2::framework::Configurable<float> cfgEta{"cfgEta", 0.8f, "Track eta selection"};
   o2::framework::Configurable<int> cfgTPCNclsFound{"cfgTPCNclsFound", 100, "Minimum TPC clusters found"};
   o2::framework::Configurable<float> cfgTPCChi2Ncl{"cfgTPCChi2Ncl", 4.0f, "Maximum TPC chi2 per N clusters"};
   o2::framework::Configurable<float> cfgITSChi2Ncl{"cfgITSChi2Ncl", 36.0f, "Maximum ITS chi2 per N clusters"};
   o2::framework::Configurable<int> cfgITScls{"cfgITScls", 2, "Minimum ITS clusters"};
   o2::framework::Configurable<float> cfgMaxPt{"cfgMaxPt", 5.0f, "Maximum pT cut"};
-  o2::framework::Configurable<float> cfgMinPt{"cfgMinPt", 1.0f, "Maximum pT cut"};
+  o2::framework::Configurable<float> cfgMinPt{"cfgMinPt", 0.5f, "Minimum pT cut"};
   o2::framework::Configurable<float> cfgDCAcut{"cfgDCAcut", 0.003f, "DCA cut for non prompt deuteron"};
+  o2::framework::Configurable<float> ptThresholdPid{"ptThresholdPid", 1.0f, "pT threshold to switch between ITS and TOF PID"};
 
   o2::framework::Service<o2::ccdb::BasicCCDBManager> ccdb;
 
@@ -95,6 +94,7 @@ struct H2fromLbFilter {
     QAHistos.add("hDCAzVsPt", "DCAz #bar{d} vs p_{T}", {o2::framework::HistType::kTH2D, {pTAxis, DCAzAxis}});
     QAHistos.add("hnSigmaTPCVsPt", "n#sigma TPC vs p_{T} for #bar{d} hypothesis; p_{T} (GeV/c); n#sigma TPC", {o2::framework::HistType::kTH2D, {pTAxis, nSigmaAxis}});
     QAHistos.add("hnSigmaTOFVsPt", "n#sigma TOF vs p_{T} for #bar{d} hypothesis; p_{T} (GeV/c); n#sigma TOF", {o2::framework::HistType::kTH2D, {pTAxis, nSigmaAxis}});
+    QAHistos.add("hnSigmaITSVsPt", "n#sigma ITS vs p_{T} for #bar{d} hypothesis; p_{T} (GeV/c); n#sigma ITS", {o2::framework::HistType::kTH2D, {pTAxis, nSigmaAxis}});
     QAHistos.add("ptAntiDeuteron", "ptAntiDeuteron", {o2::framework::HistType::kTH1F, {ptAxis}});
     QAHistos.add("etaAntideuteron", "etaAntideuteron", {o2::framework::HistType::kTH1F, {{100, -1.0f, 1.0f, "eta #bar{d}"}}});
     QAHistos.add("hDCAxyVsPt-pre_selection", "DCAxy #bar{d} vs p_{T}", {o2::framework::HistType::kTH2D, {pTAxis, DCAxyAxis}});
@@ -193,10 +193,11 @@ struct H2fromLbFilter {
 
       // Loop over tracks
       const auto& trackIdsThisCollision = trackIndices.sliceBy(trackIndicesPerCollision, collision.globalIndex());
+      auto tracksWithItsPid = o2::soa::Attach<TrackCandidates, o2::aod::pidits::ITSNSigmaDe>(tracks);
 
       for (const auto& trackId : trackIdsThisCollision) { // start loop over tracks
 
-        const auto& track = tracks.rawIteratorAt(trackId.trackId());
+        const auto& track = tracksWithItsPid.rawIteratorAt(trackId.trackId());
 
         std::array<float, 2> dca{track.dcaXY(), track.dcaZ()};
         std::array<float, 3> pVec = track.pVector();
@@ -213,23 +214,42 @@ struct H2fromLbFilter {
 
         const bool isTOFDe = std::abs(track.tofNSigmaDe()) < cfgTOFNsigma;
         const bool isTPCDe = std::abs(track.tpcNSigmaDe()) < cfgTPCNsigma;
-
-        if (isTPCDe && isTOFDe) {
-
-          QAHistos.fill(HIST("hDCAxyVsPt-pre_selection"), track.pt(), dca[0]);
-          QAHistos.fill(HIST("hDCAzVsPt-pre-selection"), track.pt(), dca[1]);
-          if (std::abs(dca[0]) < cfgDCAcut) {
-            continue;
+        const bool isITSDe = track.itsNSigmaDe() > cfgITSNsigma;
+
+        if (track.pt() < ptThresholdPid) {
+          if (isTPCDe && isITSDe) {
+            QAHistos.fill(HIST("hDCAxyVsPt-pre_selection"), track.pt(), dca[0]);
+            QAHistos.fill(HIST("hDCAzVsPt-pre-selection"), track.pt(), dca[1]);
+            if (std::abs(dca[0]) < cfgDCAcut) {
+              continue;
+            }
+            keepEvent[0] = true;
+            QAHistos.fill(HIST("ptAntiDeuteron"), track.pt());
+            QAHistos.fill(HIST("etaAntideuteron"), track.eta());
+            QAHistos.fill(HIST("hDCAxyVsPt"), track.pt(), dca[0]);
+            QAHistos.fill(HIST("hDCAzVsPt"), track.pt(), dca[1]);
+            QAHistos.fill(HIST("hnSigmaTPCVsPt"), track.pt(), track.tpcNSigmaDe());
+            QAHistos.fill(HIST("hnSigmaTOFVsPt"), track.pt(), track.tofNSigmaDe());
+            QAHistos.fill(HIST("hnSigmaITSVsPt"), track.pt(), track.itsNSigmaDe());
+          }
+        } else {
+          if (isTPCDe && isTOFDe) {
+
+            QAHistos.fill(HIST("hDCAxyVsPt-pre_selection"), track.pt(), dca[0]);
+            QAHistos.fill(HIST("hDCAzVsPt-pre-selection"), track.pt(), dca[1]);
+            if (std::abs(dca[0]) < cfgDCAcut) {
+              continue;
+            }
+            keepEvent[0] = true;
+            QAHistos.fill(HIST("ptAntiDeuteron"), track.pt());
+            QAHistos.fill(HIST("etaAntideuteron"), track.eta());
+            QAHistos.fill(HIST("hDCAxyVsPt"), track.pt(), dca[0]);
+            QAHistos.fill(HIST("hDCAzVsPt"), track.pt(), dca[1]);
+            QAHistos.fill(HIST("hnSigmaTPCVsPt"), track.pt(), track.tpcNSigmaDe());
+            QAHistos.fill(HIST("hnSigmaTOFVsPt"), track.pt(), track.tofNSigmaDe());
+            QAHistos.fill(HIST("hnSigmaITSVsPt"), track.pt(), track.itsNSigmaDe());
           }
-          keepEvent[0] = true;
-          QAHistos.fill(HIST("ptAntiDeuteron"), track.pt());
-          QAHistos.fill(HIST("etaAntideuteron"), track.eta());
-          QAHistos.fill(HIST("hDCAxyVsPt"), track.pt(), dca[0]);
-          QAHistos.fill(HIST("hDCAzVsPt"), track.pt(), dca[1]);
-          QAHistos.fill(HIST("hnSigmaTPCVsPt"), track.pt(), track.tpcNSigmaDe());
-          QAHistos.fill(HIST("hnSigmaTOFVsPt"), track.pt(), track.tofNSigmaDe());
         }
-
       } // end track loop
       if (keepEvent[0]) {
         hProcessedEvents->Fill(5.5);

EventFiltering/PWGHF/HFFilter.cxx

@@ -149,7 +149,7 @@ struct HfFilter { // Main struct for HF triggers
 
   // parameters for charm baryons to Xi bachelor
   Configurable<LabeledArray<float>> cutsXiCascades{"cutsXiCascades", {cutsCascades[0], 1, 8, labelsEmpty, labelsColumnsCascades}, "Selections for cascades (Xi) for Xi+bachelor triggers"};
-  Configurable<LabeledArray<float>> cutsXiBachelor{"cutsXiBachelor", {cutsCharmBaryons[0], 1, 11, labelsEmpty, labelsColumnsCharmBarCuts}, "Selections for charm baryons (Xi+Pi, Xi+Ka, Xi+Pi+Pi)"};
+  Configurable<LabeledArray<float>> cutsXiBachelor{"cutsXiBachelor", {cutsCharmBaryons[0], 1, 15, labelsEmpty, labelsColumnsCharmBarCuts}, "Selections for charm baryons (Xi+Pi, Xi+Ka, Xi+Pi+Pi)"};
   Configurable<LabeledArray<double>> cutsTrackCharmBaryonBachelor{"cutsTrackCharmBaryonBachelor", {hf_cuts_single_track::CutsTrack[0], hf_cuts_single_track::NBinsPtTrack, hf_cuts_single_track::NCutVarsTrack, hf_cuts_single_track::labelsPtTrack, hf_cuts_single_track::labelsCutVarTrack}, "Single-track selections per pT bin for charm-baryon bachelor candidates"};
   Configurable<LabeledArray<int>> requireStrangenessTracking{"requireStrangenessTracking", {requireStrangenessTrackedXi[0], 1, 2, labelsEmpty, labelsColumnsCharmBaryons}, "Flags to require strangeness tracking for channels with Xi"};
 
@@ -273,7 +273,7 @@ struct HfFilter { // Main struct for HF triggers
     helper.setForceTofForFemto(forceTofProtonForFemto, forceTofDeuteronForFemto);
     helper.setV0Selections(cutsGammaK0sLambda->get(0u, 0u), cutsGammaK0sLambda->get(0u, 1u), cutsGammaK0sLambda->get(0u, 2u), cutsGammaK0sLambda->get(0u, 3u), cutsGammaK0sLambda->get(0u, 4u), cutsGammaK0sLambda->get(0u, 5u));
     helper.setXiSelections(cutsXiCascades->get(0u, 0u), cutsXiCascades->get(0u, 1u), cutsXiCascades->get(0u, 2u), cutsXiCascades->get(0u, 3u), cutsXiCascades->get(0u, 4u), cutsXiCascades->get(0u, 5u), cutsXiCascades->get(0u, 6u), cutsXiCascades->get(0u, 7u));
-    helper.setXiBachelorSelections(cutsXiBachelor->get(0u, 0u), cutsXiBachelor->get(0u, 1u), cutsXiBachelor->get(0u, 2u), cutsXiBachelor->get(0u, 3u), cutsXiBachelor->get(0u, 4u), cutsXiBachelor->get(0u, 5u), cutsXiBachelor->get(0u, 6u), cutsXiBachelor->get(0u, 7u), cutsXiBachelor->get(0u, 8u), cutsXiBachelor->get(0u, 9u), cutsXiBachelor->get(0u, 10u));
+    helper.setXiBachelorSelections(cutsXiBachelor->get(0u, 0u), cutsXiBachelor->get(0u, 1u), cutsXiBachelor->get(0u, 2u), cutsXiBachelor->get(0u, 3u), cutsXiBachelor->get(0u, 4u), cutsXiBachelor->get(0u, 5u), cutsXiBachelor->get(0u, 6u), cutsXiBachelor->get(0u, 7u), cutsXiBachelor->get(0u, 8u), cutsXiBachelor->get(0u, 9u), cutsXiBachelor->get(0u, 10u), cutsXiBachelor->get(0u, 11u), cutsXiBachelor->get(0u, 12u), cutsXiBachelor->get(0u, 13u), cutsXiBachelor->get(0u, 14u));
     helper.setNsigmaPiCutsForCharmBaryonBachelor(nSigmaPidCuts->get(0u, 4u), nSigmaPidCuts->get(1u, 4u));
     helper.setTpcPidCalibrationOption(setTPCCalib);
     helper.setMassResolParametrisation(paramCharmMassShape);