From 1ac29786eac0cd43474b163ba7aaa75567bba3d2 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Mon, 28 Nov 2022 18:58:15 +0100 Subject: [PATCH 1/5] Fix autodetect cascades, add qa histo --- PWGLF/TableProducer/strangenessbuilder.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/PWGLF/TableProducer/strangenessbuilder.cxx b/PWGLF/TableProducer/strangenessbuilder.cxx index 1e195555c89..73036bec9df 100644 --- a/PWGLF/TableProducer/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/strangenessbuilder.cxx @@ -97,6 +97,13 @@ using V0WithCascadeRefs = soa::Join; struct produceV0ToCascMap { Produces v0toCascMap; std::vector lCascadeArray; + + HistogramRegistry registry{ + "registry", + { + {"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}} + } + }; void process(aod::Collision const& collision, aod::Tracks const&, aod::V0s const& V0s, aod::Cascades const& cascades) { @@ -112,6 +119,7 @@ struct produceV0ToCascMap { lCascadeArray.push_back(it->second); } // Populate with the std::vector, please + registry.fill(HIST("hCascadesPerV0"), lCascadeArray.size()); v0toCascMap(lCascadeArray); } } @@ -250,6 +258,7 @@ struct strangenessBuilder { // - covariance matrices auto& workflows = context.services().get(); for (DeviceSpec const& device : workflows.devices) { + if( device.name.compare("cascade-initializer")==0 ) continue; //don't listen to the initializer for (auto const& input : device.inputs) { auto enable = [&input](const std::string tablename, Configurable& flag) { const std::string table = tablename; From 7c6b7ca39c5505be51c5f7cecfd9abf9d4dd4de9 Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Mon, 28 Nov 2022 17:59:08 +0000 Subject: [PATCH 2/5] Please consider the following formatting changes --- PWGLF/TableProducer/strangenessbuilder.cxx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/PWGLF/TableProducer/strangenessbuilder.cxx b/PWGLF/TableProducer/strangenessbuilder.cxx index 73036bec9df..51148bff15e 100644 --- a/PWGLF/TableProducer/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/strangenessbuilder.cxx @@ -97,13 +97,10 @@ using V0WithCascadeRefs = soa::Join; struct produceV0ToCascMap { Produces v0toCascMap; std::vector lCascadeArray; - + HistogramRegistry registry{ "registry", - { - {"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}} - } - }; + {{"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; void process(aod::Collision const& collision, aod::Tracks const&, aod::V0s const& V0s, aod::Cascades const& cascades) { @@ -258,7 +255,8 @@ struct strangenessBuilder { // - covariance matrices auto& workflows = context.services().get(); for (DeviceSpec const& device : workflows.devices) { - if( device.name.compare("cascade-initializer")==0 ) continue; //don't listen to the initializer + if (device.name.compare("cascade-initializer") == 0) + continue; // don't listen to the initializer for (auto const& input : device.inputs) { auto enable = [&input](const std::string tablename, Configurable& flag) { const std::string table = tablename; From 28ae892999af3ab0ead86283d93cb2011f3f2ea1 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 29 Nov 2022 05:33:00 -0300 Subject: [PATCH 3/5] Remove unnecessary track subscription --- PWGLF/TableProducer/strangenessbuilder.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PWGLF/TableProducer/strangenessbuilder.cxx b/PWGLF/TableProducer/strangenessbuilder.cxx index 51148bff15e..195d5066fb4 100644 --- a/PWGLF/TableProducer/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/strangenessbuilder.cxx @@ -102,7 +102,7 @@ struct produceV0ToCascMap { "registry", {{"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; - void process(aod::Collision const& collision, aod::Tracks const&, aod::V0s const& V0s, aod::Cascades const& cascades) + void process(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades) { std::multimap stdV0ToCascMap; typedef std::multimap::iterator stdV0ToCascMapIter; From edf1bd6851a09f333163549de0389328aa4a040e Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 29 Nov 2022 06:55:33 -0300 Subject: [PATCH 4/5] Add counter for initial cascades --- PWGLF/TableProducer/strangenessbuilder.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PWGLF/TableProducer/strangenessbuilder.cxx b/PWGLF/TableProducer/strangenessbuilder.cxx index 195d5066fb4..21c599c63fc 100644 --- a/PWGLF/TableProducer/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/strangenessbuilder.cxx @@ -100,12 +100,14 @@ struct produceV0ToCascMap { HistogramRegistry registry{ "registry", - {{"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; + {{"hCascadeCount", "hCascadeCount", {HistType::kTH1F, {{1, -0.5f, 0.5f}}}}, + {"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; void process(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades) { std::multimap stdV0ToCascMap; typedef std::multimap::iterator stdV0ToCascMapIter; + registry.fill(HIST("hCascadeCount"), 0.f, cascades.size() ); for (auto& cascade : cascades) { stdV0ToCascMap.insert(std::pair(cascade.v0().globalIndex(), cascade.globalIndex())); } From fd356d80b6a97ca77231ce13b04edac77585871e Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Tue, 29 Nov 2022 09:55:58 +0000 Subject: [PATCH 5/5] Please consider the following formatting changes --- PWGLF/TableProducer/strangenessbuilder.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PWGLF/TableProducer/strangenessbuilder.cxx b/PWGLF/TableProducer/strangenessbuilder.cxx index 21c599c63fc..a19e6593855 100644 --- a/PWGLF/TableProducer/strangenessbuilder.cxx +++ b/PWGLF/TableProducer/strangenessbuilder.cxx @@ -101,13 +101,13 @@ struct produceV0ToCascMap { HistogramRegistry registry{ "registry", {{"hCascadeCount", "hCascadeCount", {HistType::kTH1F, {{1, -0.5f, 0.5f}}}}, - {"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; + {"hCascadesPerV0", "hCascadesPerV0", {HistType::kTH1F, {{100, -0.5f, 99.5f}}}}}}; void process(aod::Collision const& collision, aod::V0s const& V0s, aod::Cascades const& cascades) { std::multimap stdV0ToCascMap; typedef std::multimap::iterator stdV0ToCascMapIter; - registry.fill(HIST("hCascadeCount"), 0.f, cascades.size() ); + registry.fill(HIST("hCascadeCount"), 0.f, cascades.size()); for (auto& cascade : cascades) { stdV0ToCascMap.insert(std::pair(cascade.v0().globalIndex(), cascade.globalIndex())); }