Merge branch 'AliceO2Group:master' into master

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

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
@@ -61,7 +68,10 @@ const char* selectionLabels[kNsel] = {
   "kNoCollInTimeRangeVzDependent",
   "kNoCollInRofStrict",
   "kNoCollInRofStandard",
-  "kNoHighMultCollInPrevRof"};
+  "kNoHighMultCollInPrevRof",
+  "kIsGoodITSLayer3",
+  "kIsGoodITSLayer0123",
+  "kIsGoodITSLayersAll"};
 } // namespace o2::aod::evsel
 
 using namespace o2::aod::evsel;
@@ -166,7 +176,7 @@ EventSelectionParams::EventSelectionParams(int system, int run)
   }
 }
 
-void EventSelectionParams::DisableOutOfBunchPileupCuts()
+void EventSelectionParams::disableOutOfBunchPileupCuts()
 {
   selectionBarrel[kNoV0MOnVsOfPileup] = 0;
   selectionBarrel[kNoSPDOnVsOfPileup] = 0;
@@ -184,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_
 
@@ -67,6 +72,9 @@ enum EventSelectionFlags {
   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
 };
 
@@ -77,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];
@@ -154,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_

Common/TableProducer/Converters/CMakeLists.txt

@@ -93,3 +93,14 @@ o2physics_add_dpl_workflow(trackqa-converter-002
                     SOURCES trackQA002Converter.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(run2bcinfos-converter
+                    SOURCES run2bcinfosConverter.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(run2-tracks-extra-converter
+                    SOURCES run2tracksExtraConverter.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+

Common/TableProducer/Converters/run2bcinfosConverter.cxx

@@ -0,0 +1,40 @@
+// 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.
+
+#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+struct Run2BCInfosConverter {
+  Produces<aod::Run2BCInfos_001> Run2BCInfos_001;
+  void process(aod::Run2BCInfos_000 const& Run2BCInfos_000)
+  {
+
+    for (const auto& entry : Run2BCInfos_000) {
+      Run2BCInfos_001(entry.eventCuts(),
+                      entry.triggerMaskNext50(), entry.l0TriggerInputMask(),
+                      entry.spdClustersL0(), entry.spdClustersL1(),
+                      entry.spdFiredChipsL0(), entry.spdFiredChipsL1(),
+                      entry.spdFiredFastOrL0(), entry.spdFiredFastOrL1(),
+                      entry.v0TriggerChargeA(), entry.v0TriggerChargeC(),
+                      0, 0);
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<Run2BCInfosConverter>(cfgc)};
+}

Common/TableProducer/Converters/run2tracksExtraConverter.cxx

@@ -0,0 +1,34 @@
+// 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.
+
+#include "Framework/runDataProcessing.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/AnalysisDataModel.h"
+
+using namespace o2;
+using namespace o2::framework;
+
+struct Run2TracksExtraConverter {
+  Produces<aod::Run2TrackExtras_001> Run2TrackExtras_001;
+  void process(aod::Run2TrackExtras_000 const& Run2TrackExtras_000)
+  {
+
+    for (const auto& track0 : Run2TrackExtras_000) {
+      Run2TrackExtras_001(track0.itsSignal(), 0);
+    }
+  }
+};
+
+WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
+{
+  return WorkflowSpec{
+    adaptAnalysisTask<Run2TracksExtraConverter>(cfgc)};
+}

Common/TableProducer/Converters/tracksExtraV002Converter.cxx

@@ -88,7 +88,7 @@ struct TracksExtraV002Converter {
                       track1.trackTimeRes());
     }
   }
-  PROCESS_SWITCH(TracksExtraV002Converter, processV001ToV002, "process v001-to-v002 conversion", false);
+  PROCESS_SWITCH(TracksExtraV002Converter, processV001ToV002, "process v001-to-v002 conversion", true);
 };
 
 /// Spawn the extended table for TracksExtra002 to avoid the call to the internal spawner and a consequent circular dependency