Merge branch 'master' of github.com:miedema-11/O2Physics

Author: miedema-11

.github/workflows/clean-test.yml

@@ -24,11 +24,6 @@ name: Clean PR checks
         type: boolean
         default: true
 
-      'check_build/O2Physics/o2/macOS':
-        description: build/O2Physics/o2/macOS
-        type: boolean
-        default: true
-
       'check_build/O2Physics/o2':
         description: build/O2Physics/o2
         type: boolean

ALICE3/Core/ALICE3CoreLinkDef.h

@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;

ALICE3/Core/FastTrackerLinkDef.h

@@ -9,8 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef ALICE3_CORE_FASTTRACKERLINKDEF_H_
-#define ALICE3_CORE_FASTTRACKERLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -19,5 +18,3 @@
 #pragma link C++ class o2::fastsim::GeometryContainer + ;
 #pragma link C++ class o2::fastsim::FastTracker + ;
 #pragma link C++ class o2::fastsim::FlatLutWriter + ;
-
-#endif // ALICE3_CORE_FASTTRACKERLINKDEF_H_

CODEOWNERS

@@ -78,7 +78,7 @@
 /PWGUD @alibuild @amatyja @rolavick
 /PWGJE @alibuild @nzardosh @fjonasALICE @jaimenorman @mhemmer-cern
 /Tools/PIDML @alibuild @saganatt
-/Tools/ML @alibuild @fcatalan92 @fmazzasc
+/Tools/ML @alibuild @fcatalan92 @fmazzasc @ChSonnabend
 /Tutorials/PWGCF @alibuild @jgrosseo @victor-gonzalez @zchochul
 /Tutorials/PWGDQ @alibuild @iarsene @mcoquet642 @XiaozhiBai @mguilbau
 /Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu

Common/Tools/PID/pidTPCModule.h

@@ -49,6 +49,7 @@
 #include <TRandom.h>
 #include <TString.h>
 
+#include <algorithm>
 #include <array>
 #include <chrono>
 #include <cstddef>
@@ -570,11 +571,12 @@ class pidTPCModule
     std::unique_ptr<float[]> networkPrediction(new float[predictionSize * NParticleTypes]); // For each mass hypotheses
 
     const float nNclNormalization = response->GetNClNormalization();
-    float durationNetwork = 0;
+    float durationNetwork = 0.f;
 
     std::vector<float> trackProperties(trackPropSize);
+    std::vector<float> outputNetwork; // output buffer, allocation is reused for all mass hypotheses
     uint64_t counterTrackProps = 0;
-    int loopCounter = 0;
+    uint64_t loopCounter = 0;
 
     // To load the Hadronic rate once for each collision
     std::vector<float> hadronicRateForCollision(collisions.size(), 0.0f);
@@ -626,14 +628,13 @@ class pidTPCModule
       }
 
       const auto startNetworkEval = std::chrono::high_resolution_clock::now();
-      const float* const outputNetwork = network.evalModel(trackProperties);
+      network.evalModel(trackProperties, outputNetwork);
       const auto stopNetworkEval = std::chrono::high_resolution_clock::now();
       durationNetwork += std::chrono::duration<float, std::ratio<1, NanoToOne>>(stopNetworkEval - startNetworkEval).count();
-      for (uint64_t kPrediction = 0; kPrediction < predictionSize; kPrediction += outputDimensions) {
-        for (int lOutputDim = 0; lOutputDim < outputDimensions; ++lOutputDim) {
-          networkPrediction[kPrediction + lOutputDim + predictionSize * loopCounter] = outputNetwork[kPrediction + lOutputDim];
-        }
+      if (outputNetwork.size() != predictionSize) {
+        LOG(fatal) << "Network output size (" << outputNetwork.size() << ") does not match the expected prediction size (" << predictionSize << ")";
       }
+      std::copy(outputNetwork.begin(), outputNetwork.end(), networkPrediction.get() + predictionSize * loopCounter);
 
       counterTrackProps = 0;
       ++loopCounter;

PWGCF/EbyEFluctuations/Tasks/partNumFluc.cxx

@@ -137,3 +137,8 @@ o2physics_add_dpl_workflow(lambda-or-anti-lambda-producer-with-spin
                            SOURCES lambdaOrAntiLambdaProducerWithSpin.cxx
                            PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
                            COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(fox-wolfram-correlation
+                           SOURCES FoxWolframCorrelation.cxx
+                           PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                           COMPONENT_NAME Analysis)