Merge branch 'master' into OptimisationTree

Author: fgrosa

ALICE3/Tasks/CMakeLists.txt

@@ -21,7 +21,7 @@ o2physics_add_dpl_workflow(alice3-qa-singleparticle
 
 o2physics_add_dpl_workflow(alice3-lutmaker
                     SOURCES alice3-lutmaker.cxx
-                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2::Framework FairRoot::Base O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(alice3-pid-rich-qa

ALICE3/Tools/handleParamTOFResoALICE3.cxx

@@ -18,7 +18,7 @@
 
 #include "CCDB/CcdbApi.h"
 #include <boost/program_options.hpp>
-#include <FairLogger.h>
+#include "Framework/Logger.h"
 #include "TFile.h"
 #include "ALICE3/Core/TOFResoALICE3.h"
 

Common/Core/CMakeLists.txt

@@ -14,7 +14,7 @@ o2physics_add_library(AnalysisCore
                        OrbitRange.cxx
                        PID/ParamBase.cxx
                        TrackSelectionDefaults.cxx
-               PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore)
+               PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore ROOT::EG O2::CCDB ROOT::Physics)
 
 o2physics_target_root_dictionary(AnalysisCore
               HEADERS   TrackSelection.h
@@ -30,4 +30,4 @@ o2physics_target_root_dictionary(AnalysisCore
 o2physics_add_executable(merger
               COMPONENT_NAME aod
               SOURCES aodMerger.cxx
-              PUBLIC_LINK_LIBRARIES ROOT::Hist ROOT::Core ROOT::Net)
+              PUBLIC_LINK_LIBRARIES ROOT::Hist ROOT::Core ROOT::Net)

Common/TableProducer/multiplicityTable.cxx

@@ -13,12 +13,6 @@
 using namespace o2;
 using namespace o2::framework;
 
-// custom configurable for switching between run2 and run3 selection types
-void customize(std::vector<ConfigParamSpec>& workflowOptions)
-{
-  workflowOptions.push_back(ConfigParamSpec{"selection-run", VariantType::Int, 2, {"selection type: 2 - run 2, 3 - run 3"}});
-}
-
 #include "Framework/runDataProcessing.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
@@ -41,7 +35,6 @@ struct MultiplicityTableTaskIndexed {
 
   //Configurable
   Configurable<int> doVertexZeq{"doVertexZeq", 1, "if 1: do vertex Z eq mult table"};
-  Configurable<int> doDummyZeq{"doDummyZeq", 0, "if 1: do dummy Z vertex Eq (will make non-eq equal to eq)"};
 
   int mRunNumber;
   bool lCalibLoaded;
@@ -154,7 +147,7 @@ struct MultiplicityTableTaskIndexed {
 
     /* check the previous run number */
     auto bc = collision.bc_as<soa::Join<aod::BCs, aod::Timestamps>>();
-    if (doVertexZeq > 0 && doDummyZeq < 1) {
+    if (doVertexZeq > 0) {
       if (bc.runNumber() != mRunNumber) {
         mRunNumber = bc.runNumber(); //mark this run as at least tried
         lCalibObjects = ccdb->getForTimeStamp<TList>("Centrality/Calibration", bc.timestamp());
@@ -168,9 +161,12 @@ struct MultiplicityTableTaskIndexed {
           lCalibLoaded = true;
           //Capture error
           if (!hVtxZFV0A || !hVtxZFT0A || !hVtxZFT0C || !hVtxZFDDA || !hVtxZFDDC || !hVtxZNTracks) {
-            LOGF(info, "Problem loading CCDB objects! Please check");
+            LOGF(error, "Problem loading CCDB objects! Please check");
             lCalibLoaded = false;
           }
+        } else {
+          LOGF(error, "Problem loading CCDB object! Please check");
+          lCalibLoaded = false;
         }
       }
     }
@@ -209,14 +205,6 @@ struct MultiplicityTableTaskIndexed {
       multZeqFDDC = hVtxZFDDC->Interpolate(0.0) * multFDDC / hVtxZFDDC->Interpolate(collision.posZ());
       multZeqNContribs = hVtxZNTracks->Interpolate(0.0) * multNContribs / hVtxZNTracks->Interpolate(collision.posZ());
     }
-    if (doDummyZeq) {
-      multZeqFV0A = multFV0A;
-      multZeqFT0A = multFT0A;
-      multZeqFT0C = multFT0C;
-      multZeqFDDA = multFDDA;
-      multZeqFDDC = multFDDC;
-      multZeqNContribs = multNContribs;
-    }
 
     LOGF(debug, "multFV0A=%5.0f multFV0C=%5.0f multFT0A=%5.0f multFT0C=%5.0f multFDDA=%5.0f multFDDC=%5.0f multZNA=%6.0f multZNC=%6.0f multTracklets=%i multTPC=%i", multFV0A, multFV0C, multFT0A, multFT0C, multFDDA, multFDDC, multZNA, multZNC, multTracklets, multTPC);
     mult(multFV0A, multFV0C, multFT0A, multFT0C, multFDDA, multFDDC, multZNA, multZNC, multTracklets, multTPC, multNContribs, multNContribsEta1);

Common/Tools/handleParamBase.h

@@ -18,7 +18,7 @@
 
 #include "CCDB/CcdbApi.h"
 #include <boost/program_options.hpp>
-#include <FairLogger.h>
+#include "Framework/Logger.h"
 #include "TFile.h"
 
 // Global executable arguments

DPG/Tasks/AOTTrack/qaK0sTrackingEfficiency.cxx

@@ -34,7 +34,7 @@ struct qaK0sTrackingEfficiency {
 
   void init(InitContext const&)
   {
-    const AxisSpec RAxis{100, 0.f, 10.f, "#it{R} (cm)"};
+    const AxisSpec RAxis{500, 0.f, 50.f, "#it{R} (cm)"};
     const AxisSpec pTAxis{200, 0.f, 10.f, "#it{p}_{T} (GeV/#it{c})"};
     const AxisSpec mAxis{200, 0.4f, 0.6f, "#it{m} (GeV/#it{c}^{2})"};
     const AxisSpec statusAxis{2, -0.5f, 1.5f, ""};

EventFiltering/PWGCF/CFFilter.cxx

@@ -147,14 +147,14 @@ struct CFFilter {
     registry.add("fZvtxBefore", "Zvtx of all processed events", HistType::kTH1F, {{1000, -15, 15}});
     registry.add("fZvtxAfter", "Zvtx of events which passed ppp trigger", HistType::kTH1F, {{1000, -15, 15}});
 
+    registry.add("fPtBeforePPP", "Transverse momentum of all processed tracks", HistType::kTH1F, {{1000, 0, 10}});
+    registry.add("fPtAfterPPP", "Transverse momentum  of processed tracks which passed  selections", HistType::kTH1F, {{1000, 0, 10}});
+    registry.add("fPtBeforeAntiPPP", "Transverse momentum of all processed antitracks", HistType::kTH1F, {{1000, 0, 10}});
+    registry.add("fPtAfterAntiPPP", "Transverse momentum  of processed antitracks passed selection", HistType::kTH1F, {{1000, 0, 10}});
+
     if (Q3Trigger == 0 || Q3Trigger == 11 || Q3Trigger == 1111) {
       registry.add("fSameEventPartPPP", "CF - same event ppp distribution for particles;;events", HistType::kTH1F, {{8000, 0, 8}});
       registry.add("fSameEventAntiPartPPP", "CF - same event ppp distribution for antiparticles;;events", HistType::kTH1F, {{8000, 0, 8}});
-
-      registry.add("fPtBeforePPP", "Transverse momentum of all processed tracks", HistType::kTH1F, {{1000, 0, 10}});
-      registry.add("fPtAfterPPP", "Transverse momentum  of processed tracks which passed  selections", HistType::kTH1F, {{1000, 0, 10}});
-      registry.add("fPtBeforeAntiPPP", "Transverse momentum of all processed antitracks", HistType::kTH1F, {{1000, 0, 10}});
-      registry.add("fPtAfterAntiPPP", "Transverse momentum  of processed antitracks passed selection", HistType::kTH1F, {{1000, 0, 10}});
     }
     if (Q3Trigger == 1 || Q3Trigger == 11 || Q3Trigger == 1111) {
       registry.add("fSameEventPartPPL", "CF - same event ppL distribution for particles;;events", HistType::kTH1F, {{8000, 0, 8}});

EventFiltering/PWGHF/HFFilter.cxx

@@ -38,6 +38,10 @@
 // ML application
 #include <onnxruntime/core/session/experimental_onnxruntime_cxx_api.h>
 
+//CCDB
+#include <CCDB/BasicCCDBManager.h>
+#include "CCDB/CcdbApi.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -366,7 +370,7 @@ struct HfFilter { // Main struct for HF triggers
   Configurable<bool> applyML{"applyML", false, "Flag to enable or disable ML application"};
   Configurable<std::vector<double>> pTBinsBDT{"pTBinsBDT", std::vector<double>{hf_cuts_bdt_multiclass::pTBinsVec}, "track pT bin limits for BDT cut"};
 
-  Configurable<std::string> onnxFileD0ToKPiConf{"onnxFileD0ToKPiConf", "/cvmfs/alice.cern.ch/data/analysis/2022/vAN-20220124/PWGHF/o2/trigger/XGBoostModel.onnx", "ONNX file for ML model for D0 candidates"};
+  Configurable<std::string> onnxFileD0ToKPiConf{"onnxFileD0ToKPiConf", "XGBoostModel.onnx", "ONNX file for ML model for D0 candidates"};
   Configurable<LabeledArray<double>> thresholdBDTScoreD0ToKPi{"thresholdBDTScoreD0ToKPi", {hf_cuts_bdt_multiclass::cutsBDT[0], hf_cuts_bdt_multiclass::npTBins, hf_cuts_bdt_multiclass::nCutBDTScores, hf_cuts_bdt_multiclass::pTBinLabels, hf_cuts_bdt_multiclass::cutBDTLabels}, "Threshold values for BDT output scores of D0 candidates"};
 
   Configurable<std::string> onnxFileDPlusToPiKPiConf{"onnxFileDPlusToPiKPiConf", "", "ONNX file for ML model for D+ candidates"};
@@ -383,6 +387,12 @@ struct HfFilter { // Main struct for HF triggers
 
   // parameter for Optimisation Tree
   Configurable<bool> applyOptimisation{"applyOptimisation", false, "Flag to enable or disable optimisation"};
+  //CCDB configuration
+  o2::ccdb::CcdbApi ccdbApi;
+  Service<o2::ccdb::BasicCCDBManager> ccdb;
+  Configurable<std::string> url{"ccdb-url", "http://alice-ccdb.cern.ch", "url of the ccdb repository"};
+  Configurable<std::string> mlModelPathCCDB{"mlModelPathCCDB", "Analysis/PWGHF/ML/HFTrigger/", "Path on CCDB"};
+  Configurable<long> ccdbTimestamp{"ccdb-timestamp", 0, "timestamp of the ONNX file for ML model used to query in CCDB. Exceptions: > 0 for the specific timestamp, 0 gets the run dependent timestamp"};
 
   // array of ONNX config and BDT thresholds
   std::array<std::string, kNCharmParticles> onnxFiles;
@@ -449,46 +459,64 @@ struct HfFilter { // Main struct for HF triggers
       hProtonTOFPID = registry.add<TH2>("fProtonTOFPID", "#it{N}_{#sigma}^{TOF} vs. #it{p} for selected protons;#it{p} (GeV/#it{c});#it{N}_{#sigma}^{TOF}", HistType::kTH2F, {{100, 0., 10.}, {200, -10., 10.}});
     }
 
+    ccdb->setURL(url.value);
+    ccdb->setCaching(true);
+    ccdb->setLocalObjectValidityChecking();
+    ccdb->setCreatedNotAfter(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count());
+    ccdbApi.init(url);
+
+    thresholdBDTScores = {
+      thresholdBDTScoreD0ToKPi,
+      thresholdBDFScoreDPlusToPiKPi,
+      thresholdBDFScoreDSToPiKK,
+      thresholdBDFScoreLcToPiKP,
+      thresholdBDFScoreXicToPiKP};
+
+    onnxFiles = {
+      onnxFileD0ToKPiConf,
+      onnxFileDPlusToPiKPiConf,
+      onnxFileDSToPiKKConf,
+      onnxFileLcToPiKPConf,
+      onnxFileXicToPiKPConf};
+
     // init ONNX runtime session
-    if (applyML) {
-      thresholdBDTScores = {
-        thresholdBDTScoreD0ToKPi,
-        thresholdBDFScoreDPlusToPiKPi,
-        thresholdBDFScoreDSToPiKK,
-        thresholdBDFScoreLcToPiKP,
-        thresholdBDFScoreXicToPiKP};
-
-      onnxFiles = {
-        onnxFileD0ToKPiConf,
-        onnxFileDPlusToPiKPiConf,
-        onnxFileDSToPiKKConf,
-        onnxFileLcToPiKPConf,
-        onnxFileXicToPiKPConf};
+    if (applyML && ccdbTimestamp != 0) {
 
+      /// specific timestamp for models
+      LOG(info) << "specific timestamp for models: " << ccdbTimestamp.value;
       for (auto iCharmPart{0}; iCharmPart < kNCharmParticles; ++iCharmPart) {
         if (onnxFiles[iCharmPart] != "") {
           if (singleThreadInference) {
             sessionOptions[iCharmPart].SetIntraOpNumThreads(1);
             sessionOptions[iCharmPart].SetInterOpNumThreads(1);
           }
-          sessionML[iCharmPart].reset(new Ort::Experimental::Session{env[iCharmPart], onnxFiles[iCharmPart], sessionOptions[iCharmPart]});
-          inputNamesML[iCharmPart] = sessionML[iCharmPart]->GetInputNames();
-          inputShapesML[iCharmPart] = sessionML[iCharmPart]->GetInputShapes();
-          if (inputShapesML[iCharmPart][0][0] < 0) {
-            LOGF(warning, Form("Model for %s with negative input shape likely because converted with ummingbird, setting it to 1.", charmParticleNames[iCharmPart].data()));
-            inputShapesML[iCharmPart][0][0] = 1;
+          std::map<std::string, std::string> metadata;
+          std::string tmp = mlModelPathCCDB.value + charmParticleNames[iCharmPart];
+          bool retrieve_success = true;
+          if (onnxFiles[iCharmPart].find("cvmfs") == std::string::npos) {
+            retrieve_success = ccdbApi.retrieveBlob(tmp, ".", metadata, ccdbTimestamp.value, false, onnxFiles[iCharmPart]);
           }
-          outputNamesML[iCharmPart] = sessionML[iCharmPart]->GetOutputNames();
-          outputShapesML[iCharmPart] = sessionML[iCharmPart]->GetOutputShapes();
+          if (retrieve_success) {
+            sessionML[iCharmPart].reset(new Ort::Experimental::Session{env[iCharmPart], onnxFiles[iCharmPart], sessionOptions[iCharmPart]});
+            inputNamesML[iCharmPart] = sessionML[iCharmPart]->GetInputNames();
+            inputShapesML[iCharmPart] = sessionML[iCharmPart]->GetInputShapes();
+            if (inputShapesML[iCharmPart][0][0] < 0) {
+              LOGF(warning, Form("Model for %s with negative input shape likely because converted with ummingbird, setting it to 1.", charmParticleNames[iCharmPart].data()));
+              inputShapesML[iCharmPart][0][0] = 1;
+            }
+            outputNamesML[iCharmPart] = sessionML[iCharmPart]->GetOutputNames();
+            outputShapesML[iCharmPart] = sessionML[iCharmPart]->GetOutputShapes();
 
-          Ort::TypeInfo typeInfo = sessionML[iCharmPart]->GetInputTypeInfo(0);
-          auto tensorInfo = typeInfo.GetTensorTypeAndShapeInfo();
-          dataTypeML[iCharmPart] = tensorInfo.GetElementType();
+            Ort::TypeInfo typeInfo = sessionML[iCharmPart]->GetInputTypeInfo(0);
+            auto tensorInfo = typeInfo.GetTensorTypeAndShapeInfo();
+            dataTypeML[iCharmPart] = tensorInfo.GetElementType();
+          } else {
+            LOG(fatal) << "Error encountered while fetching/loading the network from CCDB! Maybe the network doesn't exist yet for this runnumber/timestamp?";
+          }
         }
       }
     }
   }
-
   /// Single-track cuts for bachelor track of beauty candidates
   /// \param track is a track
   /// \param candType candidate type (3-prong or 4-prong beauty candidate)
@@ -823,10 +851,48 @@ struct HfFilter { // Main struct for HF triggers
   using BigTracksWithProtonPID = soa::Filtered<soa::Join<aod::BigTracksExtended, aod::TrackSelection, aod::pidTPCFullPr, aod::pidTOFFullPr>>;
 
   void process(aod::Collision const& collision,
+               aod::BCsWithTimestamps const&,
                HfTrackIndexProng2withColl const& cand2Prongs,
                HfTrackIndexProng3withColl const& cand3Prongs,
                BigTracksWithProtonPID const& tracks)
   {
+
+    if (applyML && ccdbTimestamp == 0 && onnxFiles[kD0].find("cvmfs") == std::string::npos && inputNamesML[kD0].size() == 0) {
+
+      auto bc = collision.bc_as<o2::aod::BCsWithTimestamps>();
+      LOG(info) << "Fetching network for timestamp: " << bc.timestamp();
+
+      for (auto iCharmPart{0}; iCharmPart < kNCharmParticles; ++iCharmPart) {
+        if (onnxFiles[iCharmPart] != "") {
+          if (singleThreadInference) {
+            sessionOptions[iCharmPart].SetIntraOpNumThreads(1);
+            sessionOptions[iCharmPart].SetInterOpNumThreads(1);
+          }
+          std::map<std::string, std::string> metadata;
+          std::string tmp = mlModelPathCCDB.value + charmParticleNames[iCharmPart];
+          bool retrieve_success = ccdbApi.retrieveBlob(tmp, ".", metadata, bc.timestamp(), false, onnxFiles[iCharmPart]);
+          if (retrieve_success) {
+
+            sessionML[iCharmPart].reset(new Ort::Experimental::Session{env[iCharmPart], onnxFiles[iCharmPart], sessionOptions[iCharmPart]});
+            inputNamesML[iCharmPart] = sessionML[iCharmPart]->GetInputNames();
+            inputShapesML[iCharmPart] = sessionML[iCharmPart]->GetInputShapes();
+            if (inputShapesML[iCharmPart][0][0] < 0) {
+              LOGF(warning, Form("Model for %s with negative input shape likely because converted with ummingbird, setting it to 1.", charmParticleNames[iCharmPart].data()));
+              inputShapesML[iCharmPart][0][0] = 1;
+            }
+            outputNamesML[iCharmPart] = sessionML[iCharmPart]->GetOutputNames();
+            outputShapesML[iCharmPart] = sessionML[iCharmPart]->GetOutputShapes();
+
+            Ort::TypeInfo typeInfo = sessionML[iCharmPart]->GetInputTypeInfo(0);
+            auto tensorInfo = typeInfo.GetTensorTypeAndShapeInfo();
+            dataTypeML[iCharmPart] = tensorInfo.GetElementType();
+          } else {
+            LOG(fatal) << "Error encountered while fetching/loading the network from CCDB! Maybe the network doesn't exist yet for this runnumber/timestamp?";
+          }
+        }
+      }
+    }
+
     hProcessedEvents->Fill(0);
 
     // collision process loop

EventFiltering/PWGUD/DGHelpers.h

@@ -93,9 +93,9 @@ struct DGSelector {
     }
 
     // no activity in muon arm
-    LOGF(debug, "Muons %i", fwdtracks.size());
-    for (auto& muon : fwdtracks) {
-      LOGF(debug, "  %i / %f / %f / %f", muon.trackType(), muon.eta(), muon.pt(), muon.p());
+    LOGF(debug, "FwdTracks %i", fwdtracks.size());
+    for (auto& fwdtrack : fwdtracks) {
+      LOGF(debug, "  %i / %f / %f / %f", fwdtrack.trackType(), fwdtrack.eta(), fwdtrack.pt(), fwdtrack.p());
     }
     if (fwdtracks.size() > 0) {
       return 2;
@@ -178,6 +178,73 @@ struct DGSelector {
     return 0;
   };
 
+  template <typename BCs, typename TCs, typename FWs>
+  int IsSelected(DGCutparHolder diffCuts, BCs& bc, TCs& tracks, FWs& fwdtracks)
+  {
+    // check that there are no FIT signals in bc
+    // Double Gap (DG) condition
+    if (!cleanFIT(bc, diffCuts.FITAmpLimits())) {
+      return 1;
+    }
+
+    // no activity in muon arm
+    LOGF(debug, "FwdTracks %i", fwdtracks.size());
+    for (auto& fwdtrack : fwdtracks) {
+      LOGF(debug, "  %i / %f / %f / %f", fwdtrack.trackType(), fwdtrack.eta(), fwdtrack.pt(), fwdtrack.p());
+    }
+    if (fwdtracks.size() > 0) {
+      return 2;
+    }
+
+    // number of tracks
+    if ((int)tracks.size() < diffCuts.minNTracks() || (int)tracks.size() > diffCuts.maxNTracks()) {
+      return 6;
+    }
+
+    // PID, pt, and eta of tracks, invariant mass, and net charge
+    // which particle hypothesis?
+    auto mass2Use = 0.;
+    TParticlePDG* pdgparticle = fPDG->GetParticle(diffCuts.pidHypothesis());
+    if (pdgparticle != nullptr) {
+      mass2Use = pdgparticle->Mass();
+    }
+
+    auto netCharge = 0;
+    auto lvtmp = TLorentzVector();
+    auto ivm = TLorentzVector();
+    for (auto& track : tracks) {
+      // PID
+      if (!hasGoodPID(diffCuts, track)) {
+        return 7;
+      }
+
+      // pt
+      lvtmp.SetXYZM(track.px(), track.py(), track.pz(), mass2Use);
+      if (lvtmp.Perp() < diffCuts.minPt() || lvtmp.Perp() > diffCuts.maxPt()) {
+        return 8;
+      }
+
+      // eta
+      if (lvtmp.Eta() < diffCuts.minEta() || lvtmp.Eta() > diffCuts.maxEta()) {
+        return 9;
+      }
+      netCharge += track.sign();
+      ivm += lvtmp;
+    }
+
+    // net charge
+    if (netCharge < diffCuts.minNetCharge() || netCharge > diffCuts.maxNetCharge()) {
+      return 10;
+    }
+    // invariant mass
+    if (ivm.M() < diffCuts.minIVM() || ivm.M() > diffCuts.maxIVM()) {
+      return 11;
+    }
+
+    // if we arrive here then the event is good!
+    return 0;
+  };
+
  private:
   TDatabasePDG* fPDG;
 };