Merge branch 'master' into unify-derived-format

Author: vkucera

.github/workflows/mega-linter.yml

@@ -38,7 +38,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v8.1.0
+        uses: oxsecurity/megalinter@v8.3.0
         env:
           # All available variables are described in documentation:
           # https://megalinter.io/configuration/

.github/workflows/o2-linter.yml

@@ -0,0 +1,34 @@
+---
+# Find issues in O2 code
+name: O2 linter
+
+'on': [pull_request, push]
+permissions: {}
+env:
+  MAIN_BRANCH: master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  o2-linter:
+    name: O2 linter
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # needed to get the full history
+      - name: Run tests
+        run: |
+          # Diff against the common ancestor of the source branch and the main branch.
+          readarray -t files < <(git diff --diff-filter d --name-only origin/${{ env.MAIN_BRANCH }}...)
+          if [ ${#files[@]} -eq 0 ]; then
+              echo "::notice::No files to lint."
+              exit 0
+          fi
+          [ ${{ github.event_name }} == 'pull_request' ] && options="-g"
+          # 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/TableProducer/OTF/onTheFlyTOFPID.cxx

@@ -81,6 +81,8 @@ struct OnTheFlyTOFPID {
   Configurable<int> nBinsTrackDeltaLength{"nBinsTrackDeltaLength", 100, "number of bins in delta track length"};
   Configurable<int> nBinsNsigmaCorrectSpecies{"nBinsNsigmaCorrectSpecies", 200, "number of bins in Nsigma plot (correct speies)"};
   Configurable<int> nBinsNsigmaWrongSpecies{"nBinsNsigmaWrongSpecies", 200, "number of bins in Nsigma plot (wrong species)"};
+  Configurable<float> minNsigmaRange{"minNsigmaRange", -10, "lower limit for the nsigma axis"};
+  Configurable<float> maxNsigmaRange{"maxNsigmaRange", +10, "upper limit for the nsigma axis"};
   Configurable<int> nBinsTimeRes{"nBinsTimeRes", 400, "number of bins plots time resolution"};
   Configurable<int> nBinsRelativeEtaPt{"nBinsRelativeEtaPt", 400, "number of bins plots pt and eta relative errors"};
   Configurable<int> nBinsEta{"nBinsEta", 400, "number of bins plot relative eta error"};
@@ -138,7 +140,7 @@ struct OnTheFlyTOFPID {
     }
 
     if (doQAplots) {
-      const AxisSpec axisMomentum{static_cast<int>(nBinsP), 0.0f, +4.0f, "#it{p} (GeV/#it{c})"};
+      const AxisSpec axisMomentum{static_cast<int>(nBinsP), 0.0f, +10.0f, "#it{p} (GeV/#it{c})"};
       const AxisSpec axisMomentumSmall{static_cast<int>(nBinsP), 0.0f, +1.0f, "#it{p} (GeV/#it{c})"};
       const AxisSpec axisVelocity{static_cast<int>(nBinsBeta), 0.0f, +1.1f, "Measured #beta"};
       const AxisSpec axisTrackLengthInner{static_cast<int>(nBinsTrackLengthInner), 0.0f, 60.0f, "Track length (cm)"};
@@ -182,11 +184,11 @@ struct OnTheFlyTOFPID {
           std::string name_title_inner = "h2dInnerNsigmaTrue" + particle_names2[i_true] + "Vs" + particle_names2[i_hyp] + "Hypothesis";
           std::string name_title_outer = "h2dOuterNsigmaTrue" + particle_names2[i_true] + "Vs" + particle_names2[i_hyp] + "Hypothesis";
           if (i_true == i_hyp) {
-            const AxisSpec axisNsigmaCorrect{static_cast<int>(nBinsNsigmaCorrectSpecies), -10.0f, +10.0f, "N#sigma - True " + particle_names1[i_true] + " vs " + particle_names1[i_hyp] + " hypothesis"};
+            const AxisSpec axisNsigmaCorrect{static_cast<int>(nBinsNsigmaCorrectSpecies), minNsigmaRange, maxNsigmaRange, "N#sigma - True " + particle_names1[i_true] + " vs " + particle_names1[i_hyp] + " hypothesis"};
             histos.add(name_title_inner.c_str(), name_title_inner.c_str(), kTH2F, {axisMomentum, axisNsigmaCorrect});
             histos.add(name_title_outer.c_str(), name_title_outer.c_str(), kTH2F, {axisMomentum, axisNsigmaCorrect});
           } else {
-            const AxisSpec axisNsigmaWrong{static_cast<int>(nBinsNsigmaWrongSpecies), -10.0f, +10.0f, "N#sigma -  True " + particle_names1[i_true] + " vs " + particle_names1[i_hyp] + " hypothesis"};
+            const AxisSpec axisNsigmaWrong{static_cast<int>(nBinsNsigmaWrongSpecies), minNsigmaRange, maxNsigmaRange, "N#sigma -  True " + particle_names1[i_true] + " vs " + particle_names1[i_hyp] + " hypothesis"};
             histos.add(name_title_inner.c_str(), name_title_inner.c_str(), kTH2F, {axisMomentum, axisNsigmaWrong});
             histos.add(name_title_outer.c_str(), name_title_outer.c_str(), kTH2F, {axisMomentum, axisNsigmaWrong});
           }

CODEOWNERS

@@ -17,7 +17,7 @@
 /ALICE3 @alibuild @njacazio @hscheid
 /DPG @alibuild @chiarazampolli @alcaliva @catalinristea
 /DPG/Tasks/AOTEvent @alibuild @ekryshen @strogolo @altsybee
-/DPG/Tasks/AOTTrack @alibuild @mfaggin @iouribelikov @njacazio
+/DPG/Tasks/AOTTrack @alibuild @mfaggin @iouribelikov @njacazio @lbariogl @f3sch
 /DPG/Tasks/TOF @alibuild @noferini @njacazio
 /DPG/Tasks/FT0 @alibuild @afurs
 /EventFiltering @alibuild @mpuccio @lietava
@@ -33,7 +33,7 @@
 /PWGCF/TableProducer @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
 /PWGCF/Tasks         @alibuild @jgrosseo @saganatt @victor-gonzalez @zchochul @lgraczykCern @prchakra @lauraser @ariedel-cern @EmilGorm @otonvd @shouqiye
 /PWGDQ @alibuild @iarsene @dsekihat @feisenhu @lucamicheletti93
-/PWGEM @alibuild @mikesas @rbailhac @feisenhu
+/PWGEM @alibuild @feisenhu @dsekihat @ivorobye
 /PWGEM/Dilepton @alibuild @mikesas @rbailhac @dsekihat @ivorobye @feisenhu
 /PWGEM/PhotonMeson @alibuild @mikesas @rbailhac @m-c-danisch @novitzky @mhemmer-cern @dsekihat
 /PWGHF @alibuild @vkucera @fcolamar @fgrosa @fcatalan92 @mfaggin @mmazzilli @deepathoms @NicoleBastid @hahassan7 @jpxrk @apalasciano
@@ -43,8 +43,8 @@
 /PWGLF/TableProducer/GlobalEventProperties @alibuild @njacazio @skundu692 @gbencedi @omvazque
 /PWGLF/Tasks/Nuspex         @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
 /PWGLF/TableProducer/Nuspex @alibuild @njacazio @skundu692 @fmazzasc @chiarapinto @maciacco
-/PWGLF/Tasks/Resonances         @alibuild @njacazio @skundu692 @BongHwi @smaff92
-/PWGLF/TableProducer/Resonances @alibuild @njacazio @skundu692 @BongHwi @smaff92
+/PWGLF/Tasks/Resonances         @alibuild @njacazio @skundu692 @dmallick2 @smaff92
+/PWGLF/TableProducer/Resonances @alibuild @njacazio @skundu692 @dmallick2 @smaff92
 /PWGLF/Tasks/Strangeness         @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
 /PWGLF/TableProducer/Strangeness @alibuild @njacazio @skundu692 @ercolessi @ChiaraDeMartin95
 

Common/CCDB/EventSelectionParams.cxx

@@ -9,6 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file EventSelectionParams.cxx
+/// \brief Event selection parameters
+///
+/// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
+
+// o2-linter: disable=name/workflow-file
+
 #include "EventSelectionParams.h"
 
 namespace o2::aod::evsel
@@ -60,7 +67,11 @@ const char* selectionLabels[kNsel] = {
   "kNoCollInTimeRangeStandard",
   "kNoCollInTimeRangeVzDependent",
   "kNoCollInRofStrict",
-  "kNoCollInRofStandard"};
+  "kNoCollInRofStandard",
+  "kNoHighMultCollInPrevRof",
+  "kIsGoodITSLayer3",
+  "kIsGoodITSLayer0123",
+  "kIsGoodITSLayersAll"};
 } // namespace o2::aod::evsel
 
 using namespace o2::aod::evsel;
@@ -165,7 +176,7 @@ EventSelectionParams::EventSelectionParams(int system, int run)
   }
 }
 
-void EventSelectionParams::DisableOutOfBunchPileupCuts()
+void EventSelectionParams::disableOutOfBunchPileupCuts()
 {
   selectionBarrel[kNoV0MOnVsOfPileup] = 0;
   selectionBarrel[kNoSPDOnVsOfPileup] = 0;
@@ -183,15 +194,15 @@ void EventSelectionParams::DisableOutOfBunchPileupCuts()
   selectionMuonWithoutPileupCuts[kNoV0PFPileup] = 0;
 }
 
-void EventSelectionParams::SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB)
+void EventSelectionParams::setOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB)
 {
   fV0MOnVsOfA = newV0MOnVsOfA;
   fV0MOnVsOfB = newV0MOnVsOfB;
   fSPDOnVsOfA = newSPDOnVsOfA;
   fSPDOnVsOfB = newSPDOnVsOfB;
 }
 
-bool* EventSelectionParams::GetSelection(int iSelection)
+bool* EventSelectionParams::getSelection(int iSelection)
 {
   if (iSelection == 0) {
     return selectionBarrel;

Common/CCDB/EventSelectionParams.h

@@ -9,6 +9,11 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file EventSelectionParams.h
+/// \brief Event selection parameters
+///
+/// \author Evgeny Kryshen <evgeny.kryshen@cern.ch> and Igor Altsybeev <Igor.Altsybeev@cern.ch>
+
 #ifndef COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 #define COMMON_CCDB_EVENTSELECTIONPARAMS_H_
 
@@ -66,6 +71,10 @@ enum EventSelectionFlags {
   kNoCollInTimeRangeVzDependent, // no other collisions in vZ-dependent time range near a given collision
   kNoCollInRofStrict,            // no other collisions in this Readout Frame
   kNoCollInRofStandard,          // no other collisions in this Readout Frame with per-collision multiplicity above threshold
+  kNoHighMultCollInPrevRof,      // veto an event if FT0C amplitude in previous ITS ROF is above threshold
+  kIsGoodITSLayer3,              // number of inactive chips on ITS layer 3 is below maximum allowed value
+  kIsGoodITSLayer0123,           // numbers of inactive chips on ITS layers 0-3 are below maximum allowed values
+  kIsGoodITSLayersAll,           // numbers of inactive chips on all ITS layers are below maximum allowed values
   kNsel                          // counter
 };
 
@@ -76,10 +85,10 @@ extern const char* selectionLabels[kNsel];
 class EventSelectionParams
 {
  public:
-  explicit EventSelectionParams(int system = 0, int run = 2);
-  void DisableOutOfBunchPileupCuts();
-  void SetOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB);
-  bool* GetSelection(int iSelection);
+  explicit EventSelectionParams(int system = 0, int run = 2); // o2-linter: disable=name/function-variable
+  void disableOutOfBunchPileupCuts();
+  void setOnVsOfParams(float newV0MOnVsOfA, float newV0MOnVsOfB, float newSPDOnVsOfA, float newSPDOnVsOfB);
+  bool* getSelection(int iSelection);
 
   bool selectionBarrel[o2::aod::evsel::kNsel];
   bool selectionMuonWithPileupCuts[o2::aod::evsel::kNsel];
@@ -153,7 +162,7 @@ class EventSelectionParams
   int fITSROFrameStartBorderMargin = 10; // number of bcs to cut in the beginning of ITS readout frame
   int fITSROFrameEndBorderMargin = 20;   // number of bcs to cut in the end of ITS readout frame
 
-  ClassDefNV(EventSelectionParams, 6)
+  ClassDefNV(EventSelectionParams, 7)
 };
 
 #endif // COMMON_CCDB_EVENTSELECTIONPARAMS_H_