Merge remote-tracking branch 'origin/charm-hadronisation2' into charm-hadronisation2

Author: christianreckziegel

PWGJE/Tasks/hfFragmentationFunction.cxx

@@ -17,6 +17,7 @@
 /// The task store data relevant to the calculation of hadronization observables radial
 /// profile and/or jet momentum fraction for charmed hadrons
 
+#include "PWGHF/Core/DecayChannels.h"
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
 #include "PWGJE/Core/JetUtilities.h"
 #include "PWGJE/DataModel/Jet.h"
@@ -62,7 +63,7 @@ double deltaPhi(double phi1, double phi2)
   return std::abs(dphi);
 }
 
-// 
+//
 /// Collision counter selection indexes
 ///
 /// The collision selection is done and stored in multiple steps, for later QA analysis.
@@ -516,23 +517,23 @@ struct HfFragmentationFunction {
             // store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
             matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(), // particle level jet
                           mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt),                                                                              // particle level HF
-                          std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions,                                                                                                          // MC collision selections
+                          std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions, // MC collision selections
                           jetutilities::deltaR(mcdjet, mcdcand), mcdjet.pt(), mcdjet.eta(), mcdjet.phi(), mcdjet.template tracks_as<aod::JetTracks>().size() + mcdjet.template candidates_as<TCandidatesMCD>().size(),    // detector level jet
                           mcdcand.pt(), mcdcand.eta(), mcdcand.phi(), mcdcand.m(), mcdcand.y(), (mcdcand.originMcRec() == RecoDecay::OriginType::Prompt),                                                                 // detector level HF
                           mcdcand.mlScores()[0], mcdcand.mlScores()[1], mcdcand.mlScores()[2],                                                                                                                            // Machine Learning PID scores: background, prompt, non-prompt
                           static_cast<int>(mcdcand.flagMcMatchRec()), selectedAs,                                                                                                                                         // HF = +1, HFbar = -1, neither = 0
-                          std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits));                                                                                                                                                      // Reconstructed collision selections
+                          std::abs(collision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(collision, eventSelectionBits));                                                                              // Reconstructed collision selections
           }
         } else {
           // store matched particle and detector level data in one single table (calculate angular distance in eta-phi plane on the fly)
           matchJetTable(jetutilities::deltaR(mcpjet, mcpcand), mcpjet.pt(), mcpjet.eta(), mcpjet.phi(), mcpjet.template tracks_as<aod::JetParticles>().size() + mcpjet.template candidates_as<TCandidatesMCP>().size(),   // particle level jet
                         mcpcand.pt(), mcpcand.eta(), mcpcand.phi(), mcpcand.y(), (mcpcand.originMcGen() == RecoDecay::OriginType::Prompt),                                                                                // particle level HF
-                        std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions,                                                                                                            // MC collision selections
+                        std::abs(mccollision.posZ()) < vertexZCut, jetderiveddatautilities::selectCollision(mccollision, eventSelectionBits), static_cast<int>(collisionsPerMCCollision.size()), numSelectedCollisions,   // MC collision selections
                         -2, -2, -2, -2, -2,                                                                                                                                                                               // no detector-level jet found
                         -2, -2, -2, -2, -2, false,                                                                                                                                                                        // no detector-level jet found
                         -2, -2, -2,                                                                                                                                                                                       // no detector-level jet found
                         -2, -2,                                                                                                                                                                                           // no detector-level jet found
-                        false, false);                                                                                                                                                                                      // no detector-level jet found
+                        false, false);                                                                                                                                                                                    // no detector-level jet found
         }
       } // end of mcpjets loop