[PWGEM/Dilepton] fix calculation of ITSob cluster size in ML

Author: dsekihat

PWGEM/Dilepton/TableProducer/prefilterDielectron.cxx

@@ -23,7 +23,6 @@
 #include "Common/DataModel/EventSelection.h"
 
 #include <CCDB/BasicCCDBManager.h>
-#include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DataFormatsParameters/GRPObject.h>
@@ -175,10 +174,9 @@ struct prefilterDielectron {
     // Configurable<bool> enableOptimizations{"enableOptimizations", false, "Enables the ONNX extended model-optimization: sessionOptions.SetGraphOptimizationLevel(GraphOptimizationLevel::ORT_ENABLE_EXTENDED)"};
   } dielectroncuts;
 
-  o2::ccdb::CcdbApi ccdbApi;
   Service<o2::ccdb::BasicCCDBManager> ccdb;
-  int mRunNumber;
-  float d_bz;
+  int mRunNumber{0};
+  float d_bz{0};
   o2::base::Propagator::MatCorrType matCorr = o2::base::Propagator::MatCorrType::USEMatCorrNONE;
 
   HistogramRegistry fRegistry{"output", {}, OutputObjHandlingPolicy::AnalysisObject, false, false};

PWGEM/Dilepton/Utils/MlResponseO2Track.h

@@ -58,10 +58,10 @@
     int nsize = 0;                                                       \
     int ncls = 0;                                                        \
     for (int il = v1; il < v2; il++) {                                   \
-      nsize += track.itsClsSizeInLayer(il);                              \
-      if (nsize > 0) {                                                   \
+      if (track.itsClsSizeInLayer(il) > 0) {                             \
         ncls++;                                                          \
       }                                                                  \
+      nsize += track.itsClsSizeInLayer(il);                              \
     }                                                                    \
     inputFeature = static_cast<float>(nsize) / static_cast<float>(ncls); \
     break;                                                               \
@@ -73,10 +73,10 @@
     int nsize = 0;                                                                                                   \
     int ncls = 0;                                                                                                    \
     for (int il = v1; il < v2; il++) {                                                                               \
-      nsize += track.itsClsSizeInLayer(il);                                                                          \
-      if (nsize > 0) {                                                                                               \
+      if (track.itsClsSizeInLayer(il) > 0) {                                                                         \
         ncls++;                                                                                                      \
       }                                                                                                              \
+      nsize += track.itsClsSizeInLayer(il);                                                                          \
     }                                                                                                                \
     inputFeature = static_cast<float>(nsize) / static_cast<float>(ncls) * std::cos(std::atan(trackParCov.getTgl())); \
     break;                                                                                                           \
@@ -107,16 +107,6 @@
     break;                                                    \
   }
 
-// Check if the index of mCachedIndices (index associated to a FEATURE)
-// matches the entry in EnumInputFeatures associated to this FEATURE
-// if so, the inputFeatures vector is filled with the FEATURE's value
-// by calling the corresponding GETTER1 from track and multiplying with cos(atan(GETTER2))
-#define CHECK_AND_FILL_O2_TRACK_COS(FEATURE, GETTER1, GETTER2)             \
-  case static_cast<uint8_t>(InputFeaturesO2Track::FEATURE): {              \
-    inputFeature = track.GETTER1() * std::cos(std::atan(track.GETTER2())); \
-    break;                                                                 \
-  }
-
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
 // if so, the inputFeatures vector is filled with the FEATURE's value
@@ -343,7 +333,6 @@ class MlResponseO2Track : public MlResponse<TypeOutputScore>
 #undef CHECK_AND_FILL_O2_TRACK_MEAN_ITSCLUSTER_SIZE
 #undef CHECK_AND_FILL_O2_TRACK_MEAN_ITSCLUSTER_SIZE_COS
 #undef CHECK_AND_FILL_O2_TRACK_SQRT
-#undef CHECK_AND_FILL_O2_TRACK_COS
 #undef CHECK_AND_FILL_O2_TRACK_TPCTOF
 #undef CHECK_AND_FILL_O2_TRACK_RELDIFF
 #undef CHECK_AND_FILL_DIELECTRON_COLLISION