Skip to content

Commit 76f547b

Browse files
ddobrigkalibuild
ddobrigk
and
alibuild
authored
[Common] mult framework cleanup + timestamps (AliceO2Group#8862)
Co-authored-by: ALICE Builder <[email protected]>
1 parent 01bf226 commit 76f547b

File tree

4 files changed

+61
-72
lines changed

4 files changed

+61
-72
lines changed

‎Common/DataModel/Multiplicity.h‎

Lines changed: 33 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -206,54 +206,42 @@ DECLARE_SOA_TABLE(PVMultZeqs, "AOD", "PVMULTZEQ", //! Multiplicity equalized for
206206
using MultZeqs = soa::Join<FV0MultZeqs, FT0MultZeqs, FDDMultZeqs, PVMultZeqs>;
207207
using MultZeq = MultZeqs::iterator;
208208

209-
namespace multBC
209+
namespace mult
210210
{
211-
DECLARE_SOA_COLUMN(MultBCFT0A, multBCFT0A, float); //!
212-
DECLARE_SOA_COLUMN(MultBCFT0C, multBCFT0C, float); //!
213-
DECLARE_SOA_COLUMN(MultBCFV0A, multBCFV0A, float); //!
214-
DECLARE_SOA_COLUMN(MultBCFDDA, multBCFDDA, float); //!
215-
DECLARE_SOA_COLUMN(MultBCFDDC, multBCFDDC, float); //!
216-
217-
DECLARE_SOA_COLUMN(MultBCZNA, multBCZNA, float); //!
218-
DECLARE_SOA_COLUMN(MultBCZNC, multBCZNC, float); //!
219-
DECLARE_SOA_COLUMN(MultBCZEM1, multBCZEM1, float); //!
220-
DECLARE_SOA_COLUMN(MultBCZEM2, multBCZEM2, float); //!
221-
DECLARE_SOA_COLUMN(MultBCZPA, multBCZPA, float); //!
222-
DECLARE_SOA_COLUMN(MultBCZPC, multBCZPC, float); //!
211+
// extra BC information
212+
DECLARE_SOA_COLUMN(MultTVX, multTVX, bool); //!
213+
DECLARE_SOA_COLUMN(MultFV0OrA, multFV0OrA, bool); //!
214+
DECLARE_SOA_COLUMN(MultV0triggerBits, multV0triggerBits, uint8_t); //!
215+
DECLARE_SOA_COLUMN(MultT0triggerBits, multT0triggerBits, uint8_t); //!
216+
DECLARE_SOA_COLUMN(MultFDDtriggerBits, multFDDtriggerBits, uint8_t); //!
217+
DECLARE_SOA_COLUMN(MultTriggerMask, multTriggerMask, uint64_t); //! CTP trigger mask
218+
DECLARE_SOA_COLUMN(MultCollidingBC, multCollidingBC, bool); //! CTP trigger mask
223219

224-
DECLARE_SOA_COLUMN(MultBCTVX, multBCTVX, bool); //!
225-
DECLARE_SOA_COLUMN(MultBCFV0OrA, multBCFV0OrA, bool); //!
226-
DECLARE_SOA_COLUMN(MultBCV0triggerBits, multBCV0triggerBits, uint8_t); //!
227-
DECLARE_SOA_COLUMN(MultBCT0triggerBits, multBCT0triggerBits, uint8_t); //!
228-
DECLARE_SOA_COLUMN(MultBCFDDtriggerBits, multBCFDDtriggerBits, uint8_t); //!
229-
DECLARE_SOA_COLUMN(MultBCTriggerMask, multBCTriggerMask, uint64_t); //! CTP trigger mask
230-
DECLARE_SOA_COLUMN(MultBCColliding, multBCColliding, bool); //! CTP trigger mask
231-
232-
DECLARE_SOA_COLUMN(MultBCFT0PosZ, multBCFT0PosZ, float); //! Position along Z computed with the FT0 information within the BC
233-
DECLARE_SOA_COLUMN(MultBCFT0PosZValid, multBCFT0PosZValid, bool); //! Validity of the position along Z computed with the FT0 information within the BC
234-
235-
} // namespace multBC
220+
DECLARE_SOA_COLUMN(MultFT0PosZ, multFT0PosZ, float); //! Position along Z computed with the FT0 information within the BC
221+
DECLARE_SOA_COLUMN(MultFT0PosZValid, multFT0PosZValid, bool); //! Validity of the position along Z computed with the FT0 information
222+
} // namespace mult
236223
DECLARE_SOA_TABLE(MultBCs, "AOD", "MULTBC", //!
237-
multBC::MultBCFT0A,
238-
multBC::MultBCFT0C,
239-
multBC::MultBCFT0PosZ,
240-
multBC::MultBCFT0PosZValid,
241-
multBC::MultBCFV0A,
242-
multBC::MultBCFDDA,
243-
multBC::MultBCFDDC,
244-
multBC::MultBCZNA,
245-
multBC::MultBCZNC,
246-
multBC::MultBCZEM1,
247-
multBC::MultBCZEM2,
248-
multBC::MultBCZPA,
249-
multBC::MultBCZPC,
250-
multBC::MultBCTVX,
251-
multBC::MultBCFV0OrA,
252-
multBC::MultBCV0triggerBits,
253-
multBC::MultBCT0triggerBits,
254-
multBC::MultBCFDDtriggerBits,
255-
multBC::MultBCTriggerMask,
256-
multBC::MultBCColliding,
224+
mult::MultFT0A,
225+
mult::MultFT0C,
226+
mult::MultFT0PosZ,
227+
mult::MultFT0PosZValid,
228+
mult::MultFV0A,
229+
mult::MultFDDA,
230+
mult::MultFDDC,
231+
mult::MultZNA,
232+
mult::MultZNC,
233+
mult::MultZEM1,
234+
mult::MultZEM2,
235+
mult::MultZPA,
236+
mult::MultZPC,
237+
mult::MultTVX,
238+
mult::MultFV0OrA,
239+
mult::MultV0triggerBits,
240+
mult::MultT0triggerBits,
241+
mult::MultFDDtriggerBits,
242+
mult::MultTriggerMask,
243+
mult::MultCollidingBC,
244+
timestamp::Timestamp,
257245
bc::Flags);
258246
using MultBC = MultBCs::iterator;
259247

‎Common/TableProducer/multiplicityExtraTable.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ struct MultiplicityExtraTable {
245245
tru(multFDDA), tru(multFDDC), tru(multZNA), tru(multZNC), tru(multZEM1),
246246
tru(multZEM2), tru(multZPA), tru(multZPC), Tvx, isFV0OrA,
247247
multFV0TriggerBits, multFT0TriggerBits, multFDDTriggerBits, multBCTriggerMask, collidingBC,
248+
bc.timestamp(),
248249
bc.flags());
249250
}
250251
}

‎Common/Tasks/centralityStudy.cxx‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -412,59 +412,59 @@ struct centralityStudy {
412412
// process BCs, calculate FT0C distribution
413413
// conditionals suggested by FIT team (Jacek O. et al)
414414
histos.fill(HIST("hBCSelection"), 0); // all BCs
415-
if (selectCollidingBCs && !multbc.multBCColliding())
415+
if (selectCollidingBCs && !multbc.multCollidingBC())
416416
return;
417417
histos.fill(HIST("hBCSelection"), 1); // colliding
418-
if (selectTVX && !multbc.multBCTVX())
418+
if (selectTVX && !multbc.multTVX())
419419
return;
420420
histos.fill(HIST("hBCSelection"), 2); // TVX
421-
if (selectFV0OrA && !multbc.multBCFV0OrA())
421+
if (selectFV0OrA && !multbc.multFV0OrA())
422422
return;
423423
histos.fill(HIST("hBCSelection"), 3); // FV0OrA
424424
if (vertexZwithT0 < 100.0f) {
425-
if (!multbc.multBCFT0PosZValid())
425+
if (!multbc.multFT0PosZValid())
426426
return;
427-
if (TMath::Abs(multbc.multBCFT0PosZ()) > vertexZwithT0)
427+
if (TMath::Abs(multbc.multFT0PosZ()) > vertexZwithT0)
428428
return;
429429
}
430430
histos.fill(HIST("hBCSelection"), 4); // FV0OrA
431431

432-
if (multbc.multBCFT0C() < upcRejection.maxFT0CforZNACselection &&
433-
multbc.multBCZNA() < upcRejection.minZNACsignal &&
434-
multbc.multBCZNC() < upcRejection.minZNACsignal) {
432+
if (multbc.multFT0C() < upcRejection.maxFT0CforZNACselection &&
433+
multbc.multZNA() < upcRejection.minZNACsignal &&
434+
multbc.multZNC() < upcRejection.minZNACsignal) {
435435
return;
436436
}
437-
if (multbc.multBCFT0C() < upcRejection.maxFT0CforFV0Aselection &&
438-
multbc.multBCFV0A() < upcRejection.minFV0Asignal) {
437+
if (multbc.multFT0C() < upcRejection.maxFT0CforFV0Aselection &&
438+
multbc.multFV0A() < upcRejection.minFV0Asignal) {
439439
return;
440440
}
441-
if (multbc.multBCFT0C() < upcRejection.maxFT0CforFDDAselection &&
442-
multbc.multBCFDDA() < upcRejection.minFDDAsignal) {
441+
if (multbc.multFT0C() < upcRejection.maxFT0CforFDDAselection &&
442+
multbc.multFDDA() < upcRejection.minFDDAsignal) {
443443
return;
444444
}
445445

446446
histos.fill(HIST("hBCSelection"), 5); // znac
447447

448448
// if we got here, we also finally fill the FT0C histogram, please
449-
histos.fill(HIST("hFT0C_BCs"), multbc.multBCFT0C() * scaleSignalFT0C);
449+
histos.fill(HIST("hFT0C_BCs"), multbc.multFT0C() * scaleSignalFT0C);
450450

451451
// ZN signals
452-
histos.fill(HIST("hZNAvsFT0C_BCs"), multbc.multBCFT0C() * scaleSignalFT0C, multbc.multBCZNA());
453-
histos.fill(HIST("hZNCvsFT0C_BCs"), multbc.multBCFT0C() * scaleSignalFT0C, multbc.multBCZNC());
454-
455-
histos.fill(HIST("hFT0M_BCs"), (multbc.multBCFT0A() + multbc.multBCFT0C()) * scaleSignalFT0M);
456-
histos.fill(HIST("hFV0A_BCs"), multbc.multBCFV0A() * scaleSignalFV0A);
457-
if (multbc.multBCFT0PosZValid()) {
458-
histos.fill(HIST("hFT0CvsPVz_BCs_All"), multbc.multBCFT0PosZ(), multbc.multBCFT0C() * scaleSignalFT0C);
459-
if (multbc.multBCFT0C() > minFT0CforVertexZ) {
460-
histos.fill(HIST("hFT0CvsPVz_BCs"), multbc.multBCFT0PosZ(), multbc.multBCFT0C() * scaleSignalFT0C);
452+
histos.fill(HIST("hZNAvsFT0C_BCs"), multbc.multFT0C() * scaleSignalFT0C, multbc.multZNA());
453+
histos.fill(HIST("hZNCvsFT0C_BCs"), multbc.multFT0C() * scaleSignalFT0C, multbc.multZNC());
454+
455+
histos.fill(HIST("hFT0M_BCs"), (multbc.multFT0A() + multbc.multFT0C()) * scaleSignalFT0M);
456+
histos.fill(HIST("hFV0A_BCs"), multbc.multFV0A() * scaleSignalFV0A);
457+
if (multbc.multFT0PosZValid()) {
458+
histos.fill(HIST("hFT0CvsPVz_BCs_All"), multbc.multFT0PosZ(), multbc.multFT0C() * scaleSignalFT0C);
459+
if (multbc.multFT0C() > minFT0CforVertexZ) {
460+
histos.fill(HIST("hFT0CvsPVz_BCs"), multbc.multFT0PosZ(), multbc.multFT0C() * scaleSignalFT0C);
461461
}
462462
}
463463

464464
if (multbc.has_ft0Mult()) {
465465
auto multco = multbc.ft0Mult_as<soa::Join<aod::Mults, aod::MultsExtra, aod::MultSelections, aod::CentFT0Cs, aod::MultsGlobal>>();
466-
if (multbc.multBCFT0PosZValid()) {
467-
histos.fill(HIST("hVertexZ_BCvsCO"), multco.multPVz(), multbc.multBCFT0PosZ());
466+
if (multbc.multFT0PosZValid()) {
467+
histos.fill(HIST("hVertexZ_BCvsCO"), multco.multPVz(), multbc.multFT0PosZ());
468468
}
469469
}
470470
}

‎Common/Tasks/multiplicityQa.cxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,9 @@ struct MultiplicityQa {
405405
void processFIT(aod::MultBCs const& multsdebug)
406406
{
407407
for (auto& mult : multsdebug) {
408-
histos.fill(HIST("multiplicityQa/hIsolatedFT0A"), mult.multBCFT0A());
409-
histos.fill(HIST("multiplicityQa/hIsolatedFT0C"), mult.multBCFT0C());
410-
histos.fill(HIST("multiplicityQa/hIsolatedFT0M"), mult.multBCFT0A() + mult.multBCFT0C());
408+
histos.fill(HIST("multiplicityQa/hIsolatedFT0A"), mult.multFT0A());
409+
histos.fill(HIST("multiplicityQa/hIsolatedFT0C"), mult.multFT0C());
410+
histos.fill(HIST("multiplicityQa/hIsolatedFT0M"), mult.multFT0A() + mult.multFT0C());
411411
}
412412
}
413413

0 commit comments

Comments
 (0)