Merge branch 'AliceO2Group:master' into master

Author: PaolaVT

ALICE3/Core/FastTracker.cxx

@@ -516,7 +516,7 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   for (int ii = 0; ii < o2::track::kCovMatSize; ii++)
     covMat[ii] = outputTrack.getCov()[ii];
   TMatrixDSym m(5);
-  float fcovm[5][5];
+  double fcovm[5][5]; // double precision is needed for regularisation
 
   for (int ii = 0, k = 0; ii < 5; ++ii) {
     for (int j = 0; j < ii + 1; ++j, ++k) {

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();

Common/Core/CollisionTypeHelper.cxx

@@ -16,11 +16,14 @@
 ///
 
 #include "Common/Core/CollisionTypeHelper.h"
+
+#include "DataFormatsParameters/GRPLHCIFData.h"
+
 #include <fairlogger/Logger.h>
+
 #include <string>
-#include "DataFormatsParameters/GRPLHCIFData.h"
 
-std::string CollisionSystemType::getCollisionSystemName(collType collSys)
+std::string o2::common::core::CollisionSystemType::getCollisionSystemName(collType collSys)
 {
   switch (collSys) {
     case kCollSyspp:
@@ -36,7 +39,7 @@ std::string CollisionSystemType::getCollisionSystemName(collType collSys)
   }
 }
 
-int CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
+int o2::common::core::CollisionSystemType::getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif)
 {
   const int ZBeamA = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamA);
   const int ZBeamC = grplhcif->getBeamZ(o2::constants::lhc::BeamDirection::BeamC);

Common/Core/CollisionTypeHelper.h

@@ -18,9 +18,12 @@
 #ifndef COMMON_CORE_COLLISIONTYPEHELPER_H_
 #define COMMON_CORE_COLLISIONTYPEHELPER_H_
 
-#include <string>
 #include "DataFormatsParameters/GRPLHCIFData.h"
 
+#include <string>
+
+namespace o2::common::core
+{
 // Container for the collision system type
 struct CollisionSystemType {
   // Enum type for the collision system
@@ -38,4 +41,8 @@ struct CollisionSystemType {
   static int getCollisionTypeFromGrp(o2::parameters::GRPLHCIFData* grplhcif);
 };
 
+} // namespace o2::common::core
+
+using CollisionSystemType = o2::common::core::CollisionSystemType;
+
 #endif // COMMON_CORE_COLLISIONTYPEHELPER_H_

Common/Core/MetadataHelper.cxx

@@ -20,13 +20,18 @@
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
+using namespace o2::common::core;
+
 MetadataHelper::MetadataHelper()
 {
-  const std::array<std::string, 5> keyList = {"DataType",
+  const std::array<std::string, 8> keyList = {"DataType",
                                               "RecoPassName",
                                               "Run",
                                               "AnchorPassName",
-                                              "AnchorProduction"};
+                                              "AnchorProduction",
+                                              "ROOTVersion",
+                                              "LPMProductionTag",
+                                              "O2Version"};
   for (const auto& key : keyList) {
     mMetadata[key] = "undefined";
   }

Common/Core/MetadataHelper.h

@@ -18,10 +18,14 @@
 #ifndef COMMON_CORE_METADATAHELPER_H_
 #define COMMON_CORE_METADATAHELPER_H_
 
-#include <string>
-#include <map>
 #include "Framework/ConfigContext.h"
 
+#include <map>
+#include <string>
+
+namespace o2::common::core
+{
+
 struct MetadataHelper {
   /// @brief Constructor for the MetadataHelper. Defines the all the metadata keys that will be looked for and accessible
   MetadataHelper();
@@ -64,4 +68,8 @@ struct MetadataHelper {
   bool mIsInitialized = false;                  /// < Flag to check if the metadata has been initialized
 };
 
+} // namespace o2::common::core
+
+using MetadataHelper = o2::common::core::MetadataHelper; // Alias for the MetadataHelper
+
 #endif // COMMON_CORE_METADATAHELPER_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/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
@@ -160,3 +167,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)