Skip to content

add TPC multiplicity to multiplicity table #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgrosseo merged 5 commits into from
Nov 26, 2021
Merged

add TPC multiplicity to multiplicity table #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66f63d8
add tpc mult to multiplicity table
jezwilkinson Nov 25, 2021
3bd427c
correct expression for TPC mult
jezwilkinson Nov 25, 2021
91a46d8
set tpc mult only for run2 processing
jezwilkinson Nov 25, 2021
64c2c19
remove vestigial join
jezwilkinson Nov 25, 2021
54eb6a5
remove extra Tracks table subscription
jezwilkinson Nov 26, 2021
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
4 changes: 3 additions & 1 deletion Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ DECLARE_SOA_DYNAMIC_COLUMN(MultV0M, multV0M, //!
DECLARE_SOA_DYNAMIC_COLUMN(MultT0M, multT0M, //!
[](float multT0A, float multT0C) -> float { return multT0A + multT0C; });
DECLARE_SOA_COLUMN(MultTracklets, multTracklets, int);
DECLARE_SOA_COLUMN(MultTPC, multTPC, int);

} // namespace mult
DECLARE_SOA_TABLE(Mults, "AOD", "MULT", //!
Expand All @@ -36,7 +37,8 @@ DECLARE_SOA_TABLE(Mults, "AOD", "MULT", //!
mult::MultZNA, mult::MultZNC,
mult::MultV0M<mult::MultV0A, mult::MultV0C>,
mult::MultT0M<mult::MultT0A, mult::MultT0C>,
mult::MultTracklets);
mult::MultTracklets,
mult::MultTPC);
using Mult = Mults::iterator;
} // namespace o2::aod

Expand Down
18 changes: 10 additions & 8 deletions Common/TableProducer/multiplicityTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ void customize(std::vector<ConfigParamSpec>& workflowOptions)

struct MultiplicityTableTaskIndexed {
Produces<aod::Mults> mult;
Partition<aod::Tracks> run2tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));

void processRun2(aod::Run2MatchedSparse::iterator const& collision, aod::Tracks const& tracks, aod::BCs const&, aod::Zdcs const&, aod::FV0As const& fv0as, aod::FV0Cs const& fv0cs, aod::FT0s const& ft0s)
Partition<soa::Join<aod::Tracks, aod::TracksExtra>> run2tracklets = (aod::track::trackType == static_cast<uint8_t>(o2::aod::track::TrackTypeEnum::Run2Tracklet));
Partition<soa::Join<aod::Tracks, aod::TracksExtra>> tracksWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
void processRun2(aod::Run2MatchedSparse::iterator const& collision, soa::Join<aod::Tracks, aod::TracksExtra> const& tracksExtra, aod::BCs const&, aod::Zdcs const&, aod::FV0As const& fv0as, aod::FV0Cs const& fv0cs, aod::FT0s const& ft0s)
{
float multV0A = -1.f;
float multV0C = -1.f;
Expand All @@ -39,6 +39,7 @@ struct MultiplicityTableTaskIndexed {
float multZNA = -1.f;
float multZNC = -1.f;
int multTracklets = run2tracklets.size();
int multTPC = tracksWithTPC.size();

if (collision.has_fv0a()) {
auto v0a = collision.fv0a();
Expand Down Expand Up @@ -66,8 +67,9 @@ struct MultiplicityTableTaskIndexed {
multZNA = zdc.energyCommonZNA();
multZNC = zdc.energyCommonZNC();
}
LOGF(debug, "multV0A=%5.0f multV0C=%5.0f multT0A=%5.0f multT0C=%5.0f multZNA=%6.0f multZNC=%6.0f multTracklets=%i", multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets);
mult(multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets);

LOGF(debug, "multV0A=%5.0f multV0C=%5.0f multT0A=%5.0f multT0C=%5.0f multZNA=%6.0f multZNC=%6.0f multTracklets=%i multTPC=%i", multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets, multTPC);
mult(multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets, multTPC);
}
PROCESS_SWITCH(MultiplicityTableTaskIndexed, processRun2, "Produce Run 2 multiplicity tables", true);

Expand All @@ -81,7 +83,7 @@ struct MultiplicityTableTaskIndexed {
float multZNA = -1.f;
float multZNC = -1.f;
int multTracklets = -1;

int multTPC = -1;
const float* aAmplitudesA;
const float* aAmplitudesC;

Expand All @@ -100,8 +102,8 @@ struct MultiplicityTableTaskIndexed {
}
}

LOGF(debug, "multV0A=%5.0f multV0C=%5.0f multT0A=%5.0f multT0C=%5.0f multZNA=%6.0f multZNC=%6.0f multTracklets=%i", multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets);
mult(multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets);
LOGF(debug, "multV0A=%5.0f multV0C=%5.0f multT0A=%5.0f multT0C=%5.0f multZNA=%6.0f multZNC=%6.0f multTracklets=%i multTPC=%i", multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets, multTPC);
mult(multV0A, multV0C, multT0A, multT0C, multZNA, multZNC, multTracklets, multTPC);
}
}
PROCESS_SWITCH(MultiplicityTableTaskIndexed, processRun3, "Produce Run 3 multiplicity tables", false);
Expand Down