Merge branch 'AliceO2Group:master' into master

Author: jtanwar2212

ALICE3/TableProducer/OTF/CMakeLists.txt

@@ -20,6 +20,6 @@ o2physics_add_dpl_workflow(onthefly-tofpid
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(onthefly-richpid
-                    SOURCES onTheFlyRICHPID.cxx
+                    SOURCES onTheFlyRichPid.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2::DetectorsBase O2Physics::AnalysisCore O2::ReconstructionDataFormats O2::DetectorsCommonDataFormats O2Physics::ALICE3Core
                     COMPONENT_NAME Analysis)

…E3/TableProducer/OTF/onTheFlyRICHPID.cxx …E3/TableProducer/OTF/onTheFlyRichPid.cxxALICE3/TableProducer/OTF/onTheFlyRICHPID.cxx renamed to ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx ALICE3/TableProducer/OTF/onTheFlyRICHPID.cxx renamed to ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

@@ -8,13 +8,33 @@
 // 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.
-
-//
-// Task to add a table of track parameters propagated to the primary vertex
-//
+///
+/// \file onTheFlyRichPid.cxx
+///
+/// \brief This task goes straight from a combination of track table and mcParticles
+///        and a projective bRICH configuration to a table of TOF NSigmas for the particles
+///        being analysed. It currently contemplates 5 particle types:
+///        electrons, pions, kaons, protons and muons
+///
+///        More particles could be added but would have to be added to the LUT
+///        being used in the onTheFly tracker task.
+///
+/// \warning Geometry parameters are configurable, but resolution values should be adapted.
+///          Since angular resolution depends on the specific geometric details, it is better to
+///          calculate it from full simulation and add new input. Alternatively, an analytical
+///          expression can be provided as a function of the main parameters.
+///          Latest version: analytical parametrization of angular resolution !!!
+///
+/// \author David Dobrigkeit Chinellato, UNICAMP
+/// \author Nicola Nicassio, University and INFN Bari
+/// \since  May 22, 2024
+///
 
 #include <utility>
 #include <cmath>
+#include <vector>
+#include <map>
+#include <string>
 
 #include <TPDGCode.h>
 
@@ -42,28 +62,9 @@
 #include "TString.h"
 #include "ALICE3/DataModel/OTFRICH.h"
 #include "DetectorsVertexing/HelixHelper.h"
-
 #include "TableHelper.h"
 #include "ALICE3/Core/DelphesO2TrackSmearer.h"
 
-/// \file onTheFlyRichPid.cxx
-///
-/// \brief This task goes straight from a combination of track table and mcParticles
-/// and a projective bRICH configuration to a table of TOF NSigmas for the particles
-/// being analysed. It currently contemplates 5 particle types:
-/// electrons, pions, kaons, protons and muons.
-///
-/// More particles could be added but would have to be added to the LUT
-/// being used in the onTheFly tracker task.
-///
-/// \warning Geometry parameters are configurable, but resolution values should be adapted.
-/// Since angular resolution depends on the specific geometric details, it is better to
-/// calculate it from full simulation and add new input. Alternatively, an analytical
-/// expression can be provided as a function of the main parameters.
-/// Latest version: analytical parametrization of angular resolution !!!
-///
-/// \author David Dobrigkeit Chinellato, UNICAMP, Nicola Nicassio, University and INFN Bari
-
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::constants::math;
@@ -143,11 +144,13 @@ struct OnTheFlyRichPid {
   Configurable<float> bRICHPixelSize{"bRICHPixelSize", 0.1, "barrel RICH pixel size (cm)"};
   Configurable<float> bRichGapRefractiveIndex{"bRichGapRefractiveIndex", 1.000283, "barrel RICH gap refractive index"};
 
-  Configurable<std::string> lutEl{"lutEl", "lutCovm.el.dat", "LUT for electrons"};
-  Configurable<std::string> lutMu{"lutMu", "lutCovm.mu.dat", "LUT for muons"};
-  Configurable<std::string> lutPi{"lutPi", "lutCovm.pi.dat", "LUT for pions"};
-  Configurable<std::string> lutKa{"lutKa", "lutCovm.ka.dat", "LUT for kaons"};
-  Configurable<std::string> lutPr{"lutPr", "lutCovm.pr.dat", "LUT for protons"};
+  struct : ConfigurableGroup {
+    Configurable<std::string> lutEl{"lutEl", "inherit", "LUT for electrons (if inherit, inherits from otf tracker task)"};
+    Configurable<std::string> lutMu{"lutMu", "inherit", "LUT for muons (if inherit, inherits from otf tracker task)"};
+    Configurable<std::string> lutPi{"lutPi", "inherit", "LUT for pions (if inherit, inherits from otf tracker task)"};
+    Configurable<std::string> lutKa{"lutKa", "inherit", "LUT for kaons (if inherit, inherits from otf tracker task)"};
+    Configurable<std::string> lutPr{"lutPr", "inherit", "LUT for protons (if inherit, inherits from otf tracker task)"};
+  } simConfig;
 
   o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
 
@@ -257,9 +260,7 @@ struct OnTheFlyRichPid {
         aerogel_rindex[2 * i_central_mirror - i] = bRichRefractiveIndexSector[i - i_central_mirror];
         mProjectiveLengthInner = R_min * t; // <-- At the end of the loop this will be the maximum Z
       }
-    }
-    // Even number of sectors
-    else {
+    } else { // Even number of sectors
       float two_half_gap = 1.0;
       int i_central_mirror = static_cast<int>((number_of_sectors_in_z) / 2.0);
       float m_val = std::tan(0.0);
@@ -315,18 +316,33 @@ struct OnTheFlyRichPid {
     // std::cout << std::endl << std::endl;
   }
 
-  void init(o2::framework::InitContext& /*initContext*/)
+  void init(o2::framework::InitContext& initContext)
   {
     pRandomNumberGenerator.SetSeed(0); // fully randomize
 
+    // Check if inheriting the LUT configuration
+    auto configLutPath = [&](Configurable<std::string>& lut) {
+      if (lut.value != "inherit") {
+        return;
+      }
+      if (!getTaskOptionValue(initContext, "on-the-fly-tracker", lut.name, lut.value, true)) {
+        LOG(fatal) << "Could not get " << lut.name << " from on-the-fly-tracker task";
+      }
+    };
+    configLutPath(simConfig.lutEl);
+    configLutPath(simConfig.lutMu);
+    configLutPath(simConfig.lutPi);
+    configLutPath(simConfig.lutKa);
+    configLutPath(simConfig.lutPr);
+
     // Load LUT for pt and eta smearing
     if (flagIncludeTrackAngularRes && flagRICHLoadDelphesLUTs) {
       std::map<int, const char*> mapPdgLut;
-      const char* lutElChar = lutEl->c_str();
-      const char* lutMuChar = lutMu->c_str();
-      const char* lutPiChar = lutPi->c_str();
-      const char* lutKaChar = lutKa->c_str();
-      const char* lutPrChar = lutPr->c_str();
+      const char* lutElChar = simConfig.lutEl->c_str();
+      const char* lutMuChar = simConfig.lutMu->c_str();
+      const char* lutPiChar = simConfig.lutPi->c_str();
+      const char* lutKaChar = simConfig.lutKa->c_str();
+      const char* lutPrChar = simConfig.lutPr->c_str();
 
       LOGF(info, "Will load electron lut file ..: %s for RICH PID", lutElChar);
       LOGF(info, "Will load muon lut file ......: %s for RICH PID", lutMuChar);
@@ -340,7 +356,7 @@ struct OnTheFlyRichPid {
       mapPdgLut.insert(std::make_pair(321, lutKaChar));
       mapPdgLut.insert(std::make_pair(2212, lutPrChar));
 
-      for (auto e : mapPdgLut) {
+      for (const auto& e : mapPdgLut) {
         if (!mSmearer.loadTable(e.first, e.second)) {
           LOG(fatal) << "Having issue with loading the LUT " << e.first << " " << e.second;
         }

DPG/Tasks/AOTEvent/eventSelectionQa.cxx

@@ -346,12 +346,15 @@ struct EventSelectionQaTask {
       histos.add("occupancyQA/hOccupancyByFT0CvsByTracks", "", kTH2D, {{150, 0, 15000}, {150, 0, 150000}});
 
       // 3D histograms: nGlobalTracks with cls567 as y-axis, V0A as x-axis:
-      const AxisSpec axisNtracks{160, -0.5, 4000 - 0.5, "n tracks"};
-      const AxisSpec axisNtracksGlobal{120, -0.5, 3000 - 0.5, "n tracks"};
+      const AxisSpec axisNtracksPV{160, -0.5, 4000 - 0.5, "n ITS PV tracks"};
+      const AxisSpec axisNtracksPVTPC{120, -0.5, 3000 - 0.5, "n ITS-TPC PV tracks"};
+      const AxisSpec axisNtracksTPConly{120, -0.5, 6000 - 0.5, "n TPC-only tracks"};
       const AxisSpec axisMultV0AForOccup{20, 0., static_cast<float>(200000), "mult V0A"};
       const AxisSpec axisOccupancyTracks{150, 0., 15000, "occupancy (n ITS tracks weighted)"};
-      histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracks, axisOccupancyTracks});
-      histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksGlobal, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksPV, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksPVTPC, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksTPConly_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
+      histos.add("occupancyQA/hNumTracksTPConlyNoITS_vs_V0A_vs_occupancy", "", kTH3F, {axisMultV0AForOccup, axisNtracksTPConly, axisOccupancyTracks});
 
       histos.add("occupancyQA/hITSTracks_ev1_vs_ev2_2coll_in_ROF", ";nITStracks event #1;nITStracks event #2", kTH2D, {{200, 0., 6000}, {200, 0., 6000}});
       histos.add("occupancyQA/hITSTracks_ev1_vs_ev2_2coll_in_ROF_UPC", ";nITStracks event #1;nITStracks event #2", kTH2D, {{41, -0.5, 40.5}, {41, -0.5, 40.5}});
@@ -1108,18 +1111,30 @@ struct EventSelectionQaTask {
       // count tracks of different types
       auto tracksGrouped = tracks.sliceBy(perCollision, colIndex);
       int nPV = 0;
+      int nTPConly = 0;
+      // int nTPConlyWithDeDxCut = 0;
+      int nTPConlyNoITS = 0;
       int nContributorsAfterEtaTPCCuts = 0;
       bool isTVX = col.selection_bit(kIsTriggerTVX);
       for (const auto& track : tracksGrouped) {
         int trackBcDiff = bcDiff + track.trackTime() / o2::constants::lhc::LHCBunchSpacingNS;
+
+        if (track.hasTPC() && std::fabs(track.eta()) < 0.8 && track.pt() > 0.2 && track.tpcNClsFound() > 50 && track.tpcNClsCrossedRows() > 50 && track.tpcChi2NCl() < 4) {
+          nTPConly++;
+          // if (track.tpcSignal() > 20)
+          // nTPConlyWithDeDxCut++;
+          if (!track.hasITS())
+            nTPConlyNoITS++;
+        }
+
         if (!track.isPVContributor())
           continue;
 
         if (track.itsNCls() >= 5)
           vTracksITS567perColl[colIndex]++;
 
         // high-quality contributors for ROF border QA and occupancy study
-        if (isTVX && std::fabs(track.eta()) < 0.8 && track.pt() > 0.2 && track.itsNCls() >= 5) {
+        if (std::fabs(track.eta()) < 0.8 && track.pt() > 0.2 && track.itsNCls() >= 5) {
           nPV++;
           if (track.tpcNClsFound() > 70 && track.tpcNClsCrossedRows() > 80 && track.itsChi2NCl() < 36 && track.tpcChi2NCl() < 4) {
             nContributorsAfterEtaTPCCuts++;
@@ -1154,6 +1169,8 @@ struct EventSelectionQaTask {
           histos.fill(HIST("occupancyQA/hOccupancyByFT0CvsByTracks"), occupancyByTracks, occupancyByFT0C);
           histos.fill(HIST("occupancyQA/hNumTracksPV_vs_V0A_vs_occupancy"), multV0A, nPV, occupancyByTracks);
           histos.fill(HIST("occupancyQA/hNumTracksPVTPC_vs_V0A_vs_occupancy"), multV0A, nContributorsAfterEtaTPCCuts, occupancyByTracks);
+          histos.fill(HIST("occupancyQA/hNumTracksTPConly_vs_V0A_vs_occupancy"), multV0A, nTPConly, occupancyByTracks);
+          histos.fill(HIST("occupancyQA/hNumTracksTPConlyNoITS_vs_V0A_vs_occupancy"), multV0A, nTPConlyNoITS, occupancyByTracks);
 
           // dE/dx QA for a narrow pT bin
           for (const auto& track : tracksGrouped) {

PWGCF/TwoParticleCorrelations/Tasks/corrSparse.cxx

@@ -65,11 +65,12 @@ struct CorrSparse {
   O2_DEFINE_CONFIGURABLE(cfgMinMixEventNum, int, 5, "Minimum number of events to mix")
   O2_DEFINE_CONFIGURABLE(cfgMinMult, int, 0, "Minimum multiplicity for collision")
   O2_DEFINE_CONFIGURABLE(cfgMaxMult, int, 10, "Maximum multiplicity for collision")
-  O2_DEFINE_CONFIGURABLE(cfgMergingCut, float, 0.0, "Merging cut on track merge")
+  O2_DEFINE_CONFIGURABLE(cfgMergingCut, float, 0.02, "Merging cut on track merge")
+  O2_DEFINE_CONFIGURABLE(cfgApplyTwoTrackEfficiency, bool, true, "Apply two track efficiency for tpc tpc")
   O2_DEFINE_CONFIGURABLE(cfgRadiusLow, float, 0.8, "Low radius for merging cut")
   O2_DEFINE_CONFIGURABLE(cfgRadiusHigh, float, 2.5, "High radius for merging cut")
-  O2_DEFINE_CONFIGURABLE(etaMftTrackMin, float, 3.6, "Minimum eta for MFT track")
-  O2_DEFINE_CONFIGURABLE(etaMftTrackMax, float, 2.5, "Maximum eta for MFT track")
+  O2_DEFINE_CONFIGURABLE(etaMftTrackMin, float, -3.6, "Minimum eta for MFT track")
+  O2_DEFINE_CONFIGURABLE(etaMftTrackMax, float, -2.5, "Maximum eta for MFT track")
   O2_DEFINE_CONFIGURABLE(nClustersMftTrack, int, 5, "Minimum number of clusters for MFT track")
   O2_DEFINE_CONFIGURABLE(cfgSampleSize, double, 10, "Sample size for mixed event")
 
@@ -97,7 +98,7 @@ struct CorrSparse {
 
   // make the filters and cuts.
   Filter collisionFilter = (nabs(aod::collision::posZ) < cfgZVtxCut) && (aod::evsel::sel8) == true;
-  Filter trackFilter = (nabs(aod::track::eta) < cfgEtaCut) && (aod::track::pt > cfgPtCutMin) && (aod::track::pt < cfgPtCutMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
+  Filter trackFilter = (nabs(aod::track::eta) < cfgEtaCut) && (cfgPtCutMin < aod::track::pt) && (cfgPtCutMax > aod::track::pt) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true));
 
   // Define the outputs
   OutputObj<CorrelationContainer> same{Form("sameEvent_%i_%i", static_cast<int>(cfgMinMult), static_cast<int>(cfgMaxMult))};
@@ -160,7 +161,7 @@ struct CorrSparse {
   bool isAcceptedMftTrack(TTrackAssoc const& mftTrack)
   {
     // cut on the eta of MFT tracks
-    if (mftTrack.eta() > etaMftTrackMax || mftTrack.eta() < etaMftTrackMin) {
+    if (mftTrack.eta() < etaMftTrackMin || mftTrack.eta() > etaMftTrackMax) {
       return false;
     }
 
@@ -266,7 +267,7 @@ struct CorrSparse {
         float deltaPhi = RecoDecay::constrainAngle(track1.phi() - track2.phi(), -PIHalf);
         float deltaEta = track1.eta() - track2.eta();
 
-        if (std::abs(deltaEta) < cfgMergingCut) {
+        if (cfgApplyTwoTrackEfficiency && std::abs(deltaEta) < cfgMergingCut) {
 
           double dPhiStarHigh = getDPhiStar(track1, track2, cfgRadiusHigh, magneticField);
           double dPhiStarLow = getDPhiStar(track1, track2, cfgRadiusLow, magneticField);
@@ -355,9 +356,6 @@ struct CorrSparse {
         if ((tracks1.size() < cfgMinMult || tracks1.size() >= cfgMaxMult))
           continue;
 
-        if ((tracks2.size() < cfgMinMult || tracks2.size() >= cfgMaxMult))
-          continue;
-
         fillCorrelations<CorrelationContainer::kCFStepReconstructed>(tracks1, tracks2, collision1.posZ(), MixedEvent, getMagneticField(bc.timestamp()));
       }
     } else {