Skip to content

Commit aa71504

Browse files
committed
Please consider the following formatting changes
1 parent 29362f0 commit aa71504

4 files changed

Lines changed: 30 additions & 36 deletions

File tree

Common/DataModel/Multiplicity.h

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ DECLARE_SOA_COLUMN(FT0TriggerMask, ft0TriggerMask, uint8_t); //!
104104
DECLARE_SOA_COLUMN(MultFV0AOuter, multFV0AOuter, float); //! FV0 without innermost ring
105105
DECLARE_SOA_COLUMN(MultFT0AOuter, multFT0AOuter, float); //! FT0A without innermost ring
106106

107-
108107
} // namespace mult
109108
DECLARE_SOA_TABLE(FV0Mults, "AOD", "FV0MULT", //! Multiplicity with the FV0 detector
110109
mult::MultFV0A, mult::MultFV0C,
@@ -287,44 +286,42 @@ DECLARE_SOA_TABLE(MultBCs_000, "AOD", "MULTBC", //!
287286
bc::Flags);
288287

289288
DECLARE_SOA_TABLE_VERSIONED(MultBCs_001, "AOD", "MULTBC", 1, //!
290-
mult::MultFT0A,
291-
mult::MultFT0C,
292-
mult::MultFV0A,
293-
mult::MultFDDA,
294-
mult::MultFDDC,
295-
mult::MultZNA,
296-
mult::MultZNC,
297-
mult::MultZEM1,
298-
mult::MultZEM2,
299-
mult::MultZPA,
300-
mult::MultZPC,
301-
mult::MultFV0AOuter,
302-
mult::MultFT0AOuter);
289+
mult::MultFT0A,
290+
mult::MultFT0C,
291+
mult::MultFV0A,
292+
mult::MultFDDA,
293+
mult::MultFDDC,
294+
mult::MultZNA,
295+
mult::MultZNC,
296+
mult::MultZEM1,
297+
mult::MultZEM2,
298+
mult::MultZPA,
299+
mult::MultZPC,
300+
mult::MultFV0AOuter,
301+
mult::MultFT0AOuter);
303302

304303
DECLARE_SOA_TABLE(MultBcSel_000, "AOD", "MULTBCSEL", //! BC selection bits joinable with multBCs
305304
evsel::Selection);
306305

307306
DECLARE_SOA_TABLE_VERSIONED(MultBcSel_001, "AOD", "MULTBCSEL", 1, //! BC selection bits joinable with multBCs
308-
evsel::Selection,
309-
evsel::Rct,
310-
bc::Flags,
311-
timestamp::Timestamp,
312-
mult::MultFT0PosZ,
313-
mult::MultFT0PosZValid,
314-
mult::MultV0triggerBits,
315-
mult::MultT0triggerBits,
316-
mult::MultFDDtriggerBits,
317-
mult::MultTriggerMask,
318-
mult::MultCollidingBC,
319-
mult::MultTVX,
320-
mult::MultFV0OrA
321-
);
307+
evsel::Selection,
308+
evsel::Rct,
309+
bc::Flags,
310+
timestamp::Timestamp,
311+
mult::MultFT0PosZ,
312+
mult::MultFT0PosZValid,
313+
mult::MultV0triggerBits,
314+
mult::MultT0triggerBits,
315+
mult::MultFDDtriggerBits,
316+
mult::MultTriggerMask,
317+
mult::MultCollidingBC,
318+
mult::MultTVX,
319+
mult::MultFV0OrA);
322320

323321
using MultBCs = MultBCs_001;
324322
using MultBcSel = MultBcSel_001;
325323
using MultBC = MultBCs::iterator;
326324

327-
328325
// crosslinks
329326
namespace mult
330327
{

Common/TableProducer/Converters/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ o2physics_add_dpl_workflow(run2-tiny-to-full-pid
117117
o2physics_add_dpl_workflow(mult-bcs-converter
118118
SOURCES multBCsConverter.cxx
119119
PUBLIC_LINK_LIBRARIES O2Physics::AnalysisCore
120-
COMPONENT_NAME Analysis)
120+
COMPONENT_NAME Analysis)

Common/TableProducer/Converters/multBCsConverter.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ struct MultBCsConverter {
6161
multbc.multTriggerMask(),
6262
multbc.multCollidingBC(),
6363
multbc.multTVX(),
64-
multbc.multFV0OrA()
65-
);
64+
multbc.multFV0OrA());
6665
}
6766
}
6867
};

Common/TableProducer/multiplicityExtraTable.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ struct MultiplicityExtraTable {
276276
tru(multZPA),
277277
tru(multZPC),
278278
tru(multFV0AOuter),
279-
tru(multFT0AOuter)
280-
);
279+
tru(multFT0AOuter));
281280

282281
multBcSel(
283282
bc.selection_raw(),
@@ -292,8 +291,7 @@ struct MultiplicityExtraTable {
292291
multBCTriggerMask,
293292
collidingBC,
294293
Tvx,
295-
isFV0OrA
296-
);
294+
isFV0OrA);
297295
}
298296
}
299297

0 commit comments

Comments
 (0)