From 7ebaf5906e624b36d01245b96dd82ebea158ca12 Mon Sep 17 00:00:00 2001 From: Jeremy Wilkinson Date: Fri, 26 Nov 2021 14:08:46 +0100 Subject: [PATCH 1/2] collision loop -> iterator in processRun3 --- Common/TableProducer/multiplicityTable.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Common/TableProducer/multiplicityTable.cxx b/Common/TableProducer/multiplicityTable.cxx index a32e3e6fcb8..f566101adbc 100644 --- a/Common/TableProducer/multiplicityTable.cxx +++ b/Common/TableProducer/multiplicityTable.cxx @@ -73,17 +73,16 @@ struct MultiplicityTableTaskIndexed { } PROCESS_SWITCH(MultiplicityTableTaskIndexed, processRun2, "Produce Run 2 multiplicity tables", true); - void processRun3(soa::Join const& collisions, aod::Tracks const& tracks, aod::BCs const& bcs, aod::Zdcs const& zdcs, aod::FV0As const& fv0as, aod::FT0s const& ft0s) + void processRun3(soa::Join::iterator const& collision, soa::Join const& tracksExtra, aod::BCs const& bcs, aod::Zdcs const& zdcs, aod::FV0As const& fv0as, aod::FT0s const& ft0s) { - for (auto& collision : collisions) { float multV0A = -1.f; float multV0C = -1.f; float multT0A = -1.f; float multT0C = -1.f; float multZNA = -1.f; float multZNC = -1.f; - int multTracklets = -1; - int multTPC = -1; + int multTracklets = -1; + int multTPC = tracksWithTPC.size(); const float* aAmplitudesA; const float* aAmplitudesC; @@ -104,7 +103,6 @@ struct MultiplicityTableTaskIndexed { 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); }; From 7add93e9716766359b0c7251550093b3a2d072f7 Mon Sep 17 00:00:00 2001 From: Jeremy Wilkinson Date: Fri, 26 Nov 2021 14:21:02 +0100 Subject: [PATCH 2/2] trailing whitespace --- Common/TableProducer/multiplicityTable.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TableProducer/multiplicityTable.cxx b/Common/TableProducer/multiplicityTable.cxx index f566101adbc..9d66a04de38 100644 --- a/Common/TableProducer/multiplicityTable.cxx +++ b/Common/TableProducer/multiplicityTable.cxx @@ -81,7 +81,7 @@ struct MultiplicityTableTaskIndexed { float multT0C = -1.f; float multZNA = -1.f; float multZNC = -1.f; - int multTracklets = -1; + int multTracklets = -1; int multTPC = tracksWithTPC.size(); const float* aAmplitudesA; const float* aAmplitudesC;