Skip to content
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

Jump to bottom

Common: change bc study table #7609

Merged
merged 2 commits into from
Sep 8, 2024
Merged

Common: change bc study table #7609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a856345
Common: change bc study table
ddobrigk Sep 8, 2024
8d2521b
Please consider the following formatting changes (#341)
alibuild Sep 8, 2024
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
29 changes: 18 additions & 11 deletions Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ DECLARE_SOA_COLUMN(MultNGlobalTracksPV, multNGlobalTracksPV, int);
DECLARE_SOA_COLUMN(MultNGlobalTracksPVeta1, multNGlobalTracksPVeta1, int);
DECLARE_SOA_COLUMN(MultNGlobalTracksPVetaHalf, multNGlobalTracksPVetaHalf, int);

DECLARE_SOA_INDEX_COLUMN(BC, bc);
DECLARE_SOA_INDEX_COLUMN(Collision, collision);

// even further QA: timing information for neighboring events
DECLARE_SOA_COLUMN(TimeToPrePrevious, timeToPrePrevious, float); //!
DECLARE_SOA_COLUMN(TimeToPrevious, timeToPrevious, float); //!
Expand Down Expand Up @@ -112,12 +109,6 @@ using BarrelMults = soa::Join<TrackletMults, TPCMults, PVMults>;
using Mults = soa::Join<BarrelMults, FV0Mults, FT0Mults, FDDMults, ZDCMults>;
using Mult = Mults::iterator;

// for QA purposes
DECLARE_SOA_TABLE(Mults2BC, "AOD", "MULTS2BC", //! Relate mult -> BC
o2::soa::Index<>, mult::BCId);
DECLARE_SOA_TABLE(BC2Mults, "AOD", "BC2MULTS", //! Relate BC -> mult
o2::soa::Index<>, mult::CollisionId);

DECLARE_SOA_TABLE(MultsExtra, "AOD", "MULTEXTRA", //!
mult::MultPVTotalContributors, mult::MultPVChi2, mult::MultCollisionTimeRes, mult::MultRunNumber, mult::MultPVz, mult::MultSel8,
mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
Expand Down Expand Up @@ -197,7 +188,7 @@ DECLARE_SOA_COLUMN(MultBCFT0PosZ, multBCFT0PosZ, float); //! Position a
DECLARE_SOA_COLUMN(MultBCFT0PosZValid, multBCFT0PosZValid, bool); //! Validity of the position along Z computed with the FT0 information within the BC

} // namespace multBC
DECLARE_SOA_TABLE(MultsBC, "AOD", "MULTBC", //!
DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //!
multBC::MultBCFT0A,
multBC::MultBCFT0C,
multBC::MultBCFT0PosZ,
Expand All @@ -218,7 +209,23 @@ DECLARE_SOA_TABLE(MultsBC, "AOD", "MULTBC", //!
multBC::MultBCFDDtriggerBits,
multBC::MultBCTriggerMask,
multBC::MultBCColliding);
using MultBC = MultsBC::iterator;
using MultBC = MultBCs::iterator;

// crosslinks
namespace mult
{
DECLARE_SOA_INDEX_COLUMN(MultBC, multBC);
}
namespace multBC
{
DECLARE_SOA_INDEX_COLUMN(Mult, mult);
}

// for QA purposes
DECLARE_SOA_TABLE(Mults2BC, "AOD", "MULTS2BC", //! Relate mult -> BC
o2::soa::Index<>, mult::MultBCId);
DECLARE_SOA_TABLE(BC2Mults, "AOD", "BC2MULTS", //! Relate BC -> mult
o2::soa::Index<>, multBC::MultId);

} // namespace o2::aod

Expand Down
2 changes: 1 addition & 1 deletion Common/TableProducer/multiplicityExtraTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ using BCPattern = std::bitset<o2::constants::lhc::LHCMaxBunches>;
const int nBCsPerOrbit = o2::constants::lhc::LHCMaxBunches;

struct MultiplicityExtraTable {
Produces<aod::MultsBC> multBC;
Produces<aod::MultBCs> multBC;
Produces<aod::MultNeighs> multNeigh;

Produces<aod::Mults2BC> mult2bc;
Expand Down
2 changes: 1 addition & 1 deletion Common/Tasks/centralityStudy.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ struct centralityStudy {
genericProcessCollision(collision);
}

void processBCs(aod::MultsBC::iterator const& multbc)
void processBCs(aod::MultBCs::iterator const& multbc)
{
// process BCs, calculate FT0C distribution
// conditionals suggested by FIT team (Jacek O. et al)
Expand Down
2 changes: 1 addition & 1 deletion Common/Tasks/multiplicityQa.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ struct MultiplicityQa {
histos.fill(HIST("multiplicityQa/h2dFT0MVsNchT0M"), nchFT0, biggestFT0);
}

void processFIT(aod::MultsBC const& multsdebug)
void processFIT(aod::MultBCs const& multsdebug)
{
for (auto& mult : multsdebug) {
histos.fill(HIST("multiplicityQa/hIsolatedFT0A"), mult.multBCFT0A());
Expand Down
Loading