[PWGJE] Adding event weight to THnSparse (#10154)

Author: hahassan7

PWGJE/Core/JetTaggingUtilities.h

@@ -63,50 +63,50 @@ namespace jettaggingutilities
 const int cmTomum = 10000; // using cm -> #mum for impact parameter (dca)
 
 struct BJetParams {
-  float JetpT = 0.0;
-  float JetEta = 0.0;
-  float JetPhi = 0.0;
-  int NTracks = -1;
-  int NSV = -1;
-  float JetMass = 0.0;
+  float jetpT = 0.0;
+  float jetEta = 0.0;
+  float jetPhi = 0.0;
+  int nTracks = -1;
+  int nSV = -1;
+  float jetMass = 0.0;
 };
 
 struct BJetTrackParams {
-  double TrackpT = 0.0;
-  double TrackEta = 0.0;
-  double DotProdTrackJet = 0.0;
-  double DotProdTrackJetOverJet = 0.0;
-  double DeltaRJetTrack = 0.0;
-  double SignedIP2D = 0.0;
-  double SignedIP2DSign = 0.0;
-  double SignedIP3D = 0.0;
-  double SignedIP3DSign = 0.0;
-  double MomFraction = 0.0;
-  double DeltaRTrackVertex = 0.0;
-  double TrackPhi = 0.0;
-  double TrackCharge = 0.0;
-  double TrackITSChi2NCl = 0.0;
-  double TrackTPCChi2NCl = 0.0;
-  double TrackITSNCls = 0.0;
-  double TrackTPCNCls = 0.0;
-  double TrackTPCNCrossedRows = 0.0;
-  int TrackOrigin = -1;
-  int TrackVtxIndex = -1;
+  double trackpT = 0.0;
+  double trackEta = 0.0;
+  double dotProdTrackJet = 0.0;
+  double dotProdTrackJetOverJet = 0.0;
+  double deltaRJetTrack = 0.0;
+  double signedIP2D = 0.0;
+  double signedIP2DSign = 0.0;
+  double signedIP3D = 0.0;
+  double signedIP3DSign = 0.0;
+  double momFraction = 0.0;
+  double deltaRTrackVertex = 0.0;
+  double trackPhi = 0.0;
+  double trackCharge = 0.0;
+  double trackITSChi2NCl = 0.0;
+  double trackTPCChi2NCl = 0.0;
+  double trackITSNCls = 0.0;
+  double trackTPCNCls = 0.0;
+  double trackTPCNCrossedRows = 0.0;
+  int trackOrigin = -1;
+  int trackVtxIndex = -1;
 };
 
 struct BJetSVParams {
-  double SVpT = 0.0;
-  double DeltaRSVJet = 0.0;
-  double SVMass = 0.0;
-  double SVfE = 0.0;
-  double IPxy = 0.0;
-  double CPA = 0.0;
-  double Chi2PCA = 0.0;
-  double Dispersion = 0.0;
-  double DecayLength2D = 0.0;
-  double DecayLength2DError = 0.0;
-  double DecayLength3D = 0.0;
-  double DecayLength3DError = 0.0;
+  double svpT = 0.0;
+  double deltaRSVJet = 0.0;
+  double svMass = 0.0;
+  double svfE = 0.0;
+  double svIPxy = 0.0;
+  double svCPA = 0.0;
+  double svChi2PCA = 0.0;
+  double dispersion = 0.0;
+  double decayLength2D = 0.0;
+  double decayLength2DError = 0.0;
+  double decayLength3D = 0.0;
+  double decayLength3DError = 0.0;
 };
 
 //________________________________________________________________________
@@ -1015,7 +1015,7 @@ void analyzeJetTrackInfo4ML(AnalysisJet const& analysisJet, AnyTracks const& /*a
   }
 
   auto compare = [](BJetTrackParams& tr1, BJetTrackParams& tr2) {
-    return (tr1.SignedIP2D / tr1.SignedIP2DSign) > (tr2.SignedIP2D / tr2.SignedIP2DSign);
+    return (tr1.signedIP2D / tr1.signedIP2DSign) > (tr2.signedIP2D / tr2.signedIP2DSign);
   };
 
   // Sort the tracks based on their IP significance in descending order
@@ -1040,7 +1040,7 @@ void analyzeJetTrackInfo4MLnoSV(AnalysisJet const& analysisJet, AnyTracks const&
   }
 
   auto compare = [](BJetTrackParams& tr1, BJetTrackParams& tr2) {
-    return (tr1.SignedIP2D / tr1.SignedIP2DSign) > (tr2.SignedIP2D / tr2.SignedIP2DSign);
+    return (tr1.signedIP2D / tr1.signedIP2DSign) > (tr2.signedIP2D / tr2.signedIP2DSign);
   };
 
   // Sort the tracks based on their IP significance in descending order

PWGJE/Core/MlResponseHfTagging.h

@@ -58,44 +58,44 @@
 namespace o2::analysis
 {
 enum class InputFeaturesBTag : uint8_t {
-  JetpT = 0,
-  JetEta,
-  JetPhi,
-  NTracks,
-  NSV,
-  JetMass,
-  TrackpT,
-  TrackEta,
-  DotProdTrackJet,
-  DotProdTrackJetOverJet,
-  DeltaRJetTrack,
-  SignedIP2D,
-  SignedIP2DSign,
-  SignedIP3D,
-  SignedIP3DSign,
-  MomFraction,
-  DeltaRTrackVertex,
-  TrackPhi,
-  TrackCharge,
-  TrackITSChi2NCl,
-  TrackTPCChi2NCl,
-  TrackITSNCls,
-  TrackTPCNCls,
-  TrackTPCNCrossedRows,
-  TrackOrigin,
-  TrackVtxIndex,
-  SVpT,
-  DeltaRSVJet,
-  SVMass,
-  SVfE,
-  IPxy,
-  CPA,
-  Chi2PCA,
-  Dispersion,
-  DecayLength2D,
-  DecayLength2DError,
-  DecayLength3D,
-  DecayLength3DError,
+  jetpT = 0,
+  jetEta,
+  jetPhi,
+  nTracks,
+  nSV,
+  jetMass,
+  trackpT,
+  trackEta,
+  dotProdTrackJet,
+  dotProdTrackJetOverJet,
+  deltaRJetTrack,
+  signedIP2D,
+  signedIP2DSign,
+  signedIP3D,
+  signedIP3DSign,
+  momFraction,
+  deltaRTrackVertex,
+  trackPhi,
+  trackCharge,
+  trackITSChi2NCl,
+  trackTPCChi2NCl,
+  trackITSNCls,
+  trackTPCNCls,
+  trackTPCNCrossedRows,
+  trackOrigin,
+  trackVtxIndex,
+  svpT,
+  deltaRSVJet,
+  svMass,
+  svfE,
+  svIPxy,
+  svCPA,
+  svChi2PCA,
+  dispersion,
+  decayLength2D,
+  decayLength2DError,
+  decayLength3D,
+  decayLength3DError,
 };
 
 template <typename TypeOutputScore = float>
@@ -125,12 +125,12 @@ class MlResponseHfTagging : public MlResponse<TypeOutputScore>
     // Jet features
     for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
       switch (idx) {
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, JetpT)
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, JetEta)
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, JetPhi)
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, NTracks)
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, NSV)
-        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, JetMass)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, jetpT)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, jetEta)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, jetPhi)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, nTracks)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, nSV)
+        CHECK_AND_FILL_VEC_BTAG(jetInput, jet, jetMass)
 
         default:
           break;
@@ -141,26 +141,26 @@ class MlResponseHfTagging : public MlResponse<TypeOutputScore>
     for (const auto& track : tracks) {
       for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
         switch (idx) {
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackpT)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackEta)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, DotProdTrackJet)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, DotProdTrackJetOverJet)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, DeltaRJetTrack)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, SignedIP2D)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, SignedIP2DSign)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, SignedIP3D)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, SignedIP3DSign)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, MomFraction)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, DeltaRTrackVertex)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackPhi)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackCharge)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackITSChi2NCl)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackTPCChi2NCl)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackITSNCls)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackTPCNCls)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackTPCNCrossedRows)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackOrigin)
-          CHECK_AND_FILL_VEC_BTAG(trackInput, track, TrackVtxIndex)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackpT)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackEta)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, dotProdTrackJet)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, dotProdTrackJetOverJet)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, deltaRJetTrack)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, signedIP2D)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, signedIP2DSign)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, signedIP3D)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, signedIP3DSign)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, momFraction)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, deltaRTrackVertex)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackPhi)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackCharge)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackITSChi2NCl)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackTPCChi2NCl)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackITSNCls)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackTPCNCls)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackTPCNCrossedRows)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackOrigin)
+          CHECK_AND_FILL_VEC_BTAG(trackInput, track, trackVtxIndex)
 
           default:
             break;
@@ -172,18 +172,18 @@ class MlResponseHfTagging : public MlResponse<TypeOutputScore>
     for (const auto& sv : svs) {
       for (const auto& idx : MlResponse<TypeOutputScore>::mCachedIndices) {
         switch (idx) {
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, SVpT)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, DeltaRSVJet)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, SVMass)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, SVfE)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, IPxy)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, CPA)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, Chi2PCA)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, Dispersion)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, DecayLength2D)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, DecayLength2DError)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, DecayLength3D)
-          CHECK_AND_FILL_VEC_BTAG(svInput, sv, DecayLength3DError)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svpT)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, deltaRSVJet)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svMass)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svfE)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svIPxy)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svCPA)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, svChi2PCA)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, dispersion)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, decayLength2D)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, decayLength2DError)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, decayLength3D)
+          CHECK_AND_FILL_VEC_BTAG(svInput, sv, decayLength3DError)
 
           default:
             break;
@@ -246,48 +246,48 @@ class MlResponseHfTagging : public MlResponse<TypeOutputScore>
   {
     MlResponse<TypeOutputScore>::mAvailableInputFeatures = {
       // Jet features
-      FILL_MAP_BJET(JetpT),
-      FILL_MAP_BJET(JetEta),
-      FILL_MAP_BJET(JetPhi),
-      FILL_MAP_BJET(NTracks),
-      FILL_MAP_BJET(NSV),
-      FILL_MAP_BJET(JetMass),
+      FILL_MAP_BJET(jetpT),
+      FILL_MAP_BJET(jetEta),
+      FILL_MAP_BJET(jetPhi),
+      FILL_MAP_BJET(nTracks),
+      FILL_MAP_BJET(nSV),
+      FILL_MAP_BJET(jetMass),
 
       // Track features
-      FILL_MAP_BJET(TrackpT),
-      FILL_MAP_BJET(TrackEta),
-      FILL_MAP_BJET(DotProdTrackJet),
-      FILL_MAP_BJET(DotProdTrackJetOverJet),
-      FILL_MAP_BJET(DeltaRJetTrack),
-      FILL_MAP_BJET(SignedIP2D),
-      FILL_MAP_BJET(SignedIP2DSign),
-      FILL_MAP_BJET(SignedIP3D),
-      FILL_MAP_BJET(SignedIP3DSign),
-      FILL_MAP_BJET(MomFraction),
-      FILL_MAP_BJET(DeltaRTrackVertex),
-      FILL_MAP_BJET(TrackPhi),
-      FILL_MAP_BJET(TrackCharge),
-      FILL_MAP_BJET(TrackITSChi2NCl),
-      FILL_MAP_BJET(TrackTPCChi2NCl),
-      FILL_MAP_BJET(TrackITSNCls),
-      FILL_MAP_BJET(TrackTPCNCls),
-      FILL_MAP_BJET(TrackTPCNCrossedRows),
-      FILL_MAP_BJET(TrackOrigin),
-      FILL_MAP_BJET(TrackVtxIndex),
+      FILL_MAP_BJET(trackpT),
+      FILL_MAP_BJET(trackEta),
+      FILL_MAP_BJET(dotProdTrackJet),
+      FILL_MAP_BJET(dotProdTrackJetOverJet),
+      FILL_MAP_BJET(deltaRJetTrack),
+      FILL_MAP_BJET(signedIP2D),
+      FILL_MAP_BJET(signedIP2DSign),
+      FILL_MAP_BJET(signedIP3D),
+      FILL_MAP_BJET(signedIP3DSign),
+      FILL_MAP_BJET(momFraction),
+      FILL_MAP_BJET(deltaRTrackVertex),
+      FILL_MAP_BJET(trackPhi),
+      FILL_MAP_BJET(trackCharge),
+      FILL_MAP_BJET(trackITSChi2NCl),
+      FILL_MAP_BJET(trackTPCChi2NCl),
+      FILL_MAP_BJET(trackITSNCls),
+      FILL_MAP_BJET(trackTPCNCls),
+      FILL_MAP_BJET(trackTPCNCrossedRows),
+      FILL_MAP_BJET(trackOrigin),
+      FILL_MAP_BJET(trackVtxIndex),
 
       // Secondary vertex features
-      FILL_MAP_BJET(SVpT),
-      FILL_MAP_BJET(DeltaRSVJet),
-      FILL_MAP_BJET(SVMass),
-      FILL_MAP_BJET(SVfE),
-      FILL_MAP_BJET(IPxy),
-      FILL_MAP_BJET(CPA),
-      FILL_MAP_BJET(Chi2PCA),
-      FILL_MAP_BJET(Dispersion),
-      FILL_MAP_BJET(DecayLength2D),
-      FILL_MAP_BJET(DecayLength2DError),
-      FILL_MAP_BJET(DecayLength3D),
-      FILL_MAP_BJET(DecayLength3DError)};
+      FILL_MAP_BJET(svpT),
+      FILL_MAP_BJET(deltaRSVJet),
+      FILL_MAP_BJET(svMass),
+      FILL_MAP_BJET(svfE),
+      FILL_MAP_BJET(svIPxy),
+      FILL_MAP_BJET(svCPA),
+      FILL_MAP_BJET(svChi2PCA),
+      FILL_MAP_BJET(dispersion),
+      FILL_MAP_BJET(decayLength2D),
+      FILL_MAP_BJET(decayLength2DError),
+      FILL_MAP_BJET(decayLength3D),
+      FILL_MAP_BJET(decayLength3DError)};
   }
 };