Tutorials: update re-weighting example (bugfix, cleanup) (AliceO2Group#2756)

* Tutorials: update re-weighting example (bugfix, cleanup)

* megalinter fix

* clang-format

* fixup! megalinter fix

Author: aalkin

Tutorials/src/TrainingTree.h

@@ -8,8 +8,8 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#ifndef TRAININGTREE_H
-#define TRAININGTREE_H
+#ifndef TUTORIALS_SRC_TRAININGTREE_H_
+#define TUTORIALS_SRC_TRAININGTREE_H_
 #include "Framework/AnalysisDataModel.h"
 
 /// Definition of output table to store the flat tree for re-weighting model
@@ -37,4 +37,21 @@ DECLARE_SOA_TABLE(TrainingTree, "AOD", "TRTR", o2::soa::Index<>,
                   vars::FMV0);
 } // namespace o2::aod
 
-#endif // TRAININGTREE_H
+namespace o2::analysis
+{
+template <typename Tracks>
+auto meanPt(Tracks const& tracks)
+{
+  auto apt = 0.f;
+  auto npt = 0;
+  for (auto& track : tracks) {
+    if (isfinite(track.pt()) && (std::abs(track.pt()) > 1e-3)) {
+      ++npt;
+      apt += track.pt();
+    }
+  }
+  return apt / static_cast<float>(npt);
+}
+} // namespace o2::analysis
+
+#endif // TUTORIALS_SRC_TRAININGTREE_H_

Tutorials/src/reweighting.cxx

@@ -28,10 +28,11 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
+#include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
 #include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Common/DataModel/Multiplicity.h"
-#include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
+#include "TrainingTree.h"
 
 using namespace o2;
 using namespace o2::framework;
@@ -52,30 +53,14 @@ DECLARE_SOA_TABLE(Weights, "AOD", "WGHTS",
                   weights::Weight);
 } // namespace o2::aod
 
-template <typename Tracks>
-auto meanPt(Tracks const& tracks)
-{
-  auto apt = 0.f;
-  auto npt = 0;
-  auto cm = 0;
-  for (auto& track : tracks) {
-    ++cm;
-    if (isfinite(track.pt()) && (std::abs(track.pt()) > 1e-3)) {
-      ++npt;
-      apt += track.pt();
-    }
-  }
-  return apt;
-}
-
 /// function to extract collision properties for feeding the model
 /// note that this version returns a fixed-size array which is not necessary and
 /// for real-life applications the input array should be created dynamically
 /// according to model input requirements
 template <typename C, typename T>
 std::array<float, 6> collect(C const& collision, T const& tracks)
 {
-  return {collision.posZ(), collision.posX(), collision.posY(), meanPt(tracks), (float)tracks.size(), collision.multFT0M()};
+  return {collision.posZ(), collision.posX(), collision.posY(), analysis::meanPt(tracks), static_cast<float>(tracks.size()), collision.multFT0M()};
 }
 
 /// Task to process collisions and create weighting information by applying the

Tutorials/src/treeCreator.cxx

@@ -39,22 +39,6 @@ using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
 
-template <typename Tracks>
-auto meanPt(Tracks const& tracks)
-{
-  auto apt = 0.f;
-  auto npt = 0;
-  auto cm = 0;
-  for (auto& track : tracks) {
-    ++cm;
-    if (isfinite(track.pt()) && (std::abs(track.pt()) > 1e-3)) {
-      ++npt;
-      apt += track.pt();
-    }
-  }
-  return apt;
-}
-
 struct CreateTree {
   Configurable<float> centralEtaCut{"centralEtaCut", 0.8, "central eta limit"};
 
@@ -63,14 +47,14 @@ struct CreateTree {
 
   void processRun2(soa::Join<aod::Collisions, aod::Mults>::iterator const& collision, soa::Filtered<aod::Tracks> const& tracks)
   {
-    tt(collision.posZ(), collision.posX(), collision.posY(), meanPt(tracks), tracks.size(), collision.multFT0M(), collision.multFV0M());
+    tt(collision.posZ(), collision.posX(), collision.posY(), analysis::meanPt(tracks), tracks.size(), collision.multFT0M(), collision.multFV0M());
   }
 
   PROCESS_SWITCH(CreateTree, processRun2, "Use Run 2 parameters", false);
 
   void processRun3(soa::Join<aod::Collisions, aod::Mults>::iterator const& collision, soa::Filtered<aod::Tracks> const& tracks)
   {
-    tt(collision.posZ(), collision.posX(), collision.posY(), meanPt(tracks), tracks.size(), collision.multFT0M(), collision.multFV0A());
+    tt(collision.posZ(), collision.posX(), collision.posY(), analysis::meanPt(tracks), tracks.size(), collision.multFT0M(), collision.multFV0A());
   }
 
   PROCESS_SWITCH(CreateTree, processRun3, "Use Run 3 parameters", true);