[PWGJE] Addition of deltaEta and deltaPhi columns to the EmcalMatchedTracks tables in the JE framework + fixed some bugs in the full-jet-spectra task

PWGJE/DataModel/JetReducedData.h

@@ -1,4 +1,4 @@
 // Copyright 2019-2020 CERN and copyright holders of ALICE O2.
 // See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
 // All rights not expressly granted are reserved.
 //
@@ -12,7 +12,7 @@
 ///
 /// \brief Table definitions for reduced data model for jets
 ///
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>
 
 #ifndef PWGJE_DATAMODEL_JETREDUCEDDATA_H_
 #define PWGJE_DATAMODEL_JETREDUCEDDATA_H_
@@ -32,7 +32,7 @@
 
 namespace jbc
 {
 DECLARE_SOA_INDEX_COLUMN(BC, bc);
 DECLARE_SOA_COLUMN(RunNumber, runNumber, int);
 DECLARE_SOA_COLUMN(GlobalBC, globalBC, uint64_t);
 DECLARE_SOA_COLUMN(Timestamp, timestamp, uint64_t);
@@ -67,7 +67,7 @@
 namespace jcollision
 {
 DECLARE_SOA_INDEX_COLUMN(Collision, collision);
 DECLARE_SOA_INDEX_COLUMN(JBC, bc);
 DECLARE_SOA_COLUMN(PosX, posX, float);
 DECLARE_SOA_COLUMN(PosY, posY, float);
 DECLARE_SOA_COLUMN(PosZ, posZ, float);
@@ -110,7 +110,7 @@
 DECLARE_SOA_COLUMN(ReadCountsWithTVXAndZVertexAndSel7KINT7, readCountsWithTVXAndZVertexAndSel7KINT7, std::vector<int>);
 DECLARE_SOA_COLUMN(ReadCountsWithCustom, readCountsWithCustom, std::vector<int>);
 DECLARE_SOA_COLUMN(IsAmbiguous, isAmbiguous, bool);
 DECLARE_SOA_COLUMN(IsEMCALReadout, isEmcalReadout, bool);
 DECLARE_SOA_COLUMN(IsOutlier, isOutlier, bool);
 } // namespace jcollision
 
@@ -233,7 +233,7 @@
 
 namespace jmccollisionlb
 {
 DECLARE_SOA_INDEX_COLUMN(JMcCollision, mcCollision);
 }
 
 DECLARE_SOA_TABLE_STAGED(JMcCollisionLbs, "JMCCOLLISIONLB",
@@ -244,14 +244,14 @@
 
 namespace jtrack
 {
 DECLARE_SOA_INDEX_COLUMN(JCollision, collision);
 DECLARE_SOA_INDEX_COLUMN(Track, track);
 DECLARE_SOA_COLUMN(Pt, pt, float);
 DECLARE_SOA_COLUMN(Eta, eta, float);
 DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_COLUMN(DCAX, dcaX, float);
 DECLARE_SOA_COLUMN(DCAY, dcaY, float);
 DECLARE_SOA_COLUMN(DCAZ, dcaZ, float);
 DECLARE_SOA_COLUMN(DCAXY, dcaXY, float);
 DECLARE_SOA_COLUMN(DCAXYZ, dcaXYZ, float);
 DECLARE_SOA_COLUMN(SigmaDCAZ, sigmadcaZ, float);
@@ -315,12 +315,16 @@
 DECLARE_SOA_INDEX_COLUMN(JTrack, track);
 DECLARE_SOA_COLUMN(EtaEMCAL, etaEmcal, float);
 DECLARE_SOA_COLUMN(PhiEMCAL, phiEmcal, float);
+DECLARE_SOA_COLUMN(EtaDiff, etaDiff, float);
+DECLARE_SOA_COLUMN(PhiDiff, phiDiff, float);
 } // namespace jemctrack
 
 DECLARE_SOA_TABLE_STAGED(JEMCTracks, "JEMCTrack",
                          jemctrack::JTrackId,
                          jemctrack::EtaEMCAL,
-                         jemctrack::PhiEMCAL);
+                         jemctrack::PhiEMCAL,
+                         jemctrack::EtaDiff,
+                         jemctrack::PhiDiff);
 
 namespace jmcparticle
 {

PWGJE/TableProducer/derivedDataProducer.cxx

@@ -468,7 +468,7 @@ struct JetDerivedDataProducerTask {
         auto JClusterID = trackCollisionMapping.find({clusterTrack.trackId(), cluster.collisionId()}); // does EMCal use its own associator?
         clusterTrackIDs.push_back(JClusterID->second);
         auto emcTrack = clusterTrack.track_as<soa::Join<aod::Tracks, aod::TracksExtra>>();
-        products.jTracksEMCalTable(JClusterID->second, emcTrack.trackEtaEmcal(), emcTrack.trackPhiEmcal());
+        products.jTracksEMCalTable(JClusterID->second, emcTrack.trackEtaEmcal(), emcTrack.trackPhiEmcal(), clusterTrack.deltaEta(), clusterTrack.deltaPhi());
       }
       products.jClustersMatchedTracksTable(clusterTrackIDs);
     }

PWGJE/TableProducer/derivedDataWriter.cxx

@@ -512,7 +512,7 @@ struct JetDerivedDataWriter {
           clusterStoredJTrackIDs.push_back(trackMapping[clusterTrack.globalIndex()]);
           auto emcTracksPerTrack = emcTracks.sliceBy(preslices.EMCTrackPerTrack, clusterTrack.globalIndex());
           auto emcTrackPerTrack = emcTracksPerTrack.iteratorAt(0);
-          products.storedJTracksEMCalTable(trackMapping[clusterTrack.globalIndex()], emcTrackPerTrack.etaEmcal(), emcTrackPerTrack.phiEmcal());
+          products.storedJTracksEMCalTable(trackMapping[clusterTrack.globalIndex()], emcTrackPerTrack.etaEmcal(), emcTrackPerTrack.phiEmcal(), emcTrackPerTrack.etaDiff(), emcTrackPerTrack.phiDiff());
         }
         products.storedJClustersMatchedTracksTable(clusterStoredJTrackIDs);
       }

PWGJE/TableProducer/emcalClusterHadronicCorrectionTask.cxx

@@ -161,11 +161,12 @@ struct EmcalClusterHadronicCorrectionTask {
         if (matchedTrack.pt() < minTrackPt) {
           continue;
         }
-        double mom = abs(matchedTrack.p());
+        double mom = std::abs(matchedTrack.p());
         registry.fill(HIST("h_matchedtracks"), 1);
 
         // CASE 1: skip tracks with a very low pT
-        if (mom < 1e-6) {
+        constexpr double kMinMom = 1e-6;
+        if (mom < kMinMom) {
           continue;
         } // end CASE 1
 
@@ -176,8 +177,8 @@ struct EmcalClusterHadronicCorrectionTask {
 
         // Perform dEta/dPhi matching
         auto emcTrack = (emcTracks.sliceBy(perTrackMatchedTrack, matchedTrack.globalIndex())).iteratorAt(0);
-        double dEta = emcTrack.etaEmcal() - cluster.eta();
-        double dPhi = TVector2::Phi_mpi_pi(emcTrack.phiEmcal() - cluster.phi());
+        double dEta = emcTrack.etaDiff();
+        double dPhi = emcTrack.phiDiff();
 
         // Apply the eta and phi matching thresholds
         // dEta and dPhi cut : ensures that the matched track is within the desired eta/phi window
@@ -188,7 +189,7 @@ struct EmcalClusterHadronicCorrectionTask {
           auto trackPhiHigh = +funcPtDepPhi.Eval(mom);
           auto trackPhiLow = -funcPtDepPhi.Eval(mom);
 
-          if ((dPhi < trackPhiHigh && dPhi > trackPhiLow) && fabs(dEta) < trackEtaMax) {
+          if ((dPhi < trackPhiHigh && dPhi > trackPhiLow) && std::fabs(dEta) < trackEtaMax) {
             if (nMatches == 0) {
               closestTrkP = mom;
             }
@@ -197,7 +198,7 @@ struct EmcalClusterHadronicCorrectionTask {
           }
         } else {
           // Do fixed dEta/dPhi matching (non-pT dependent)
-          if (fabs(dEta) >= minDEta || fabs(dPhi) >= minDPhi) {
+          if (std::fabs(dEta) >= minDEta || std::fabs(dPhi) >= minDPhi) {
             continue; // Skip this track if outside the fixed cut region
           }
 

PWGJE/Tasks/fullJetSpectra.cxx

@@ -135,7 +135,7 @@ struct FullJetSpectra {
   // Instantiate the Zorro processor for skimmed data and define an output object
   Zorro zorro;
   OutputObj<ZorroSummary> zorroSummary{"zorroSummary"};
-  const bool doSumw2 = doMBGapTrigger;
+  bool doSumw2 = false;
 
   // Multiplicity Utilities
   //  struct CentClass {
@@ -334,7 +334,7 @@ struct FullJetSpectra {
     triggerMaskBits = jetderiveddatautilities::initialiseTriggerMaskBits(triggerMasks);
     particleSelection = static_cast<std::string>(particleSelections);
     jetRadiiValues = (std::vector<double>)jetRadii;
-
+    doSumw2 = doMBGapTrigger;
     /*  if (doMcClosure) {
     // randGen.SetSeed(mcSplitSeed);
     // randGen.SetSeed(static_cast<UInt_t>(std::time(nullptr)));
@@ -508,7 +508,7 @@ struct FullJetSpectra {
       registry.add("h2_full_jet_energyscaleChargedVsFullPart", "Jet Energy Scale (charged part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}}, doSumw2);
       registry.add("h2_full_jet_energyscaleNeutralVsFullPart", "Jet Energy Scale (neutral part, vs. full jet pt); p_{T,part} (GeV/c); (p_{T,det} - p_{T,part})/p_{T,part}", {HistType::kTH2F, {{400, 0., 400.}, {200, -1., 1.}}}, doSumw2);
       registry.add("h2_full_fakemcdjets", "Fake MCD Jets; p_{T,det} (GeV/c); NCounts", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 100.}}}, doSumw2);
-      registry.add("h2FullfakeMcpJets", "Fake MCP Jets; p_{T,part} (GeV/c); NCounts", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 100.}}}, doSumw2);
+      registry.add("h2_full_fakemcpjets", "Fake MCP Jets; p_{T,part} (GeV/c); NCounts", {HistType::kTH2F, {{350, 0., 350.}, {100, 0., 100.}}}, doSumw2);
       registry.add("h2_full_matchedmcpjet_pt", "Matched MCP jet in EMC Fiducial Acceptance #it{p}_{T,part};#it{p}_{T,part} (GeV/c); Ncounts", {HistType::kTH2F, {{350, 0., 350.}, {10000, 0., 10000.}}}, doSumw2);
 
       // Response Matrix
@@ -1740,7 +1740,7 @@ struct FullJetSpectra {
         // apply emcal fiducial cuts to the matched particle level jets - if the matched mcp jet lies outside of the EMCAL fiducial, flag it as a fake jet
         if (mcpjet.eta() > jetEtaMax || mcpjet.eta() < jetEtaMin || mcpjet.phi() > jetPhiMax || mcpjet.phi() < jetPhiMin) {
           fakeMcpJet++;
-          registry.fill(HIST("h2FullfakeMcpJets"), mcpjet.pt(), fakeMcpJet, eventWeight);
+          registry.fill(HIST("h2_full_fakemcpjets"), mcpjet.pt(), fakeMcpJet, eventWeight);
           continue;
         } else {
           NPartJetFid++;