Skip to content
Open
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
1 change: 1 addition & 0 deletions ALICE3/DataModel/ReducedTablesAlice3.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "ALICE3/DataModel/OTFTOF.h"
#include "ALICE3/DataModel/collisionAlice3.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/Multiplicity.h"

#include <Framework/ASoA.h>
#include <Framework/AnalysisDataModel.h>
Expand All @@ -38,9 +39,9 @@
namespace reducedeventalice3
{
DECLARE_SOA_COLUMN(MultDensity, multDensity, float);
DECLARE_SOA_COLUMN(MCPosX, mcPosX, float); //! MC event position X

Check failure on line 42 in ALICE3/DataModel/ReducedTablesAlice3.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.
DECLARE_SOA_COLUMN(MCPosY, mcPosY, float); //! MC event position Y

Check failure on line 43 in ALICE3/DataModel/ReducedTablesAlice3.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.
DECLARE_SOA_COLUMN(MCPosZ, mcPosZ, float); //! MC event position Z

Check failure on line 44 in ALICE3/DataModel/ReducedTablesAlice3.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 reducedeventalice3

DECLARE_SOA_TABLE_STAGED(ReA3Events, "REA3EVENT", //! Main event information table
Expand Down Expand Up @@ -72,7 +73,7 @@
namespace reducedtrackalice3
{
// basic track information
DECLARE_SOA_INDEX_COLUMN(ReA3Event, rea3event); //!

Check failure on line 76 in ALICE3/DataModel/ReducedTablesAlice3.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.
DECLARE_SOA_INDEX_COLUMN(Track, track); //!
// ---- flags reserved for storing various information during filtering
DECLARE_SOA_BITMAP_COLUMN(FilteringFlags, filteringFlags, 64); //!
Expand Down Expand Up @@ -223,8 +224,8 @@

namespace reducedA3track_association
{
DECLARE_SOA_INDEX_COLUMN(ReA3Event, reA3event); //! ReducedEvent index

Check failure on line 227 in ALICE3/DataModel/ReducedTablesAlice3.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.
DECLARE_SOA_INDEX_COLUMN(ReA3Track, reA3track); //! ReducedTrack index

Check failure on line 228 in ALICE3/DataModel/ReducedTablesAlice3.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 reducedA3track_association

DECLARE_SOA_TABLE(ReducedA3TracksAssoc, "AOD", "REA3ASSOC", //! Table for reducedtrack-to-reducedcollision association
Expand Down
2 changes: 1 addition & 1 deletion ALICE3/TableProducer/alice3DqTableMaker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ struct Alice3DqTableMaker {
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(3.0, static_cast<float>(o2::aod::evsel::kNsel));

// Fill historams after event cuts
fHistMan->FillHistClass("Event_AfterCuts", VarManager::fgValues);
fHistMan->FillHistClass("Event_AfterCuts", dqefficiency_helpers::varValues());

event(collision.posX(), collision.posY(), collision.posZ(), collision.numContrib(),
collision.collisionTime(), collision.collisionTimeRes(), collision.multDensity());
Expand Down
21 changes: 18 additions & 3 deletions ALICE3/Tasks/alice3DqEfficiency.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1920,15 +1920,30 @@ struct Alice3DqEfficiencyAnalysisAsymmetricPairing {
}

// Function to run same event pairing with asymmetric pairs (e.g. kaon-pion)
void runAsymmetricPairing(MyEventsVtxCovSelected const& events, PresliceUnsorted<MyBarrelAssocs>& preslice, MyBarrelAssocs const& /*assocs*/, MyBarrelTracksWithCovWithAmbiguities const& /*tracks*/, ReA3MCEvents const& /*mcEvents*/, ReA3MCTracks const& /*mcTracks*/)
void runAsymmetricPairing(MyEventsVtxCovSelected const& events, PresliceUnsorted<MyBarrelAssocs>& preslice, MyBarrelAssocs const& assocs, MyBarrelTracksWithCovWithAmbiguities const& /*tracks*/, ReA3MCEvents const& /*mcEvents*/, ReA3MCTracks const& /*mcTracks*/)
{
fPairCount.clear();

int sign1 = 0;
int sign2 = 0;
uint32_t mcDecision = 0;
ditrackList.reserve(1);
ditrackExtraList.reserve(1);

int64_t reserveSize = 0;
for (auto const& event : events) {
if (event.isEventSelected_bit(0)) {
auto groupedAssocs = assocs.sliceBy(preslice, event.globalIndex());
size_t nGood = 0;
for (auto const& t : groupedAssocs) {
if (t.isBarrelSelected_raw() > 0u) {
nGood++;
}
}
reserveSize += nGood * (nGood - 1) / 2;
}
}

ditrackList.reserve(reserveSize);
ditrackExtraList.reserve(reserveSize);

for (const auto& event : events) {
if (!event.isEventSelected_bit(0)) {
Expand Down
Loading