Merge branch 'AliceO2Group:master' into master

Archita-Dash · Nov 16, 2023 · cb202ae · cb202ae
2 parents fcf25f7 + b503a3f
commit cb202ae
Show file tree

Hide file tree

Showing 84 changed files with 3,486 additions and 1,171 deletions.
diff --git a/ALICE3/Core/DelphesO2TrackSmearer.h b/ALICE3/Core/DelphesO2TrackSmearer.h
@@ -129,8 +129,8 @@ struct lutEntry_t {
   float otof = 0.;
   float covm[15] = {0.};
   float eigval[5] = {0.};
-  float eigvec[5][5] = {0.};
-  float eiginv[5][5] = {0.};
+  float eigvec[5][5] = {{0.}};
+  float eiginv[5][5] = {{0.}};
   void print()
   {
     printf(" --- lutEntry: pt = %f, eta = %f (%s)\n", pt, eta, valid ? "valid" : "not valid");

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -19,7 +19,7 @@
 /DPG/Tasks/AOTEvent @alibuild @ekryshen @strogolo
 /DPG/Tasks/AOTTrack @alibuild @mfaggin @belikov @njacazio
 /EventFiltering @alibuild @mpuccio @strogolo
-/EventFiltering/PWGHF @alibuild @fgrosa @vkucera @mpuccio @strogolo
+/EventFiltering/PWGHF @alibuild @fgrosa @zhangbiao-phy @vkucera @mpuccio @strogolo
 /EventFiltering/PWGUD @alibuild @pbuehler @mpuccio @strogolo
 /EventFiltering/PWGLF @alibuild @mpuccio @ercolessi @ChiaraDeMartin95 @strogolo
 /EventFiltering/PWGCF @alibuild @lauraser @mpuccio @strogolo
@@ -30,7 +30,7 @@
 /PWGEM @alibuild @mikesas @rbailhac @feisenhu
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern
-/PWGHF @alibuild @vkucera @fcolamar @adubla @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @nzardosh @NicoleBastid @gtaillepied
+/PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @nzardosh @NicoleBastid
 /PWGLF @alibuild @lramona @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @mbombara @iravasen @njacazio @ChiaraDeMartin95 @skundu692
 /PWGMM @alibuild @aalkin
 /PWGMM/Lumi @alibuild @aalkin
@@ -40,10 +40,10 @@
 /PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
 /Tools/PIDML @alibuild @saganatt
 /Tools/ML @alibuild @fcatalan92 @fmazzasc
-/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochu
+/Tutorials/PWGCF @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul
 /Tutorials/PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
 /Tutorials/PWGEM @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
-/Tutorials/PWGHF @alibuild @vkucera @fcolamar @adubla
+/Tutorials/PWGHF @alibuild @vkucera @fcolamar @fgrosa
 /Tutorials/PWGJE @alibuild @lhavener @maoyx @nzardosh @ddobrigk @mfasDa
 /Tutorials/PWGLF @alibuild @alcaliva @lbariogl @chiarapinto @BongHwi @lbarnby @mbombara @iravasen @njacazio @ChiaraDeMartin95 @skundu692
 /Tutorials/PWGMM @alibuild @aalkin @ddobrigk

diff --git a/Common/Core/TrackSelectionDefaults.cxx b/Common/Core/TrackSelectionDefaults.cxx
@@ -118,6 +118,7 @@ TrackSelection getGlobalTrackSelectionRun3HF()
 TrackSelection getJEGlobalTrackSelectionRun2()
 {
   TrackSelection selectedTracks = getGlobalTrackSelection();
+  selectedTracks.SetPtRange(0.15f, 1e15f);
   selectedTracks.SetRequireGoldenChi2(false);
   selectedTracks.SetMaxDcaXYPtDep([](float pt) { return 1e+10; });
   selectedTracks.SetEtaRange(-0.9f, 0.9f);

diff --git a/Common/TableProducer/PID/pidBayes.cxx b/Common/TableProducer/PID/pidBayes.cxx
@@ -238,13 +238,13 @@ struct bayesPid {
       Response[kTOF].LoadParam(DetectorResponse::kSigma, ccdb->getForTimeStamp<Parametrization>(path, timestamp.value));
     }
     if (fnameTPC != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fnameTPC);
+      LOGP(info, "Loading TPC response from file {}", fnameTPC.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fnameTPC, "READ"));
         f->GetObject("Response", responseTPCptr);
         responseTPC.SetParameters(responseTPCptr);
       } catch (...) {
-        LOGP(info, "Loading the TPC PID Response from file {} failed!", fnameTPC);
+        LOGP(info, "Loading the TPC PID Response from file {} failed!", fnameTPC.Data());
       }
     } else {
       const std::string pathTPC = ccdbPathTPC.value;

diff --git a/Common/TableProducer/PID/pidTPC.cxx b/Common/TableProducer/PID/pidTPC.cxx
@@ -134,12 +134,12 @@ struct tpcPid {
     /// TPC PID Response
     const TString fname = paramfile.value;
     if (fname != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fname);
+      LOGP(info, "Loading TPC response from file {}", fname.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fname, "READ"));
         f->GetObject("Response", response);
       } catch (...) {
-        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname);
+        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname.Data());
       }
       response->PrintAll();
     } else {

diff --git a/Common/TableProducer/PID/pidTPCFull.cxx b/Common/TableProducer/PID/pidTPCFull.cxx
@@ -134,12 +134,12 @@ struct tpcPidFull {
     /// TPC PID Response
     const TString fname = paramfile.value;
     if (fname != "") { // Loading the parametrization from file
-      LOGP(info, "Loading TPC response from file {}", fname);
+      LOGP(info, "Loading TPC response from file {}", fname.Data());
       try {
         std::unique_ptr<TFile> f(TFile::Open(fname, "READ"));
         f->GetObject("Response", response);
       } catch (...) {
-        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname);
+        LOGF(fatal, "Loading the TPC PID Response from file {} failed!", fname.Data());
       }
       response->PrintAll();
     } else {

diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx
@@ -76,11 +76,11 @@ struct MultiplicityExtraTable {
       std::map<std::string, std::string> mapHeader;
       auto grplhcif = ccdb->getForTimeStamp<o2::parameters::GRPLHCIFData>("GLO/Config/GRPLHCIF", ts);
       CollidingBunch = grplhcif->getBunchFilling().getBCPattern();
-      for (int i = 0; i < (int)CollidingBunch.size(); i++) {
-        if (CollidingBunch.test(i)) {
-          LOG(info) << i << "  ";
-        }
-      }
+      // for (int i = 0; i < (int)CollidingBunch.size(); i++) {
+      //   if (CollidingBunch.test(i)) {
+      //     LOG(info) << i << "  ";
+      //   }
+      // }
     } // new run number
 
     bool collidingBC = CollidingBunch.test(localBC);

diff --git a/DPG/Tasks/AOTTrack/qaMatchEff.cxx b/DPG/Tasks/AOTTrack/qaMatchEff.cxx
@@ -54,7 +54,8 @@ using namespace o2::framework;
 using namespace o2::framework::expressions;
 using std::array;
 using namespace extConfPar;
-//
+using o2::constants::math::PI;
+using o2::constants::math::TwoPI;
 //
 struct qaMatchEff {
   int lastRunNumber = -1;

diff --git a/DPG/Tasks/CMakeLists.txt b/DPG/Tasks/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory(AOTTrack)
 add_subdirectory(AOTEvent)
 add_subdirectory(TPC)
 add_subdirectory(TOF)
+add_subdirectory(FV0)
 add_subdirectory(FDD)
 add_subdirectory(MFT)
 add_subdirectory(Monitor)
diff --git a/DPG/Tasks/FV0/CMakeLists.txt b/DPG/Tasks/FV0/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+# All rights not expressly granted are reserved.
+#
+# This software is distributed under the terms of the GNU General Public
+# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+#
+# 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.
+
+o2physics_add_dpl_workflow(fv0-qa
+                           SOURCES qaFV0.cxx
+                           PUBLIC_LINK_LIBRARIES O2Physics::DataModel O2::Framework
+                           COMPONENT_NAME Analysis)