From aa71504df1b4a1749faf3a15deef60fcce2d7dac Mon Sep 17 00:00:00 2001 From: ALICE Action Bot Date: Wed, 3 Jun 2026 08:39:10 +0000 Subject: [PATCH] Please consider the following formatting changes --- Common/DataModel/Multiplicity.h | 55 +++++++++---------- .../TableProducer/Converters/CMakeLists.txt | 2 +- .../Converters/multBCsConverter.cxx | 3 +- .../TableProducer/multiplicityExtraTable.cxx | 6 +- 4 files changed, 30 insertions(+), 36 deletions(-) diff --git a/Common/DataModel/Multiplicity.h b/Common/DataModel/Multiplicity.h index d103ac2032c..c2bdd2c6a75 100644 --- a/Common/DataModel/Multiplicity.h +++ b/Common/DataModel/Multiplicity.h @@ -104,7 +104,6 @@ DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //! DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //! FV0 without innermost ring DECLARE_SOA_COLUMN(MultFT0AOuter, multFT0AOuter, float); //! FT0A without innermost ring - } // namespace mult DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector mult::MultFV0A, mult::MultFV0C, @@ -287,44 +286,42 @@ DECLARE_SOA_TABLE(MultBCs_000, "AOD", "MULTBC", //! bc::Flags); DECLARE_SOA_TABLE_VERSIONED(MultBCs_001, "AOD", "MULTBC", 1, //! - mult::MultFT0A, - mult::MultFT0C, - mult::MultFV0A, - mult::MultFDDA, - mult::MultFDDC, - mult::MultZNA, - mult::MultZNC, - mult::MultZEM1, - mult::MultZEM2, - mult::MultZPA, - mult::MultZPC, - mult::MultFV0AOuter, - mult::MultFT0AOuter); + mult::MultFT0A, + mult::MultFT0C, + mult::MultFV0A, + mult::MultFDDA, + mult::MultFDDC, + mult::MultZNA, + mult::MultZNC, + mult::MultZEM1, + mult::MultZEM2, + mult::MultZPA, + mult::MultZPC, + mult::MultFV0AOuter, + mult::MultFT0AOuter); DECLARE_SOA_TABLE(MultBcSel_000, "AOD", "MULTBCSEL", //! BC selection bits joinable with multBCs evsel::Selection); DECLARE_SOA_TABLE_VERSIONED(MultBcSel_001, "AOD", "MULTBCSEL", 1, //! BC selection bits joinable with multBCs - evsel::Selection, - evsel::Rct, - bc::Flags, - timestamp::Timestamp, - mult::MultFT0PosZ, - mult::MultFT0PosZValid, - mult::MultV0triggerBits, - mult::MultT0triggerBits, - mult::MultFDDtriggerBits, - mult::MultTriggerMask, - mult::MultCollidingBC, - mult::MultTVX, - mult::MultFV0OrA - ); + evsel::Selection, + evsel::Rct, + bc::Flags, + timestamp::Timestamp, + mult::MultFT0PosZ, + mult::MultFT0PosZValid, + mult::MultV0triggerBits, + mult::MultT0triggerBits, + mult::MultFDDtriggerBits, + mult::MultTriggerMask, + mult::MultCollidingBC, + mult::MultTVX, + mult::MultFV0OrA); using MultBCs = MultBCs_001; using MultBcSel = MultBcSel_001; using MultBC = MultBCs::iterator; - // crosslinks namespace mult { diff --git a/Common/TableProducer/Converters/CMakeLists.txt b/Common/TableProducer/Converters/CMakeLists.txt index 89b381277bc..a8b14efaca3 100644 --- a/Common/TableProducer/Converters/CMakeLists.txt +++ b/Common/TableProducer/Converters/CMakeLists.txt @@ -117,4 +117,4 @@ o2physics_add_dpl_workflow(run2-tiny-to-full-pid o2physics_add_dpl_workflow(mult-bcs-converter SOURCES multBCsConverter.cxx PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore - COMPONENT_NAME Analysis) \ No newline at end of file + COMPONENT_NAME Analysis) diff --git a/Common/TableProducer/Converters/multBCsConverter.cxx b/Common/TableProducer/Converters/multBCsConverter.cxx index ae91a6a746b..991bff71c13 100644 --- a/Common/TableProducer/Converters/multBCsConverter.cxx +++ b/Common/TableProducer/Converters/multBCsConverter.cxx @@ -61,8 +61,7 @@ struct MultBCsConverter { multbc.multTriggerMask(), multbc.multCollidingBC(), multbc.multTVX(), - multbc.multFV0OrA() - ); + multbc.multFV0OrA()); } } }; diff --git a/Common/TableProducer/multiplicityExtraTable.cxx b/Common/TableProducer/multiplicityExtraTable.cxx index ed75317ba63..488ec9a1917 100644 --- a/Common/TableProducer/multiplicityExtraTable.cxx +++ b/Common/TableProducer/multiplicityExtraTable.cxx @@ -276,8 +276,7 @@ struct MultiplicityExtraTable { tru(multZPA), tru(multZPC), tru(multFV0AOuter), - tru(multFT0AOuter) - ); + tru(multFT0AOuter)); multBcSel( bc.selection_raw(), @@ -292,8 +291,7 @@ struct MultiplicityExtraTable { multBCTriggerMask, collidingBC, Tvx, - isFV0OrA - ); + isFV0OrA); } }