From 1356caf67141bea355c4c012a8dcb07bdf092875 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Tue, 17 Dec 2024 11:43:03 +0100 Subject: [PATCH 1/4] Common: add Run2BCInfos converter --- .../TableProducer/Converters/CMakeLists.txt | 5 ++ .../Converters/run2bcinfosConverter.cxx | 51 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 Common/TableProducer/Converters/run2bcinfosConverter.cxx diff --git a/Common/TableProducer/Converters/CMakeLists.txt b/Common/TableProducer/Converters/CMakeLists.txt index eda31568123..5217fe1c5c8 100644 --- a/Common/TableProducer/Converters/CMakeLists.txt +++ b/Common/TableProducer/Converters/CMakeLists.txt @@ -93,3 +93,8 @@ o2physics_add_dpl_workflow(trackqa-converter-002 SOURCES trackQA002Converter.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore COMPONENT_NAME Analysis) + +o2physics_add_dpl_workflow(run2bcinfos-converter + SOURCES run2bcinfosConverter.cxx + PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore + COMPONENT_NAME Analysis) \ No newline at end of file diff --git a/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/Common/TableProducer/Converters/run2bcinfosConverter.cxx new file mode 100644 index 00000000000..d9017235c4b --- /dev/null +++ b/Common/TableProducer/Converters/run2bcinfosConverter.cxx @@ -0,0 +1,51 @@ +// Copyright 2019-2020 CERN and copyright holders of ALICE O2. +// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders. +// All rights not expressly granted are reserved. +// +// This software is distributed under the terms of the GNU General Public +// License v3 (GPL Version 3), copied verbatim in the file "COPYING". +// +// 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. + +/// \file tracksExtraConverter.cxx +/// \brief Converts TracksExtra table from version 000 to 001 + +/// This task allows for the conversion of the TracksExtra table from version 000 to 001. +/// The conversion is needed because the table has been extended with the ITSClusterSize column +/// and the ITSClusterMap column is evaluated dynamically from it. +/// In the converter a dummy ITSClusterSize column is filled with overflows if a hit in the layer is present + +/// \author F.Mazzaschi + +#include "Framework/runDataProcessing.h" +#include "Framework/AnalysisTask.h" +#include "Framework/AnalysisDataModel.h" + +using namespace o2; +using namespace o2::framework; + +struct Run2BCInfosConverter { + Produces Run2TrackExtras_001; + void process(aod::Run2BCInfos_000 const& Run2BCInfos_000) + { + + for (const auto& entry : Run2BCInfos_000) { + Run2TrackExtras_001(entry.eventCuts(), + entry.triggerMaskNext50(), entry.l0TriggerInputMask(), + entry.spdClustersL0(), entry.spdClustersL1(), + entry.spdFiredChipsL0(), entry.spdFiredChipsL1(), + entry.spdFiredFastOrL0(), entry.spdFiredFastOrL1(), + entry.v0TriggerChargeA(), entry.v0TriggerChargeC(), + 0, 0); + } + } +}; + +WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) +{ + return WorkflowSpec{ + adaptAnalysisTask(cfgc) + }; +} From aa894c6ca07a47912a97a497e7ae3d1179875549 Mon Sep 17 00:00:00 2001 From: ALICE Builder Date: Thu, 19 Dec 2024 16:30:54 +0100 Subject: [PATCH 2/4] Please consider the following formatting changes (#368) --- Common/TableProducer/Converters/run2bcinfosConverter.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/Common/TableProducer/Converters/run2bcinfosConverter.cxx index d9017235c4b..619310732d6 100644 --- a/Common/TableProducer/Converters/run2bcinfosConverter.cxx +++ b/Common/TableProducer/Converters/run2bcinfosConverter.cxx @@ -46,6 +46,5 @@ struct Run2BCInfosConverter { WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) { return WorkflowSpec{ - adaptAnalysisTask(cfgc) - }; + adaptAnalysisTask(cfgc)}; } From 07977b7ba4d935c8cf380edb44ab01308fc12536 Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Thu, 19 Dec 2024 20:22:42 +0100 Subject: [PATCH 3/4] Update run2bcinfosConverter.cxx --- .../Converters/run2bcinfosConverter.cxx | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/Common/TableProducer/Converters/run2bcinfosConverter.cxx b/Common/TableProducer/Converters/run2bcinfosConverter.cxx index 619310732d6..6257d371824 100644 --- a/Common/TableProducer/Converters/run2bcinfosConverter.cxx +++ b/Common/TableProducer/Converters/run2bcinfosConverter.cxx @@ -9,16 +9,6 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file tracksExtraConverter.cxx -/// \brief Converts TracksExtra table from version 000 to 001 - -/// This task allows for the conversion of the TracksExtra table from version 000 to 001. -/// The conversion is needed because the table has been extended with the ITSClusterSize column -/// and the ITSClusterMap column is evaluated dynamically from it. -/// In the converter a dummy ITSClusterSize column is filled with overflows if a hit in the layer is present - -/// \author F.Mazzaschi - #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h" @@ -27,18 +17,18 @@ using namespace o2; using namespace o2::framework; struct Run2BCInfosConverter { - Produces Run2TrackExtras_001; + Produces Run2BCInfos_001; void process(aod::Run2BCInfos_000 const& Run2BCInfos_000) { for (const auto& entry : Run2BCInfos_000) { - Run2TrackExtras_001(entry.eventCuts(), - entry.triggerMaskNext50(), entry.l0TriggerInputMask(), - entry.spdClustersL0(), entry.spdClustersL1(), - entry.spdFiredChipsL0(), entry.spdFiredChipsL1(), - entry.spdFiredFastOrL0(), entry.spdFiredFastOrL1(), - entry.v0TriggerChargeA(), entry.v0TriggerChargeC(), - 0, 0); + Run2BCInfos_001(entry.eventCuts(), + entry.triggerMaskNext50(), entry.l0TriggerInputMask(), + entry.spdClustersL0(), entry.spdClustersL1(), + entry.spdFiredChipsL0(), entry.spdFiredChipsL1(), + entry.spdFiredFastOrL0(), entry.spdFiredFastOrL1(), + entry.v0TriggerChargeA(), entry.v0TriggerChargeC(), + 0, 0); } } }; From 3af4da3e6b8e245918e45255a328d71ca8b978bb Mon Sep 17 00:00:00 2001 From: ddobrigk Date: Thu, 19 Dec 2024 20:22:56 +0100 Subject: [PATCH 4/4] Update run2tracksExtraConverter.cxx --- .../Converters/run2tracksExtraConverter.cxx | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Common/TableProducer/Converters/run2tracksExtraConverter.cxx b/Common/TableProducer/Converters/run2tracksExtraConverter.cxx index 2cb11174ef4..28ae54c4367 100644 --- a/Common/TableProducer/Converters/run2tracksExtraConverter.cxx +++ b/Common/TableProducer/Converters/run2tracksExtraConverter.cxx @@ -9,16 +9,6 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -/// \file tracksExtraConverter.cxx -/// \brief Converts TracksExtra table from version 000 to 001 - -/// This task allows for the conversion of the TracksExtra table from version 000 to 001. -/// The conversion is needed because the table has been extended with the ITSClusterSize column -/// and the ITSClusterMap column is evaluated dynamically from it. -/// In the converter a dummy ITSClusterSize column is filled with overflows if a hit in the layer is present - -/// \author F.Mazzaschi - #include "Framework/runDataProcessing.h" #include "Framework/AnalysisTask.h" #include "Framework/AnalysisDataModel.h"