Merge branch 'master' into processMCOutlier

Author: lucasjsilva

.github/workflows/o2-linter.yml

@@ -2,7 +2,7 @@
 # Find issues in O2 code
 name: O2 linter
 
-# "on": [pull_request_target, push]
+#"on": [pull_request_target, push]
 permissions: {}
 env:
   BRANCH_MAIN: master
@@ -47,6 +47,8 @@ jobs:
           fi
           echo "linter_ran=1" >> "$GITHUB_OUTPUT"
           [[ "${{ github.event_name }}" == "pull_request_target" ]] && options="-g"
+          # Checkout the script from the base branch to prevent execution of arbitrary code in the head branch.
+          git checkout ${{ env.BRANCH_BASE }} -- Scripts/o2_linter.py
           # shellcheck disable=SC2086 # Ignore unquoted options.
           python3 Scripts/o2_linter.py $options "${files[@]}"
           echo "Tip: If you allow actions in your fork repository, O2 linter will run when you push commits."

ALICE3/Core/DelphesO2TrackSmearer.cxx

@@ -64,8 +64,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
   if (strncmp(filename, "ccdb:", 5) == 0) { // Check if filename starts with "ccdb:"
     LOG(info) << " --- LUT file source identified as CCDB.";
     std::string path = std::string(filename).substr(5); // Remove "ccdb:" prefix
-    const std::string outPath = "/tmp/LUTs/";
-    filename = Form("%s/%s/snapshot.root", outPath.c_str(), path.c_str());
+    filename = Form("%s/%s/snapshot.root", mOutPath.c_str(), path.c_str());
     LOG(info) << " --- Local LUT filename will be: " << filename;
     std::ifstream checkFile(filename); // Check if file already exists
     if (!checkFile.is_open()) {        // File does not exist, retrieve from CCDB
@@ -74,7 +73,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
         LOG(fatal) << " --- CCDB manager not set. Please set it before loading LUT from CCDB.";
       }
       std::map<std::string, std::string> metadata;
-      mCcdbManager->getCCDBAccessor().retrieveBlob(path, outPath, metadata, 1);
+      mCcdbManager->getCCDBAccessor().retrieveBlob(path, mOutPath, metadata, 1);
       // Add CCDB handling logic here if needed
       LOG(info) << " --- Now retrieving LUT file from CCDB to: " << filename;
       if (mCleanupDownloadedFile) { // Clean up the downloaded file if needed
@@ -105,6 +104,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
   lutFile.read(reinterpret_cast<char*>(mLUTHeader[ipdg]), sizeof(lutHeader_t));
   if (lutFile.gcount() != sizeof(lutHeader_t)) {
     LOG(info) << " --- troubles reading covariance matrix header for PDG " << pdg << ": " << filename << std::endl;
+    LOG(info) << " --- expected/detected " << sizeof(lutHeader_t) << "/" << lutFile.gcount() << std::endl;
     delete mLUTHeader[ipdg];
     mLUTHeader[ipdg] = nullptr;
     return false;
@@ -148,6 +148,7 @@ bool TrackSmearer::loadTable(int pdg, const char* filename, bool forceReload)
           lutFile.read(reinterpret_cast<char*>(mLUTEntry[ipdg][inch][irad][ieta][ipt]), sizeof(lutEntry_t));
           if (lutFile.gcount() != sizeof(lutEntry_t)) {
             LOG(info) << " --- troubles reading covariance matrix entry for PDG " << pdg << ": " << filename << std::endl;
+            LOG(info) << " --- expected/detected " << sizeof(lutHeader_t) << "/" << lutFile.gcount() << std::endl;
             return false;
           }
         }

ALICE3/Core/DelphesO2TrackSmearer.h

@@ -33,6 +33,7 @@
 #include <fstream>
 #include <iostream>
 #include <map>
+#include <string>
 
 ///////////////////////////////
 /// DelphesO2/src/lutCovm.hh //
@@ -248,9 +249,10 @@ class TrackSmearer
         return "pion"; // Default: pion
     }
   }
-  void setdNdEta(float val) { mdNdEta = val; }                                 //;
-  void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdbManager = mgr; } //;
-  void setCleanupDownloadedFile(bool val) { mCleanupDownloadedFile = val; }    //;
+  void setdNdEta(float val) { mdNdEta = val; }                                      //;
+  void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdbManager = mgr; }      //;
+  void setCleanupDownloadedFile(bool val) { mCleanupDownloadedFile = val; }         //;
+  void setDownloadPath(const std::string& path) { mOutPath = "/tmp/LUTs/" + path; } //;
 
  protected:
   static constexpr unsigned int nLUTs = 9; // Number of LUT available
@@ -265,6 +267,7 @@ class TrackSmearer
  private:
   o2::ccdb::BasicCCDBManager* mCcdbManager = nullptr;
   bool mCleanupDownloadedFile = true;
+  std::string mOutPath = "/tmp/LUTs/";
 };
 
 } // namespace delphes

ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

@@ -301,6 +301,7 @@ struct OnTheFlyRichPid {
       mSmearer.emplace_back(std::make_unique<o2::delphes::DelphesO2TrackSmearer>());
       mSmearer[icfg]->setCleanupDownloadedFile(cleanLutWhenLoaded.value);
       mSmearer[icfg]->setCcdbManager(ccdb.operator->());
+      mSmearer[icfg]->setDownloadPath("RICHPID");
       std::map<std::string, std::string> globalConfiguration = mGeoContainer.getConfiguration(icfg, "global");
       for (const auto& entry : globalConfiguration) {
         int pdg = 0;

ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx

@@ -160,6 +160,7 @@ struct OnTheFlyTofPid {
       mSmearer.emplace_back(std::make_unique<o2::delphes::DelphesO2TrackSmearer>());
       mSmearer[icfg]->setCleanupDownloadedFile(cleanLutWhenLoaded.value);
       mSmearer[icfg]->setCcdbManager(ccdb.operator->());
+      mSmearer[icfg]->setDownloadPath("TOFPID");
       std::map<std::string, std::string> globalConfiguration = mGeoContainer.getConfiguration(icfg, "global");
       for (const auto& entry : globalConfiguration) {
         int pdg = 0;