diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index a24006aed99..a81913c08f1 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -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", //! diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 9a88f78bb1e..3bd28ebeb9f 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -29,12 +29,13 @@ struct MultiplicityExtraTable { unsigned int randomSeed = 0; void init(InitContext& context) { - // empty for now + // empty for now } - using BCsWithRun3Matchings = soa::Join; + using BCsWithRun3Matchings = soa::Join; - 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; @@ -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);