Merge branch 'AliceO2Group:master' into master

Archita-Dash · Dec 16, 2024 · 035863b · 035863b
2 parents 6d1dc70 + b06b8ca
commit 035863b
Show file tree

Hide file tree

Showing 57 changed files with 6,247 additions and 2,234 deletions.
diff --git a/Common/DataModel/MatchMFTMuonData.h b/Common/DataModel/MatchMFTMuonData.h
@@ -0,0 +1,135 @@
+// 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.
+#ifndef COMMON_DATAMODEL_MATCHMFTMUONDATA_H_
+#define COMMON_DATAMODEL_MATCHMFTMUONDATA_H_
+#include "Framework/AnalysisDataModel.h"
+#endif // COMMON_DATAMODEL_MATCHMFTMUONDATA_H_
+
+namespace o2::aod
+{
+namespace matching_params
+{
+// matching parameters
+DECLARE_SOA_COLUMN(DeltaPt, mDeltaPt, float);
+DECLARE_SOA_COLUMN(DeltaEta, mDeltaEta, float);
+DECLARE_SOA_COLUMN(DeltaPhi, mDeltaPhi, float);
+DECLARE_SOA_COLUMN(DeltaX, mDeltaX, float);
+DECLARE_SOA_COLUMN(DeltaY, mDeltaY, float);
+DECLARE_SOA_COLUMN(GMuonPt, mGMuonPt, float);
+DECLARE_SOA_COLUMN(GMuonEta, mGMuonEta, float);
+DECLARE_SOA_COLUMN(PairQ, mPairQ, int16_t);
+DECLARE_SOA_COLUMN(IsCorrectMatch, mIsCorrectMatch, bool);
+} // namespace matching_params
+
+DECLARE_SOA_TABLE(MatchParams, "AOD", "MATCHING",
+                  matching_params::GMuonPt,
+                  matching_params::GMuonEta,
+                  matching_params::PairQ,
+                  matching_params::DeltaPt,
+                  matching_params::DeltaX,
+                  matching_params::DeltaY,
+                  matching_params::DeltaEta,
+                  matching_params::DeltaPhi,
+                  matching_params::IsCorrectMatch);
+
+namespace tag_matching_params
+{
+// matching parameters
+DECLARE_SOA_COLUMN(DeltaPt, mDeltaPt, float);
+DECLARE_SOA_COLUMN(DeltaEta, mDeltaEta, float);
+DECLARE_SOA_COLUMN(DeltaPhi, mDeltaPhi, float);
+DECLARE_SOA_COLUMN(DeltaX, mDeltaX, float);
+DECLARE_SOA_COLUMN(DeltaY, mDeltaY, float);
+DECLARE_SOA_COLUMN(GMuonPt, mGMuonPt, float);
+DECLARE_SOA_COLUMN(GMuonEta, mGMuonEta, float);
+DECLARE_SOA_COLUMN(PairQ, mPairQ, int16_t);
+DECLARE_SOA_COLUMN(IsCorrectMatch, mIsCorrectMatch, bool);
+} // namespace tag_matching_params
+
+DECLARE_SOA_TABLE(TagMatchParams, "AOD", "TAGMATCHING",
+                  tag_matching_params::GMuonPt,
+                  tag_matching_params::GMuonEta,
+                  tag_matching_params::PairQ,
+                  tag_matching_params::DeltaPt,
+                  tag_matching_params::DeltaX,
+                  tag_matching_params::DeltaY,
+                  tag_matching_params::DeltaEta,
+                  tag_matching_params::DeltaPhi,
+                  tag_matching_params::IsCorrectMatch);
+
+namespace probe_matching_params
+{
+// matching parameters
+DECLARE_SOA_COLUMN(DeltaPt, mDeltaPt, float);
+DECLARE_SOA_COLUMN(DeltaEta, mDeltaEta, float);
+DECLARE_SOA_COLUMN(DeltaPhi, mDeltaPhi, float);
+DECLARE_SOA_COLUMN(DeltaX, mDeltaX, float);
+DECLARE_SOA_COLUMN(DeltaY, mDeltaY, float);
+DECLARE_SOA_COLUMN(TagGMuonPt, mTagGMuonPt, float);
+DECLARE_SOA_COLUMN(GMuonPt, mGMuonPt, float);
+DECLARE_SOA_COLUMN(GMuonEta, mGMuonEta, float);
+DECLARE_SOA_COLUMN(PairQ, mPairQ, int16_t);
+DECLARE_SOA_COLUMN(IsCorrectMatch, mIsCorrectMatch, bool);
+} // namespace probe_matching_params
+
+DECLARE_SOA_TABLE(ProbeMatchParams, "AOD", "PROBEMATCHING",
+                  probe_matching_params::TagGMuonPt,
+                  probe_matching_params::GMuonPt,
+                  probe_matching_params::GMuonEta,
+                  probe_matching_params::PairQ,
+                  probe_matching_params::DeltaPt,
+                  probe_matching_params::DeltaX,
+                  probe_matching_params::DeltaY,
+                  probe_matching_params::DeltaEta,
+                  probe_matching_params::DeltaPhi,
+                  probe_matching_params::IsCorrectMatch);
+
+namespace mix_matching_params
+{
+// matching parameters
+DECLARE_SOA_COLUMN(DeltaPt, mDeltaPt, float);
+DECLARE_SOA_COLUMN(DeltaEta, mDeltaEta, float);
+DECLARE_SOA_COLUMN(DeltaPhi, mDeltaPhi, float);
+DECLARE_SOA_COLUMN(DeltaX, mDeltaX, float);
+DECLARE_SOA_COLUMN(DeltaY, mDeltaY, float);
+DECLARE_SOA_COLUMN(GMuonPt, mGMuonPt, float);
+DECLARE_SOA_COLUMN(GMuonEta, mGMuonEta, float);
+DECLARE_SOA_COLUMN(PairQ, mPairQ, int16_t);
+DECLARE_SOA_COLUMN(IsCorrectMatch, mIsCorrectMatch, bool);
+} // namespace mix_matching_params
+
+DECLARE_SOA_TABLE(MixMatchParams, "AOD", "MIXMATCHING",
+                  mix_matching_params::GMuonPt,
+                  mix_matching_params::GMuonEta,
+                  mix_matching_params::PairQ,
+                  mix_matching_params::DeltaPt,
+                  mix_matching_params::DeltaX,
+                  mix_matching_params::DeltaY,
+                  mix_matching_params::DeltaEta,
+                  mix_matching_params::DeltaPhi,
+                  mix_matching_params::IsCorrectMatch);
+
+namespace muon_pair
+{
+// matching parameters
+DECLARE_SOA_COLUMN(Mass, mMass, float);
+DECLARE_SOA_COLUMN(Pt, mPt, float);
+DECLARE_SOA_COLUMN(Rap, mRap, float);
+DECLARE_SOA_COLUMN(PairQ, mPairQ, int16_t);
+} // namespace muon_pair
+
+DECLARE_SOA_TABLE(MuonPair, "AOD", "MUONPAIR",
+                  muon_pair::PairQ,
+                  muon_pair::Mass,
+                  muon_pair::Pt,
+                  muon_pair::Rap);
+
+} // namespace o2::aod
diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h
@@ -47,7 +47,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(IsInelGt1, isInelGt1, //! is INEL > 1
                            [](int multPveta1) -> bool { return multPveta1 > 1; });
 
 // forward track counters
-DECLARE_SOA_COLUMN(MFTNtracks, mftNtracks, int); //!
+DECLARE_SOA_COLUMN(MFTNalltracks, mftNalltracks, int); //! overall counter, uses AO2D coll assoc
+DECLARE_SOA_COLUMN(MFTNtracks, mftNtracks, int);       //! reassigned, uses mult group software
 
 // MC
 DECLARE_SOA_COLUMN(MultMCFT0A, multMCFT0A, int);                       //!
@@ -113,7 +114,7 @@ DECLARE_SOA_TABLE(PVMults, "AOD", "PVMULT", //! Multiplicity from the PV contrib
                   mult::IsInelGt0<mult::MultNTracksPVeta1>,
                   mult::IsInelGt1<mult::MultNTracksPVeta1>);
 DECLARE_SOA_TABLE(MFTMults, "AOD", "MFTMULT", //! Multiplicity with MFT
-                  mult::MFTNtracks);
+                  mult::MFTNalltracks, mult::MFTNtracks);
 using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
 using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
 using FT0Mult = FT0Mults::iterator;

diff --git a/Common/TableProducer/CMakeLists.txt b/Common/TableProducer/CMakeLists.txt
@@ -134,3 +134,8 @@ o2physics_add_dpl_workflow(mftmch-matching-data
                     SOURCES match-mft-mch-data.cxx
                     PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
                     COMPONENT_NAME Analysis)
+
+o2physics_add_dpl_workflow(mftmch-matching-data-mc
+                    SOURCES match-mft-mch-data-mc.cxx
+                    PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::DetectorsBase O2Physics::AnalysisCCDB O2Physics::PWGDQCore O2Physics::EventFilteringUtils
+                    COMPONENT_NAME Analysis)