Merge branch 'master' into DstarInPbPb

Author: Mingze129

ALICE3/DataModel/OTFMulticharm.h

@@ -116,24 +116,24 @@ DECLARE_SOA_TABLE(MCharmCores, "AOD", "MCharmCores",
                   otfmulticharm::Eta,
 
                   otfmulticharm::XiDCAxy,
-                  otfmulticharm::XicDCAxy,
-                  otfmulticharm::XiccDCAxy,
                   otfmulticharm::XiDCAz,
+                  otfmulticharm::XicDCAxy,
                   otfmulticharm::XicDCAz,
+                  otfmulticharm::XiccDCAxy,
                   otfmulticharm::XiccDCAz,
 
                   otfmulticharm::PiFromXiDCAxy,
-                  otfmulticharm::PiFromLaDCAxy,
-                  otfmulticharm::PrFromLaDCAxy,
                   otfmulticharm::PiFromXiDCAz,
+                  otfmulticharm::PiFromLaDCAxy,
                   otfmulticharm::PiFromLaDCAz,
+                  otfmulticharm::PrFromLaDCAxy,
                   otfmulticharm::PrFromLaDCAz,
 
                   otfmulticharm::Pi1cDCAxy,
-                  otfmulticharm::Pi2cDCAxy,
-                  otfmulticharm::PiccDCAxy,
                   otfmulticharm::Pi1cDCAz,
+                  otfmulticharm::Pi2cDCAxy,
                   otfmulticharm::Pi2cDCAz,
+                  otfmulticharm::PiccDCAxy,
                   otfmulticharm::PiccDCAz,
 
                   otfmulticharm::XicDecayRadius2D,

ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx

@@ -745,10 +745,15 @@ struct OnTheFlyRichPid {
     }
 
     for (const auto& track : tracks) {
+
+      float nSigmaBarrelRich[5] = {error_value, error_value, error_value, error_value, error_value};
+
       // first step: find precise arrival time (if any)
       // --- convert track into perfect track
-      if (!track.has_mcParticle()) // should always be OK but check please
+      if (!track.has_mcParticle()) { // should always be OK but check please
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
+      }
 
       auto mcParticle = track.mcParticle();
       o2::track::TrackParCov o2track = o2::upgrade::convertMCParticleToO2Track(mcParticle, pdg);
@@ -761,12 +766,14 @@ struct OnTheFlyRichPid {
       // get particle to calculate Cherenkov angle and resolution
       auto pdgInfo = pdg->GetParticle(mcParticle.pdgCode());
       if (pdgInfo == nullptr) {
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
       }
 
       // find track bRICH sector
       int i_sector = findSector(o2track.getEta());
       if (i_sector < 0) {
+        upgradeRich(nSigmaBarrelRich[0], nSigmaBarrelRich[1], nSigmaBarrelRich[2], nSigmaBarrelRich[3], nSigmaBarrelRich[4]);
         continue;
       }
 
@@ -794,12 +801,12 @@ struct OnTheFlyRichPid {
       }
 
       // Straight to Nsigma
-      float deltaThetaBarrelRich[5], nSigmaBarrelRich[5];
+      float deltaThetaBarrelRich[5]; //, nSigmaBarrelRich[5];
       int lpdg_array[5] = {kElectron, kMuonMinus, kPiPlus, kKPlus, kProton};
       float masses[5];
 
       for (int ii = 0; ii < 5; ii++) {
-        nSigmaBarrelRich[ii] = error_value;
+        // nSigmaBarrelRich[ii] = error_value;
 
         auto pdgInfoThis = pdg->GetParticle(lpdg_array[ii]);
         masses[ii] = pdgInfoThis->Mass();

CODEOWNERS

@@ -50,6 +50,7 @@
 /PWGLF/TableProducer/Resonances @alibuild @sustripathy @skundu692 @dmallick2 @smaff92
 /PWGLF/Tasks/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
 /PWGLF/TableProducer/Strangeness @alibuild @sustripathy @skundu692 @ercolessi @romainschotter
+/PWGLF/Utils @alibuild @sustripathy @skundu692 @gbencedi @abmodak @fmazzasc @maciacco @dmallick2 @smaff92 @ercolessi @romainschotter
 
 # PWG-MM
 /PWGMM      @alibuild @sustripathy @skundu692 @aalkin @jgcn

Common/Core/TableHelper.cxx

@@ -17,14 +17,14 @@
 
 #include "Common/Core/TableHelper.h"
 
-#include <string>
-
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+#include <string>
+
 /// Function to print the table required in the full workflow
 /// @param initContext initContext of the init function
-void printTablesInWorkflow(o2::framework::InitContext& initContext)
+void o2::common::core::printTablesInWorkflow(o2::framework::InitContext& initContext)
 {
   auto& workflows = initContext.services().get<o2::framework::RunningWorkflowInfo const>();
   for (auto const& device : workflows.devices) {
@@ -37,7 +37,7 @@ void printTablesInWorkflow(o2::framework::InitContext& initContext)
 /// Function to check if a table is required in a workflow
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
-bool isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const std::string& table)
+bool o2::common::core::isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const std::string& table)
 {
   LOG(debug) << "Checking if table " << table << " is needed";
   bool tableNeeded = false;
@@ -57,7 +57,7 @@ bool isTableRequiredInWorkflow(o2::framework::InitContext& initContext, const st
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
 /// @param flag bool value of flag to set, if the given value is true it will be kept, disregarding the table usage in the workflow.
-void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, bool& flag)
+void o2::common::core::enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, bool& flag)
 {
   if (flag) {
     LOG(info) << "Table enabled: " + table;
@@ -75,7 +75,7 @@ void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const st
 /// @param initContext initContext of the init function
 /// @param table name of the table to check for
 /// @param flag int value of flag to set, only if initially set to -1. Initial values of 0 or 1 will be kept disregarding the table usage in the workflow.
-void enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, int& flag)
+void o2::common::core::enableFlagIfTableRequired(o2::framework::InitContext& initContext, const std::string& table, int& flag)
 {
   if (flag > 0) {
     flag = 1;

Common/Core/TableHelper.h

@@ -18,12 +18,15 @@
 #ifndef COMMON_CORE_TABLEHELPER_H_
 #define COMMON_CORE_TABLEHELPER_H_
 
-#include <string>
-
 #include "Framework/Configurable.h"
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+#include <string>
+
+namespace o2::common::core
+{
+
 /// Function to print the table required in the full workflow
 /// @param initContext initContext of the init function
 void printTablesInWorkflow(o2::framework::InitContext& initContext);
@@ -76,14 +79,16 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
     }
     if (device.name == taskName) { // Found the mother task
       int optionCounter = 0;
-      for (auto const& option : device.options) {
+      for (const o2::framework::ConfigParamSpec& option : device.options) {
         if (verbose) {
-          LOG(info) << "  Option " << optionCounter++ << " " << option.name << " = '" << option.defaultValue.asString() << "'";
+          LOG(info) << "  Option " << optionCounter++ << " " << option.name << " of type " << static_cast<int>(option.type) << " = '" << option.defaultValue.asString() << "'";
         }
         if (option.name == optName) {
           value = option.defaultValue.get<ValueType>();
           if (verbose) {
-            LOG(info) << "   Found option '" << optName << "' with value '" << value << "'";
+            if constexpr (!std::is_same_v<ValueType, o2::framework::LabeledArray<float>>) {
+              LOG(info) << "   Found option '" << optName << "' with value '" << value << "'";
+            }
             found = true;
           } else {
             return true;
@@ -107,4 +112,11 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
   return getTaskOptionValue(initContext, taskName, configurable.name, configurable.value, verbose);
 }
 
+} // namespace o2::common::core
+
+using o2::common::core::enableFlagIfTableRequired;
+using o2::common::core::getTaskOptionValue;
+using o2::common::core::isTableRequiredInWorkflow;
+using o2::common::core::printTablesInWorkflow;
+
 #endif // COMMON_CORE_TABLEHELPER_H_

Common/DataModel/OccupancyTables.h

@@ -209,6 +209,8 @@ namespace trackmeanocc
 {
 DECLARE_SOA_INDEX_COLUMN(Track, track);
 
+// DECLARE_SOA_INDEX_COLUMN(TracksQA, tracksQA);// this is not working
+
 DECLARE_SOA_COLUMN(TmoPrimUnfm80, tmoPrimUnfm80, float);
 DECLARE_SOA_COLUMN(TmoFV0AUnfm80, tmoFV0AUnfm80, float);
 DECLARE_SOA_COLUMN(TmoFV0CUnfm80, tmoFV0CUnfm80, float);
@@ -281,7 +283,7 @@ DECLARE_SOA_COLUMN(TwmoRobustMultExtraTableUnfm80, twmoRobustMultExtraTableUnfm8
 // using Tracks = aod::Tracks;
 // DECLARE_SOA_INDEX_TABLE_USER(TrackMeanOccs0, Tracks, "TRACKMEANOCCS0", o2::aod::trackmeanocc::TrackId);
 
-DECLARE_SOA_TABLE(TmoTrackId, "AOD", "TMOTRACKID", o2::aod::trackmeanocc::TrackId);
+DECLARE_SOA_TABLE(TmoTrackIds, "AOD", "TMOTRACKIDS", o2::aod::trackmeanocc::TrackId);
 
 DECLARE_SOA_TABLE(TmoPrim, "AOD", "TMOPRIM", o2::soa::Index<>, // TrackMeanOccDet
                   o2::aod::trackmeanocc::TmoPrimUnfm80);
@@ -377,5 +379,21 @@ DECLARE_SOA_TABLE(TwmoRNtrackDet, "AOD", "TWMORNTRACKDET", o2::soa::Index<>,
 DECLARE_SOA_TABLE(TwmoRMultExtra, "AOD", "TWMORMULTEXTRA", o2::soa::Index<>,
                   o2::aod::trackmeanocc::TwmoRobustMultExtraTableUnfm80);
 
+using Tmo = aod::TmoTrackIds::iterator;
+
+using TrackQA = TracksQAVersion::iterator;
+
+namespace trackmeanocc
+{
+DECLARE_SOA_INDEX_COLUMN_FULL(Tmo, tmo, int64_t, TmoTrackIds, "");
+DECLARE_SOA_INDEX_COLUMN_FULL(TrackQA, trackQA, int64_t, TracksQAVersion, "");
+} // namespace trackmeanocc
+
+DECLARE_SOA_TABLE(TrackToTracksQA, "AOD", "TRACKTOTRACKSQA", o2::aod::trackmeanocc::TrackQAId);
+DECLARE_SOA_TABLE(TrackToTmo, "AOD", "TRACKTOTMO", o2::aod::trackmeanocc::TmoId);
+
+DECLARE_SOA_TABLE(TrackQAToTmo, "AOD", "TRACKQATOTMO", o2::aod::trackmeanocc::TmoId);
+DECLARE_SOA_TABLE(TmoToTrackQA, "AOD", "TMOTOTRACKQA", o2::aod::trackmeanocc::TrackQAId);
+
 } // namespace o2::aod
 #endif // COMMON_DATAMODEL_OCCUPANCYTABLES_H_

Common/DataModel/PIDResponseITS.h

@@ -23,10 +23,12 @@
 #define COMMON_DATAMODEL_PIDRESPONSEITS_H_
 
 // O2 includes
+#include "TableHelper.h"
+
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
-#include "ReconstructionDataFormats/PID.h"
 #include "Framework/Logger.h"
+#include "ReconstructionDataFormats/PID.h"
 
 namespace o2::aod
 {
@@ -125,6 +127,40 @@ struct ITSResponse {
                   0.09, -999., -999.);
   }
 
+  /// Initialize the TOF response parameters in the init function of each task
+  /// \param initContext Initialization context. Gets the configuration parameters from the pidITS task
+  static void setParameters(o2::framework::InitContext& initContext, bool isMC = false)
+  {
+    float p0 = 0, p1 = 0, p2 = 0;
+    float p0_Z2 = 0, p1_Z2 = 0, p2_Z2 = 0;
+    float p0_res = 0, p1_res = 0, p2_res = 0;
+    float p0_res_Z2 = 0, p1_res_Z2 = 0, p2_res_Z2 = 0;
+    o2::framework::LabeledArray<float> itsParams;
+    getTaskOptionValue(initContext, "its-pid", "itsParams", itsParams, true);
+    auto data = itsParams.getData();
+    const int col = isMC ? 1 : 0; // 0 for Data, 1 for MC
+    if (data.rows != 2 || data.cols != 12) {
+      LOG(fatal) << "ITSResponse parameters not initialized, check the itsParams configuration";
+    }
+    p0 = data(col, 0);
+    p1 = data(col, 1);
+    p2 = data(col, 2);
+    p0_Z2 = data(col, 3);
+    p1_Z2 = data(col, 4);
+    p2_Z2 = data(col, 5);
+    p0_res = data(col, 6);
+    p1_res = data(col, 7);
+    p2_res = data(col, 8);
+    p0_res_Z2 = data(col, 9);
+    p1_res_Z2 = data(col, 10);
+    p2_res_Z2 = data(col, 11);
+
+    setParameters(p0, p1, p2,
+                  p0_Z2, p1_Z2, p2_Z2,
+                  p0_res, p1_res, p2_res,
+                  p0_res_Z2, p1_res_Z2, p2_res_Z2);
+  }
+
  private:
   static std::array<float, 3> mITSRespParams;
   static std::array<float, 3> mITSRespParamsZ2;

Common/DataModel/SelectionStudyTables.h

@@ -0,0 +1,57 @@
+// 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.
+
+/// \file SelectionStudyTables
+/// \brief  tables meant to do event selection studies for O-O / light systems
+///
+/// \author ALICE
+
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+
+#include <vector>
+
+#ifndef COMMON_DATAMODEL_SELECTIONSTUDYTABLES_H_
+#define COMMON_DATAMODEL_SELECTIONSTUDYTABLES_H_
+
+namespace o2::aod
+{
+namespace selectionstudy
+{
+DECLARE_SOA_COLUMN(PtPions, ptPions, std::vector<float>);
+DECLARE_SOA_COLUMN(PtKaons, ptKaons, std::vector<float>);
+DECLARE_SOA_COLUMN(PtProtons, ptProtons, std::vector<float>);
+DECLARE_SOA_COLUMN(PtK0s, ptPK0s, std::vector<float>);
+DECLARE_SOA_COLUMN(PtLambdas, ptLambdas, std::vector<float>);
+DECLARE_SOA_COLUMN(PtXis, ptXis, std::vector<float>);
+DECLARE_SOA_COLUMN(PtOmegas, ptOmegas, std::vector<float>);
+DECLARE_SOA_COLUMN(PtPhis, ptPhis, std::vector<float>);
+DECLARE_SOA_COLUMN(PtKStars, ptKStars, std::vector<float>);
+DECLARE_SOA_COLUMN(PtDs, ptDs, std::vector<float>);
+DECLARE_SOA_COLUMN(PtLambdaCs, ptLambdaCs, std::vector<float>);
+DECLARE_SOA_COLUMN(PtJPsis, ptJPsis, std::vector<float>);
+} // namespace selectionstudy
+
+DECLARE_SOA_TABLE(PIDPts, "AOD", "PIDPTS", o2::soa::Index<>,
+                  o2::aod::selectionstudy::PtPions,
+                  o2::aod::selectionstudy::PtKaons,
+                  o2::aod::selectionstudy::PtProtons,
+                  o2::aod::selectionstudy::PtK0s,
+                  o2::aod::selectionstudy::PtLambdas,
+                  o2::aod::selectionstudy::PtXis,
+                  o2::aod::selectionstudy::PtOmegas,
+                  o2::aod::selectionstudy::PtPhis,
+                  o2::aod::selectionstudy::PtKStars,
+                  o2::aod::selectionstudy::PtDs,
+                  o2::aod::selectionstudy::PtLambdaCs,
+                  o2::aod::selectionstudy::PtJPsis);
+} // namespace o2::aod
+#endif // COMMON_DATAMODEL_SELECTIONSTUDYTABLES_H_

Common/TableProducer/CMakeLists.txt

@@ -25,6 +25,13 @@ o2physics_add_dpl_workflow(trackselection
 o2physics_add_dpl_workflow(event-selection
                     SOURCES eventSelection.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCCDB
+                                          O2::DataFormatsITSMFT
+                    COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(event-selection-service
+                    SOURCES eventSelectionService.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCCDB
+                                          O2::DataFormatsITSMFT
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(multiplicity-table
@@ -52,6 +59,11 @@ o2physics_add_dpl_workflow(timestamp
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(timestamptester
+                    SOURCES timestampTester.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)
+
 o2physics_add_dpl_workflow(weak-decay-indices
                     SOURCES weakDecayIndices.cxx
                     PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
@@ -160,3 +172,7 @@ o2physics_add_dpl_workflow(muon-realignment
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2::DetectorsCommonDataFormats O2::MathUtils O2::MCHTracking O2::DataFormatsMCH O2::GlobalTracking O2::MCHBase O2::MCHGeometryTransformer O2::CommonUtils
                     COMPONENT_NAME Analysis)
 
+o2physics_add_dpl_workflow(selectionstudytable
+                    SOURCES selectionStudyTable.cxx
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    COMPONENT_NAME Analysis)

Common/TableProducer/PID/CMakeLists.txt

@@ -45,7 +45,7 @@ o2physics_add_dpl_workflow(pid-tof-full
 
 o2physics_add_dpl_workflow(pid-tpc-base
                     SOURCES pidTPCBase.cxx
-                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
+                    PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore O2Physics::AnalysisCCDB
                     COMPONENT_NAME Analysis)
 
 o2physics_add_dpl_workflow(pid-tpc