Skip to content

Please consider the following formatting changes to #7478 #6

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
nepeivodaRS merged 1 commit into from
Sep 3, 2024
Merged

Please consider the following formatting changes to #7478 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions PWGLF/DataModel/LFStrangenessTables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@ namespace straupc
DECLARE_SOA_COLUMN(IsUPC, isUPC, bool); //! is event upc-like

DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNA, energyCommonZNA, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(EnergyCommonZNC, energyCommonZNC, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(TotalFT0AmplitudeA, totalFT0AmplitudeA, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(TotalFT0AmplitudeC, totalFT0AmplitudeC, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(TotalFV0AmplitudeA, totalFV0AmplitudeA, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(TotalFDDAmplitudeA, totalFDDAmplitudeA, //!
[](float value) -> float { return value;});
[](float value) -> float { return value; });

DECLARE_SOA_DYNAMIC_COLUMN(TotalFDDAmplitudeC, totalFDDAmplitudeC, //!
[](float value) -> float { return value;});
}
[](float value) -> float { return value; });
} // namespace straupc

//______________________________________________________
// Collision declarations for derived data analysis
Expand Down Expand Up @@ -86,15 +86,15 @@ DECLARE_SOA_TABLE_VERSIONED(StraRawCents_003, "AOD", "STRARAWCENTS", 3, //!
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
mult::MultZEM2, mult::MultZPA, mult::MultZPC);
DECLARE_SOA_TABLE_VERSIONED(StraRawCents_004, "AOD", "STRARAWCENTS", 4, //! debug information
DECLARE_SOA_TABLE_VERSIONED(StraRawCents_004, "AOD", "STRARAWCENTS", 4, //! debug information
mult::MultFT0A, mult::MultFT0C, mult::MultFV0A, mult::MultFDDA, mult::MultFDDC, // FIT detectors
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
mult::MultPVTotalContributors, // number of PV contribs total
mult::MultNTracksGlobal, // global track multiplicities
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
mult::MultNTracksPVeta1, // track multiplicities with eta cut for INEL>0
mult::MultPVTotalContributors, // number of PV contribs total
mult::MultNTracksGlobal, // global track multiplicities
mult::MultNTracksITSTPC, // track multiplicities, PV contribs, no eta cut
mult::MultAllTracksTPCOnly, // TPConly track multiplicities, all, no eta cut
mult::MultAllTracksITSTPC, // ITSTPC track multiplicities, all, no eta cut
mult::MultZNA, mult::MultZNC, mult::MultZEM1, // ZDC signals
mult::MultZEM2, mult::MultZPA, mult::MultZPC,
evsel::NumTracksInTimeRange,
straupc::EnergyCommonZNA<mult::MultZNA>,
Expand All @@ -104,7 +104,7 @@ DECLARE_SOA_TABLE_VERSIONED(StraRawCents_004, "AOD", "STRARAWCENTS", 4, //!
straupc::TotalFV0AmplitudeA<mult::MultFV0A>,
straupc::TotalFDDAmplitudeA<mult::MultFDDA>,
straupc::TotalFDDAmplitudeC<mult::MultFDDC>); // add occupancy as extra
DECLARE_SOA_TABLE(StraEvSels, "AOD", "STRAEVSELS", //! event selections
DECLARE_SOA_TABLE(StraEvSels, "AOD", "STRAEVSELS", //! event selections
evsel::Sel8, evsel::Selection, straupc::IsUPC, udcollision::GapSide);
DECLARE_SOA_TABLE(StraFT0AQVs, "AOD", "STRAFT0AQVS", //! t0a Qvec
qvec::QvecFT0ARe, qvec::QvecFT0AIm, qvec::SumAmplFT0A);
Expand Down
4 changes: 2 additions & 2 deletions PWGLF/TableProducer/Strangeness/strangederivedbuilder.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ struct strangederivedbuilder {
}
}

void processCollisionsV0sOnly(soa::Join<aod::Collisions, aod::FT0Mults, aod::FDDMults, aod::FV0Mults, aod::PVMults, aod::ZDCMults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As, aod::EvSels, aod::MultsExtra, aod::MultsGlobal> const& collisions,
void processCollisionsV0sOnly(soa::Join<aod::Collisions, aod::FT0Mults, aod::FDDMults, aod::FV0Mults, aod::PVMults, aod::ZDCMults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As, aod::EvSels, aod::MultsExtra, aod::MultsGlobal> const& collisions,
UDCollisionsFull const& udCollisions, aod::V0Datas const& V0s, aod::BCsWithTimestamps const&)
{
for (const auto& collision : collisions) {
Expand Down Expand Up @@ -328,7 +328,7 @@ struct strangederivedbuilder {
}
}

void processCollisions(soa::Join<aod::Collisions, aod::FT0Mults, aod::FDDMults, aod::FV0Mults, aod::PVMults, aod::ZDCMults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As, aod::EvSels, aod::MultsExtra, aod::MultsGlobal> const& collisions,
void processCollisions(soa::Join<aod::Collisions, aod::FT0Mults, aod::FDDMults, aod::FV0Mults, aod::PVMults, aod::ZDCMults, aod::CentFT0Ms, aod::CentFT0As, aod::CentFT0Cs, aod::CentFV0As, aod::EvSels, aod::MultsExtra, aod::MultsGlobal> const& collisions,
UDCollisionsFull const& udCollisions, aod::V0Datas const& V0s, aod::CascDatas const& Cascades, aod::KFCascDatas const& KFCascades, aod::TraCascDatas const& TraCascades, aod::BCsWithTimestamps const&)
{
// create collision indices beforehand
Expand Down