Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Common/DataModel/FwdTrackReAlignTables.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@
using FwdTrkCovRealign = FwdTrksCovReAlign::iterator;
using FullFwdTracksRealign = soa::Join<FwdTracksReAlign, FwdTrksCovReAlign>;
using FullFwdTrackRealign = FullFwdTracksRealign::iterator;

// ambiguity table for realigned muons
namespace fwdtrackrealignambiguous
{
DECLARE_SOA_INDEX_COLUMN_FULL(FwdTrackRealign, fwdTrackRealign, int, FwdTracksReAlign, ""); //! FwdTracksReAlign index
DECLARE_SOA_SLICE_INDEX_COLUMN(BC, bc);

Check failure on line 80 in Common/DataModel/FwdTrackReAlignTables.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/o2-column]

Use UpperCamelCase for names of O2 columns and matching lowerCamelCase names for their getters.

} // namespace fwdtrackrealignambiguous

DECLARE_SOA_TABLE(AmbiguousFwdTrksReAlign, "AOD", "AMBIFWDREALIGN", //! Table for FwdTracksReAlign which are not associated with a collision
o2::soa::Index<>, fwdtrackrealignambiguous::FwdTrackRealignId, fwdtrackrealignambiguous::BCIdSlice);

using AmbiguousFwdTrkRealign = AmbiguousFwdTrksReAlign::iterator;
} // namespace o2::aod

#endif // COMMON_DATAMODEL_FWDTRACKREALIGNTABLES_H_
20 changes: 19 additions & 1 deletion Common/TableProducer/fwdtrackToCollisionAssociator.cxx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check failure on line 1 in Common/TableProducer/fwdtrackToCollisionAssociator.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[name/workflow-file]

Name of a workflow file must match the name of the main struct in it (without the PWG prefix). (Class implementation files should be in "Core" directories.)
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -16,6 +16,7 @@

#include "Common/Core/CollisionAssociation.h"
#include "Common/DataModel/CollisionAssociationTables.h"
#include "Common/DataModel/FwdTrackReAlignTables.h"

#include <Framework/AnalysisDataModel.h>
#include <Framework/AnalysisHelpers.h>
Expand Down Expand Up @@ -44,6 +45,7 @@
CollisionAssociation<false> collisionAssociator;

Preslice<FwdTracks> muonsPerCollisions = aod::fwdtrack::collisionId;
Preslice<FwdTracksReAlign> realignmuonsPerCollisions = aod::fwdtrack::collisionId;
Preslice<MFTTracks> mftsPerCollisions = aod::fwdtrack::collisionId;

void init(InitContext const&)
Expand All @@ -55,7 +57,7 @@
LOGP(fatal, "Exactly one process function between standard and time-based association should be enabled!");
}

if (!(doprocessMFTAssocWithTime || doprocessMFTStandardAssoc || doprocessFwdAssocWithTime || doprocessFwdStandardAssoc)) {
if (!(doprocessMFTAssocWithTime || doprocessMFTStandardAssoc || doprocessFwdAssocWithTime || doprocessFwdStandardAssoc || doprocessFwdRealignAssocWithTime || doprocessFwdRealignStandardAssoc)) {
LOGP(fatal, "At least one process function should be enabled!");
}

Expand Down Expand Up @@ -85,6 +87,22 @@
}
PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdStandardAssoc, "Use standard fwdtrack-to-collision association", false);

void processFwdRealignAssocWithTime(Collisions const& collisions,
FwdTracksReAlign const& muons,
AmbiguousFwdTrksReAlign const& ambiTracksFwd,
BCs const& bcs)
{
collisionAssociator.runAssocWithTime(collisions, muons, muons, ambiTracksFwd, bcs, fwdassociation, fwdreverseIndices);
}
PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdRealignAssocWithTime, "Use fwdrealigntrack-to-collision association based on time", false);

void processFwdRealignStandardAssoc(Collisions const& collisions,
FwdTracksReAlign const& muons)
{
collisionAssociator.runStandardAssoc(collisions, muons, realignmuonsPerCollisions, fwdassociation, fwdreverseIndices);
}
PROCESS_SWITCH(FwdTrackToCollisionAssociation, processFwdRealignStandardAssoc, "Use standard fwdrealigntrack-to-collision association", false);

void processMFTAssocWithTime(Collisions const& collisions,
MFTTracks const& tracks,
AmbiguousMFTTracks const& ambiguousTracks,
Expand Down
Loading