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

Please consider the following formatting changes to #3598 #177

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Please consider the following formatting changes to #3598 #177

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
8 changes: 4 additions & 4 deletions Common/DataModel/Multiplicity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ using MultZeq = MultZeqs::iterator;

namespace multBC
{
DECLARE_SOA_COLUMN(MultBCFT0A, multBCFT0A, float); //!
DECLARE_SOA_COLUMN(MultBCFT0C, multBCFT0C, float); //!
DECLARE_SOA_COLUMN(MultBCFV0A, multBCFV0A, float); //!
DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool); //!
DECLARE_SOA_COLUMN(MultBCFT0A, multBCFT0A, float); //!
DECLARE_SOA_COLUMN(MultBCFT0C, multBCFT0C, float); //!
DECLARE_SOA_COLUMN(MultBCFV0A, multBCFV0A, float); //!
DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool); //!
DECLARE_SOA_COLUMN(MultBCFV0OrA, multBCFV0OrA, bool); //!
} // namespace multDebug
DECLARE_SOA_TABLE(MultsBC, "AOD", "MULTBC", //!
Expand Down
21 changes: 11 additions & 10 deletions Common/TableProducer/multiplicityExtraTable.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ struct MultiplicityExtraTable {
unsigned int randomSeed = 0;
void init(InitContext& context)
{
// empty for now
// empty for now
}

using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Timestamps,aod::Run3MatchedToBCSparse>;
using BCsWithRun3Matchings = soa::Join<aod::BCs, aod::Timestamps, aod::Run3MatchedToBCSparse>;

void process(BCsWithRun3Matchings::iterator const& bc, aod::FV0As const&, aod::FT0s const& ft0s, aod::FDDs const&){
void process(BCsWithRun3Matchings::iterator const& bc, aod::FV0As const&, aod::FT0s const& ft0s, aod::FDDs const&)
{
bool Tvx = false;
bool isFV0OrA = false;
float multFT0C = 0.f;
Expand All @@ -46,23 +47,23 @@ struct MultiplicityExtraTable {
std::bitset<8> triggers = ft0.triggerMask();
Tvx = triggers[o2::fit::Triggers::bitVertex];

//calculate T0 charge
// calculate T0 charge
for (auto amplitude : ft0.amplitudeA()) {
multFT0A += amplitude;
multFT0A += amplitude;
}
for (auto amplitude : ft0.amplitudeC()) {
multFT0C += amplitude;
multFT0C += amplitude;
}

if (bc.has_fv0a()){
if (bc.has_fv0a()) {
auto fv0 = bc.fv0a();
std::bitset<8> fV0Triggers = fv0.triggerMask();

for (auto amplitude : fv0.amplitude()) {
multFV0A += amplitude;
multFV0A += amplitude;
}
isFV0OrA= fV0Triggers[o2::fit::Triggers::bitA];
}//fv0
isFV0OrA = fV0Triggers[o2::fit::Triggers::bitA];
} // fv0
}

multBC(multFT0A, multFT0C, multFV0A, Tvx, isFV0OrA);
Expand Down
Loading