Skip to content

Commit 1f62d08

Browse files
authored
Merge branch 'AliceO2Group:master' into flow-ep-update
2 parents 42354ec + 531d17a commit 1f62d08

163 files changed

Lines changed: 20750 additions & 5145 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ALICE3/DataModel/OTFStrangeness.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ DECLARE_SOA_INDEX_COLUMN_FULL(PosTrack, posTrack, int, Tracks, "_Pos");
3737
DECLARE_SOA_INDEX_COLUMN_FULL(NegTrack, negTrack, int, Tracks, "_Neg"); //!
3838
DECLARE_SOA_INDEX_COLUMN_FULL(BachTrack, bachTrack, int, Tracks, "_Bach"); //!
3939

40+
DECLARE_SOA_INDEX_COLUMN(McParticle, mcParticle);
41+
4042
// topo vars
4143
DECLARE_SOA_COLUMN(DcaV0Daughters, dcaV0Daughters, float);
4244
DECLARE_SOA_COLUMN(DcaCascadeDaughters, dcaCascadeDaughters, float);
@@ -70,6 +72,9 @@ DECLARE_SOA_TABLE(UpgradeCascades, "AOD", "UPGRADECASCADES",
7072

7173
using UpgradeCascade = UpgradeCascades::iterator;
7274

75+
DECLARE_SOA_TABLE(A3CascadeMcLabels, "AOD", "A3CASCADEMCLABELS",
76+
o2::soa::Index<>, otfcascade::McParticleId);
77+
7378
namespace otfv0
7479
{
7580
DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
2+
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
3+
// All rights not expressly granted are reserved.
4+
//
5+
// This software is distributed under the terms of the GNU General Public
6+
// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
7+
//
8+
// In applying this license CERN does not waive the privileges and immunities
9+
// granted to it by virtue of its status as an Intergovernmental Organization
10+
// or submit itself to any jurisdiction.
11+
12+
///
13+
/// \file collisionExtra.h
14+
/// \author David Dobrigkeit Chinellato
15+
/// \since 11/05/2023
16+
/// \brief Table for ALICE 3 collision-related info
17+
///
18+
19+
#ifndef ALICE3_DATAMODEL_PREFILTERDILEPTON_H_
20+
#define ALICE3_DATAMODEL_PREFILTERDILEPTON_H_
21+
22+
// O2 includes
23+
#include <Framework/AnalysisDataModel.h>
24+
25+
namespace o2::aod
26+
{
27+
28+
namespace dileptonanalysisflags
29+
{
30+
// DECLARE_SOA_COLUMN(IsMCEventSelected, isMCEventSelected, int);
31+
DECLARE_SOA_COLUMN(IsEventCentSelected, isEventCentSelected, int);
32+
DECLARE_SOA_COLUMN(IsTrackPrefilter, isTrackPrefilter, int);
33+
} // namespace dileptonanalysisflags
34+
35+
// DECLARE_SOA_TABLE(EventMCCuts, "AOD", "EVENTMCCUTS", emanalysisflags::IsMCEventSelected);
36+
DECLARE_SOA_TABLE(DiEventCentCuts, "AOD", "DIEVENTCENTCUTS", dileptonanalysisflags::IsEventCentSelected);
37+
DECLARE_SOA_TABLE(DiTrackPrefilter, "AOD", "DITRACKPREFILTER", dileptonanalysisflags::IsTrackPrefilter);
38+
39+
} // namespace o2::aod
40+
41+
#endif // ALICE3_DATAMODEL_PREFILTERDILEPTON_H_

ALICE3/TableProducer/alice3strangenessFinder.cxx

Lines changed: 147 additions & 96 deletions
Large diffs are not rendered by default.

ALICE3/Tasks/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ o2physics_add_dpl_workflow(alice3-dilepton
3939
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
4040
COMPONENT_NAME Analysis)
4141

42+
o2physics_add_dpl_workflow(alice3-prefilterdilepton
43+
SOURCES alice3-prefilterdilepton.cxx
44+
PUBLIC_LINK_LIBRARIES O2::Framework O2Physics::AnalysisCore O2::FrameworkPhysicsSupport
45+
COMPONENT_NAME Analysis)
46+
4247
o2physics_add_dpl_workflow(alice3-taskcorrelationddbar
4348
SOURCES alice3-taskcorrelationDDbar.cxx
4449
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore

0 commit comments

Comments
 (0)