From 4b4054f5c9f3ac629fd46d0f603db5ef609372f9 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 25 May 2024 12:24:30 +0200 Subject: [PATCH 1/5] Common: add downscale factor to BC table for studies --- Common/TableProducer/multiplicityExtraTable.cxx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index fcbacf7b80e..c5cccdf347b 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -34,6 +34,12 @@ struct MultiplicityExtraTable { Produces multBC; Produces multNeigh; + // Allow for downscaling of BC table for less space use in derived data + Configurable bcDownscaleFactor{"bcDownscaleFactor", 2, "Downscale factor for BC table (0: save nothing, 1: save all)"}; + + // needed for downscale + unsigned int randomSeed = 0; + o2::ccdb::CcdbApi ccdbApi; Service ccdb; BCPattern CollidingBunch; @@ -43,6 +49,8 @@ struct MultiplicityExtraTable { void init(InitContext&) { + randomSeed = static_cast(std::chrono::duration_cast (std::chrono::system_clock::now().time_since_epoch()).count()); + ccdbApi.init("http://alice-ccdb.cern.ch"); ccdb->setURL("http://alice-ccdb.cern.ch"); ccdb->setCaching(true); @@ -53,6 +61,11 @@ struct MultiplicityExtraTable { void processBCs(BCsWithRun3Matchings::iterator const& bc, aod::FV0As const&, aod::FT0s const&, aod::FDDs const&, aod::Zdcs const&) { + // downscale if requested to do so + if (bcDownscaleFactor < 1.f && (static_cast(rand_r(&randomSeed)) / static_cast(RAND_MAX)) > bcDownscaleFactor) { + return; + } + bool Tvx = false; bool isFV0OrA = false; float multFT0C = 0.f; From e7921eb2ee014d0e67152ea21331569b9975286a Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Sat, 25 May 2024 12:32:49 +0200 Subject: [PATCH 2/5] Please consider the following formatting changes (#301) --- Common/TableProducer/multiplicityExtraTable.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index c5cccdf347b..74ae7931a4d 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -49,7 +49,7 @@ struct MultiplicityExtraTable { void init(InitContext&) { - randomSeed = static_cast(std::chrono::duration_cast (std::chrono::system_clock::now().time_since_epoch()).count()); + randomSeed = static_cast(std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count()); ccdbApi.init("http://alice-ccdb.cern.ch"); ccdb->setURL("http://alice-ccdb.cern.ch"); From 677ee71988dd93d924a51ede36196f3cea6b40ad Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 25 May 2024 12:38:10 +0200 Subject: [PATCH 3/5] Fix megalinter error --- Common/TableProducer/multiplicityExtraTable.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 74ae7931a4d..075d2921163 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -8,6 +8,7 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +#include #include "Framework/ConfigParamSpec.h" #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" @@ -22,7 +23,6 @@ #include #include "DataFormatsParameters/GRPObject.h" #include "DataFormatsParameters/GRPLHCIFData.h" -#include using namespace o2; using namespace o2::framework; From 621869454217a579db1edccb342181628c8beec0 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 25 May 2024 12:46:37 +0200 Subject: [PATCH 4/5] Fix (weird) megalinter complaint --- Common/TableProducer/multiplicityExtraTable.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index 075d2921163..c3d99335a18 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -9,6 +9,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. #include +#include // megalinter thinks this is a C header... #include "Framework/ConfigParamSpec.h" #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" @@ -17,10 +18,8 @@ #include "Common/DataModel/Multiplicity.h" #include "DataFormatsFIT/Triggers.h" #include "TableHelper.h" - #include "CCDB/CcdbApi.h" #include "CommonDataFormat/BunchFilling.h" -#include #include "DataFormatsParameters/GRPObject.h" #include "DataFormatsParameters/GRPLHCIFData.h" From b5955b20feb00162e104aeb5b14e76bc13b4f9af Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Sat, 25 May 2024 12:51:01 +0200 Subject: [PATCH 5/5] Megalinter... --- Common/TableProducer/multiplicityExtraTable.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index c3d99335a18..f9cd6f0d424 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -8,8 +8,8 @@ // In applying this license CERN does not waive the privileges and immunities // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#include #include // megalinter thinks this is a C header... +#include #include "Framework/ConfigParamSpec.h" #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h"