Merge branch 'AliceO2Group:master' into master

Author: arvindkhuntia

PWGCF/Femto/FemtoNuclei/DataModel/HadronNucleiTables.h

@@ -71,8 +71,8 @@ DECLARE_SOA_COLUMN(MassTOFNu, massTOFNu, float);
 DECLARE_SOA_COLUMN(MassTOFHad, massTOFHad, float);
 DECLARE_SOA_COLUMN(PidTrkNu, pidTrkNu, uint32_t);
 DECLARE_SOA_COLUMN(PidTrkHad, pidTrkHad, uint32_t);
-DECLARE_SOA_COLUMN(TrackIDHad, trackIDHad, int);
-DECLARE_SOA_COLUMN(TrackIDNu, trackIDNu, int);
+DECLARE_SOA_COLUMN(TrackIDHad, trackIDHad, int64_t);
+DECLARE_SOA_COLUMN(TrackIDNu, trackIDNu, int64_t);
 
 DECLARE_SOA_COLUMN(ItsClusterSizeNu, itsClusterSizeNu, uint32_t);
 DECLARE_SOA_COLUMN(ItsClusterSizeHad, itsClusterSizeHad, uint32_t);
@@ -82,6 +82,23 @@ DECLARE_SOA_COLUMN(SharedClustersHad, sharedClustersHad, uint8_t);
 
 DECLARE_SOA_COLUMN(DeltaEta, deltaEta, float);
 DECLARE_SOA_COLUMN(DeltaPhi, deltaPhi, float);
+DECLARE_SOA_COLUMN(RunNumber, runNumber, int32_t);
+DECLARE_SOA_COLUMN(MagneticField, magneticField, float);
+DECLARE_SOA_COLUMN(CollisionIdNu, collisionIdNu, int64_t);
+DECLARE_SOA_COLUMN(CollisionIdHad, collisionIdHad, int64_t);
+DECLARE_SOA_COLUMN(NClsFindableTPCNu, nClsFindableTPCNu, uint8_t);
+DECLARE_SOA_COLUMN(NClsFindableTPCHad, nClsFindableTPCHad, uint8_t);
+DECLARE_SOA_COLUMN(FractionSharedTPCNu, fractionSharedTPCNu, float);
+DECLARE_SOA_COLUMN(FractionSharedTPCHad, fractionSharedTPCHad, float);
+DECLARE_SOA_COLUMN(NClsITSNu, nClsITSNu, uint8_t);
+DECLARE_SOA_COLUMN(NClsITSHad, nClsITSHad, uint8_t);
+DECLARE_SOA_COLUMN(NClsITSInnerBarrelNu, nClsITSInnerBarrelNu, uint8_t);
+DECLARE_SOA_COLUMN(NClsITSInnerBarrelHad, nClsITSInnerBarrelHad, uint8_t);
+DECLARE_SOA_COLUMN(Chi2ITSNu, chi2ITSNu, float);
+DECLARE_SOA_COLUMN(Chi2ITSHad, chi2ITSHad, float);
+DECLARE_SOA_COLUMN(NSigmaTPCNuDe, nSigmaTPCNuDe, float);
+DECLARE_SOA_COLUMN(NSigmaTPCNuPr, nSigmaTPCNuPr, float);
+DECLARE_SOA_COLUMN(NSigmaTPCNuPi, nSigmaTPCNuPi, float);
 
 // Reconstructed-MC pair information. The signed generated pT follows the
 // convention used by PtNu/PtHad: particles are positive and antiparticles
@@ -154,7 +171,26 @@ DECLARE_SOA_TABLE(HadronNucleiTable, "AOD", "HADNUCLEITABLE",
                   hadron_nuclei_tables::NSigmaTOFNu,
                   hadron_nuclei_tables::NSigmaITSNu,
                   hadron_nuclei_tables::NSigmaTOFHad,
-                  hadron_nuclei_tables::NSigmaITSHad)
+                  hadron_nuclei_tables::NSigmaITSHad,
+                  hadron_nuclei_tables::RunNumber,
+                  hadron_nuclei_tables::MagneticField,
+                  hadron_nuclei_tables::TrackIDNu,
+                  hadron_nuclei_tables::TrackIDHad,
+                  hadron_nuclei_tables::CollisionIdNu,
+                  hadron_nuclei_tables::CollisionIdHad,
+                  hadron_nuclei_tables::NClsFindableTPCNu,
+                  hadron_nuclei_tables::NClsFindableTPCHad,
+                  hadron_nuclei_tables::FractionSharedTPCNu,
+                  hadron_nuclei_tables::FractionSharedTPCHad,
+                  hadron_nuclei_tables::NClsITSNu,
+                  hadron_nuclei_tables::NClsITSHad,
+                  hadron_nuclei_tables::NClsITSInnerBarrelNu,
+                  hadron_nuclei_tables::NClsITSInnerBarrelHad,
+                  hadron_nuclei_tables::Chi2ITSNu,
+                  hadron_nuclei_tables::Chi2ITSHad,
+                  hadron_nuclei_tables::NSigmaTPCNuDe,
+                  hadron_nuclei_tables::NSigmaTPCNuPr,
+                  hadron_nuclei_tables::NSigmaTPCNuPi)
 DECLARE_SOA_TABLE(HadronNucleiTableMC, "AOD", "HADNUCLEIMC",
                   hadron_nuclei_tables::PtNuMC,
                   hadron_nuclei_tables::EtaNuMC,

PWGCF/Femto/FemtoNuclei/TableProducer/HadNucleiFemto.cxx

@@ -16,6 +16,7 @@
 
 #include "PWGHF/HFC/DataModel/CorrelationTables.h"
 #include "PWGHF/HFL/DataModel/ElectronSelectionTable.h"
+#include "PWGJE/DataModel/EMCALClusters.h"
 
 #include "Common/CCDB/TriggerAliases.h"
 #include "Common/Core/RecoDecay.h"
@@ -62,7 +63,7 @@ struct HfCorrelatorHfeHadrons {
   // Event Selection
   Configurable<float> zPvPosMax{"zPvPosMax", 10., "Maximum z of the primary vertex (cm)"};
   Configurable<bool> isRun3{"isRun3", true, "Data is from Run3 or Run2"};
-
+  Configurable<bool> skipNoEmcClusters{"skipNoEmcClusters", false, "Skip events with no EMCal clusters"};
   Configurable<int> numberEventsMixed{"numberEventsMixed", 5, "number of events mixed in ME process"};
   Configurable<float> invMassEEMax{"invMassEEMax", 0.14f, "max Invariant Mass for Photonic electron"};
   // Associated Hadron selection
@@ -211,12 +212,17 @@ struct HfCorrelatorHfeHadrons {
   }
 
   // Electron-hadron Correlation
-  template <bool IsMc, typename TracksType, typename ElectronType, typename CollisionType, typename BcType, typename McParticlesType>
-  void fillCorrelation(CollisionType const& collision, ElectronType const& electrons, TracksType const& tracks, BcType const&, McParticlesType const&)
+  template <bool IsMc, typename TracksType, typename ElectronType, typename EmcClusterType, typename CollisionType, typename BcType, typename McParticlesType>
+  void fillCorrelation(CollisionType const& collision, ElectronType const& electrons, TracksType const& tracks, EmcClusterType const& emcClusters, BcType const&, McParticlesType const&)
   {
     if (!(isRun3 ? collision.sel8() : (collision.sel7() && collision.alias_bit(kINT7)))) {
       return;
     }
+    // skip events with no clusters
+    if (emcClusters.size() == 0 && skipNoEmcClusters) {
+      return;
+    }
+
     int poolBin = corrBinning.getBin(std::make_tuple(collision.posZ(), collision.multFT0M()));
     auto bc = collision.template bc_as<BcType>();
     int gCollisionId = collision.globalIndex();
@@ -240,7 +246,11 @@ struct HfCorrelatorHfeHadrons {
       if (!selAssoHadron(hTrack)) {
         continue;
       }
+      if (!skipEventTableFilling) {
+        registry.fill(HIST("hptHadron"), hTrack.pt());
 
+        entryHadron(hTrack.phi(), hTrack.eta(), hTrack.pt(), poolBin, gCollisionId, timeStamp);
+      }
       // Mc rec hadron efficiency
       if constexpr (IsMc) {
         if (hTrack.has_mcParticle()) {
@@ -275,7 +285,6 @@ struct HfCorrelatorHfeHadrons {
     double ptElectron = -999;
     double phiElectron = -999;
     double etaElectron = -999;
-    int cntEle = 0;
     for (const auto& eTrack : electrons) {
       ptElectron = eTrack.ptTrack();
       phiElectron = eTrack.phiTrack();
@@ -289,9 +298,7 @@ struct HfCorrelatorHfeHadrons {
       double etaHadron = -999;
       double phiHadron = -999;
       // EMCal electron
-      if (eTrack.isEmcal() && requireEmcal) {
-        acceptElectron = true;
-      } else if (!eTrack.isEmcal() && !requireEmcal) {
+      if (eTrack.isEmcal() == requireEmcal) {
         acceptElectron = true;
       }
 
@@ -375,15 +382,9 @@ struct HfCorrelatorHfeHadrons {
         }
 
         entryElectronHadronPair(deltaPhi, deltaEta, ptElectron, ptHadron, eTrack.eopEl(), eTrack.m02El(), eTrack.tpcNSigmaElTrack(), eTrack.tofNSigmaElTrack(), eTrack.tpcNClsCrRowsTrack(), eTrack.tpcCrRowsRatioTrack(), eTrack.itsChi2NClTrack(), eTrack.tpcChi2NClTrack(), eTrack.dcaXYTrack(), eTrack.dcaZTrack(), hTrack.tpcNClsCrossedRows(), hTrack.tpcCrossedRowsOverFindableCls(), hTrack.itsChi2NCl(), hTrack.tpcChi2NCl(), hTrack.dcaXY(), hTrack.dcaZ(), poolBin, nElHadLSCorr, nElHadUSCorr);
-        if (!skipEventTableFilling) {
-          if (cntEle == 0) {
-            registry.fill(HIST("hptHadron"), hTrack.pt());
 
-            entryHadron(hTrack.phi(), hTrack.eta(), hTrack.pt(), poolBin, gCollisionId, timeStamp);
-          }
-        }
       } // end Hadron Track loop
-      cntEle++;
+
     } // end Electron loop
   }
 
@@ -451,10 +452,10 @@ struct HfCorrelatorHfeHadrons {
 
   void processData(TableCollision const& collision,
                    aod::HfCorrSelEl const& electrons,
-                   TableTracks const& tracks,
+                   TableTracks const& tracks, aod::EMCALClusters const& emcClusters,
                    aod::BCsWithTimestamps const& bcs)
   {
-    fillCorrelation<false>(collision, electrons, tracks, bcs, 0);
+    fillCorrelation<false>(collision, electrons, tracks, emcClusters, bcs, 0);
   }
 
   PROCESS_SWITCH(HfCorrelatorHfeHadrons, processData, "Process for Data", false);
@@ -463,10 +464,10 @@ struct HfCorrelatorHfeHadrons {
 
   void processMcRec(McTableCollision const& mcCollision,
                     aod::HfCorrSelEl const& mcElectrons,
-                    McTableTracks const& mcTracks,
+                    McTableTracks const& mcTracks, aod::EMCALClusters const& emcClusters,
                     aod::BCsWithTimestamps const& bcs, aod::McParticles const& mcParticle)
   {
-    fillCorrelation<true>(mcCollision, mcElectrons, mcTracks, bcs, mcParticle);
+    fillCorrelation<true>(mcCollision, mcElectrons, mcTracks, emcClusters, bcs, mcParticle);
   }
 
   PROCESS_SWITCH(HfCorrelatorHfeHadrons, processMcRec, "Process MC Reco mode", true);

PWGHF/HFC/TableProducer/correlatorHfeHadrons.cxx

@@ -257,13 +257,13 @@ struct HfCandidateCreatorXicToXiPiPi {
       }
     }
 
-    if (std::abs(nSigTpcBachelorPi) < softTrigCuts.maxNsigmaXiDaus || (hasTofBachelorPi && std::abs(nSigTofBachelorPi) < softTrigCuts.maxNsigmaXiDaus)) {
+    if (std::abs(nSigTpcBachelorPi) > softTrigCuts.maxNsigmaXiDaus || (hasTofBachelorPi && std::abs(nSigTofBachelorPi) > softTrigCuts.maxNsigmaXiDaus)) {
       return false;
     }
-    if (std::abs(nSigTpcPiFromLambda) < softTrigCuts.maxNsigmaXiDaus || (hasTofPiFromLambda && std::abs(nSigTofPiFromLambda) < softTrigCuts.maxNsigmaXiDaus)) {
+    if (std::abs(nSigTpcPiFromLambda) > softTrigCuts.maxNsigmaXiDaus || (hasTofPiFromLambda && std::abs(nSigTofPiFromLambda) > softTrigCuts.maxNsigmaXiDaus)) {
       return false;
     }
-    if (std::abs(nSigTpcPrFromLambda) < softTrigCuts.maxNsigmaXiDaus || (hasTofPrFromLambda && std::abs(nSigTofPrFromLambda) < softTrigCuts.maxNsigmaXiDaus)) {
+    if (std::abs(nSigTpcPrFromLambda) > softTrigCuts.maxNsigmaXiDaus || (hasTofPrFromLambda && std::abs(nSigTofPrFromLambda) > softTrigCuts.maxNsigmaXiDaus)) {
       return false;
     }