Skip to content

Commit 44c631d

Browse files
author
sjzhu0v0
committed
added basic for ft0c occupancy in DQ
1 parent ab7a449 commit 44c631d

File tree

10 files changed

+40
-8
lines changed

10 files changed

+40
-8
lines changed

‎PWGDQ/Core/HistogramsLibrary.cxx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
8888
hm->AddHistogram(histClass, "MultFDDA", "MultFDDA", false, 300, 0.0, 300.0, VarManager::kMultFDDA);
8989
hm->AddHistogram(histClass, "MultFDDC", "MultFDDC", false, 50, 0.0, 50.0, VarManager::kMultFDDC);
9090
hm->AddHistogram(histClass, "MultTracklets", "MultTracklets", false, 250, 0.0, 250.0, VarManager::kMultTracklets);
91-
hm->AddHistogram(histClass, "VtxNContribReal", "Vtx n contributors", false, 100, 0.0, 100.0, VarManager::kVtxNcontribReal);
91+
hm->AddHistogram(histClass, "VtxNContribReal", "Vtx n contributors", false, 200, 0.0, 200.0, VarManager::kVtxNcontribReal);
9292
hm->AddHistogram(histClass, "VtxNContrib", "Vtx n contributors", false, 100, 0.0, 100.0, VarManager::kVtxNcontrib);
93+
hm->AddHistogram(histClass, "MultNTracksPVeta1", "MultNTracksPVeta1", false, 200, 0, 200.0, VarManager::kMultNTracksPVeta1);
94+
hm->AddHistogram(histClass, "MultNTracksPVetaHalf", "MultNTracksPVetaHalf", false, 200, 0, 200.0, VarManager::kMultNTracksPVetaHalf);
9395
hm->AddHistogram(histClass, "MultTPC_MultFV0A", "MultTPC vs MultFV0A", false, 100, 0, 500.0, VarManager::kMultTPC, 100, 0, 500.0, VarManager::kMultFV0A);
9496
hm->AddHistogram(histClass, "MultTPC_MultFT0A", "MultTPC vs MultFT0A", false, 100, 0, 500.0, VarManager::kMultTPC, 100, 0, 200.0, VarManager::kMultFT0A);
9597
hm->AddHistogram(histClass, "MultTPC_MultFT0C", "MultTPC vs MultFT0C", false, 100, 0, 500.0, VarManager::kMultTPC, 100, 0, 300.0, VarManager::kMultFT0C);
@@ -180,6 +182,7 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
180182
}
181183
if (subGroupStr.Contains("occupancy")) {
182184
hm->AddHistogram(histClass, "ITStrackOccupancy", "ITStrackOccupancy", false, 200, 0.0, 20000.0, VarManager::kTrackOccupancyInTimeRange);
185+
hm->AddHistogram(histClass, "Ft0cOccupancy", "Ft0cOccupancy vs time from SOR", true, 10000, 0.0, 1000.0, VarManager::kTimeFromSOR, 10, 0.0, 20000.0, VarManager::kFT0COccupancyInTimeRange);
183186
}
184187
if (subGroupStr.Contains("mc")) {
185188
hm->AddHistogram(histClass, "MCVtxX_VtxX", "Vtx X (MC vs rec)", false, 100, -0.5, 0.5, VarManager::kVtxX, 100, -0.5, 0.5, VarManager::kMCVtxX);

‎PWGDQ/Core/VarManager.cxx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,14 @@ void VarManager::SetDefaultVarNames()
362362
fgVariableUnits[kMultNTracksTPCOnly] = "";
363363
fgVariableNames[kMultNTracksITSTPC] = "# ITS-TPC tracks in PV";
364364
fgVariableUnits[kMultNTracksITSTPC] = "";
365+
fgVariableNames[kMultNTracksPVeta1] = "# Mult Tracks PV |#eta| < 1";
366+
fgVariableUnits[kMultNTracksPVeta1] = "";
367+
fgVariableNames[kMultNTracksPVetaHalf] = "# Mult Tracks PV |#eta| < 0.5";
368+
fgVariableUnits[kMultNTracksPVetaHalf] = "";
365369
fgVariableNames[kTrackOccupancyInTimeRange] = "track occupancy in TPC drift time (PV tracks)";
366370
fgVariableUnits[kTrackOccupancyInTimeRange] = "";
371+
fgVariableNames[kFT0COccupancyInTimeRange] = "FT0C occupancy";
372+
fgVariableUnits[kFT0COccupancyInTimeRange] = "";
367373
fgVariableNames[kNoCollInTimeRangeStandard] = "track occupancy in TPC drift standart time";
368374
fgVariableUnits[kNoCollInTimeRangeStandard] = "";
369375
fgVariableNames[kMultAllTracksITSTPC] = "# ITS-TPC tracks";
@@ -1062,6 +1068,7 @@ void VarManager::SetDefaultVarNames()
10621068
fgVarNamesMap["kMultNTracksTPCOnly"] = kMultNTracksTPCOnly;
10631069
fgVarNamesMap["kMultNTracksITSTPC"] = kMultNTracksITSTPC;
10641070
fgVarNamesMap["kTrackOccupancyInTimeRange"] = kTrackOccupancyInTimeRange;
1071+
fgVarNamesMap["kFT0COccupancyInTimeRange"] = kFT0COccupancyInTimeRange;
10651072
fgVarNamesMap["kNoCollInTimeRangeStandard"] = kNoCollInTimeRangeStandard;
10661073
fgVarNamesMap["kMultAllTracksTPCOnly"] = kMultAllTracksTPCOnly;
10671074
fgVarNamesMap["kMultAllTracksITSTPC"] = kMultAllTracksITSTPC;

‎PWGDQ/Core/VarManager.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,10 @@ class VarManager : public TObject
237237
kMultNTracksITSOnly,
238238
kMultNTracksTPCOnly,
239239
kMultNTracksITSTPC,
240+
kMultNTracksPVeta1,
241+
kMultNTracksPVetaHalf,
240242
kTrackOccupancyInTimeRange,
243+
kFT0COccupancyInTimeRange,
241244
kNoCollInTimeRangeStandard,
242245
kMultAllTracksTPCOnly,
243246
kMultAllTracksITSTPC,
@@ -1404,6 +1407,9 @@ void VarManager::FillEvent(T const& event, float* values)
14041407
if (fgUsedVars[kTrackOccupancyInTimeRange]) {
14051408
values[kTrackOccupancyInTimeRange] = event.trackOccupancyInTimeRange();
14061409
}
1410+
if (fgUsedVars[kFT0COccupancyInTimeRange]) {
1411+
values[kFT0COccupancyInTimeRange] = event.ft0cOccupancyInTimeRange();
1412+
}
14071413
if (fgUsedVars[kNoCollInTimeRangeStandard]) {
14081414
values[kNoCollInTimeRangeStandard] = event.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard);
14091415
}
@@ -1512,9 +1518,12 @@ void VarManager::FillEvent(T const& event, float* values)
15121518
values[kMultNTracksITSOnly] = event.multNTracksITSOnly();
15131519
values[kMultNTracksTPCOnly] = event.multNTracksTPCOnly();
15141520
values[kMultNTracksITSTPC] = event.multNTracksITSTPC();
1521+
values[kMultNTracksPVeta1] = event.multNTracksPVeta1();
1522+
values[kMultNTracksPVetaHalf] = event.multNTracksPVetaHalf();
15151523
values[kMultAllTracksTPCOnly] = event.multAllTracksTPCOnly();
15161524
values[kMultAllTracksITSTPC] = event.multAllTracksITSTPC();
15171525
values[kTrackOccupancyInTimeRange] = event.trackOccupancyInTimeRange();
1526+
values[kFT0COccupancyInTimeRange] = event.ft0cOccupancyInTimeRange();
15181527
if constexpr ((fillMap & ReducedEventMultExtra) > 0) {
15191528
values[kNTPCcontribLongA] = event.nTPCoccupContribLongA();
15201529
values[kNTPCcontribLongC] = event.nTPCoccupContribLongC();

‎PWGDQ/DataModel/ReducedInfoTables.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ DECLARE_SOA_TABLE(ReducedEventsMultPV_000, "AOD", "REMULTPV", //! Multiplicity
139139
DECLARE_SOA_TABLE_VERSIONED(ReducedEventsMultPV_001, "AOD", "REMULTPV", 1, //! Multiplicity information for primary vertex
140140
mult::MultNTracksHasITS, mult::MultNTracksHasTPC, mult::MultNTracksHasTOF, mult::MultNTracksHasTRD,
141141
mult::MultNTracksITSOnly, mult::MultNTracksTPCOnly, mult::MultNTracksITSTPC,
142-
evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange);
142+
mult::MultNTracksPVeta1, mult::MultNTracksPVetaHalf, evsel::NumTracksInTimeRange, evsel::SumAmpFT0CInTimeRange);
143143

144144
using ReducedEventsMultPV = ReducedEventsMultPV_001;
145145

‎PWGDQ/TableProducer/tableMaker.cxx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ struct TableMaker {
498498
eventInfo(collision.globalIndex());
499499
if constexpr ((TEventFillMap & VarManager::ObjTypes::CollisionMultExtra) > 0) {
500500
multPV(collision.multNTracksHasITS(), collision.multNTracksHasTPC(), collision.multNTracksHasTOF(), collision.multNTracksHasTRD(),
501-
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
501+
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(),
502+
collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
502503
multAll(collision.multAllTracksTPCOnly(), collision.multAllTracksITSTPC(),
503504
0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0.0, 0.0, 0.0, 0.0);
504505
}
@@ -970,7 +971,8 @@ struct TableMaker {
970971
eventInfo(collision.globalIndex());
971972
if constexpr ((TEventFillMap & VarManager::ObjTypes::CollisionMultExtra) > 0) {
972973
multPV(collision.multNTracksHasITS(), collision.multNTracksHasTPC(), collision.multNTracksHasTOF(), collision.multNTracksHasTRD(),
973-
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
974+
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(),
975+
collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
974976
multAll(collision.multAllTracksTPCOnly(), collision.multAllTracksITSTPC(),
975977
0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0.0, 0.0, 0.0, 0.0);
976978
}

‎PWGDQ/TableProducer/tableMakerMC.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,8 @@ struct TableMakerMC {
468468
eventMClabels(fEventLabels.find(mcCollision.globalIndex())->second, collision.mcMask());
469469
if constexpr ((TEventFillMap & VarManager::ObjTypes::CollisionMultExtra) > 0) {
470470
multPV(collision.multNTracksHasITS(), collision.multNTracksHasTPC(), collision.multNTracksHasTOF(), collision.multNTracksHasTRD(),
471-
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
471+
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(),
472+
collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
472473
multAll(collision.multAllTracksTPCOnly(), collision.multAllTracksITSTPC(),
473474
0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0.0, 0.0, 0.0, 0.0);
474475
}

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,8 @@ struct TableMakerMC {
585585
eventInfo(collision.globalIndex());
586586
if constexpr ((TEventFillMap & VarManager::ObjTypes::CollisionMultExtra) > 0) {
587587
multPV(collision.multNTracksHasITS(), collision.multNTracksHasTPC(), collision.multNTracksHasTOF(), collision.multNTracksHasTRD(),
588-
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
588+
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(),
589+
collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
589590
multAll(collision.multAllTracksTPCOnly(), collision.multAllTracksITSTPC(),
590591
0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0.0, 0.0, 0.0, 0.0);
591592
}

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,8 @@ struct TableMaker {
893893
}
894894
if constexpr ((TEventFillMap & VarManager::ObjTypes::CollisionMultExtra) > 0) {
895895
multPV(collision.multNTracksHasITS(), collision.multNTracksHasTPC(), collision.multNTracksHasTOF(), collision.multNTracksHasTRD(),
896-
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
896+
collision.multNTracksITSOnly(), collision.multNTracksTPCOnly(), collision.multNTracksITSTPC(),
897+
collision.multNTracksPVeta1(), collision.multNTracksPVetaHalf(), collision.trackOccupancyInTimeRange(), collision.ft0cOccupancyInTimeRange());
897898

898899
multAll(collision.multAllTracksTPCOnly(), collision.multAllTracksITSTPC(),
899900
fOccup.oContribLongA[collision.globalIndex()], fOccup.oContribLongC[collision.globalIndex()],

‎PWGDQ/Tasks/ModelConverter.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct MultPVConverter000_001 {
3636
{
3737
for (const auto& r : multsPV) {
3838
multPV_001(r.multNTracksHasITS(), r.multNTracksHasTPC(), r.multNTracksHasTOF(), r.multNTracksHasTRD(),
39-
r.multNTracksITSOnly(), r.multNTracksTPCOnly(), r.multNTracksITSTPC(), r.trackOccupancyInTimeRange(), -999.);
39+
r.multNTracksITSOnly(), r.multNTracksTPCOnly(), r.multNTracksITSTPC(), -1.0f, -1.0f, r.trackOccupancyInTimeRange(), -999.0f);
4040
}
4141
}
4242

‎PWGDQ/Tasks/tableReader.cxx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,13 @@ struct AnalysisSameEventPairing {
14341434
VarManager::FillEvent<gkEventFillMap>(event, VarManager::fgValues);
14351435
runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMap, gkTrackFillMap>(event, tracks, tracks);
14361436
}
1437+
void processDecayToEESkimmedWithMult(soa::Filtered<MyEventsVtxCovSelectedMultExtra>::iterator const& event, soa::Filtered<MyBarrelTracksSelected> const& tracks)
1438+
{
1439+
// Reset the fValues array
1440+
VarManager::ResetValues(0, VarManager::kNVars);
1441+
VarManager::FillEvent<gkEventFillMapWithMultExtra>(event, VarManager::fgValues);
1442+
runSameEventPairing<true, VarManager::kDecayToEE, gkEventFillMapWithMultExtra, gkTrackFillMap>(event, tracks, tracks);
1443+
}
14371444
void processDecayToEESkimmedNoTwoProngFitter(soa::Filtered<MyEventsSelected>::iterator const& event, soa::Filtered<MyBarrelTracksSelected> const& tracks)
14381445
{
14391446
// Reset the fValues array
@@ -1585,6 +1592,7 @@ struct AnalysisSameEventPairing {
15851592
}
15861593

15871594
PROCESS_SWITCH(AnalysisSameEventPairing, processDecayToEESkimmed, "Run electron-electron pairing, with skimmed tracks", false);
1595+
PROCESS_SWITCH(AnalysisSameEventPairing, processDecayToEESkimmedWithMult, "Run electron-electron pairing, with skimmed tracks and multiplicity", false);
15881596
PROCESS_SWITCH(AnalysisSameEventPairing, processDecayToEESkimmedNoTwoProngFitter, "Run electron-electron pairing, with skimmed tracks but no two prong fitter", false);
15891597
PROCESS_SWITCH(AnalysisSameEventPairing, processDecayToEESkimmedWithCov, "Run electron-electron pairing, with skimmed covariant tracks", false);
15901598
PROCESS_SWITCH(AnalysisSameEventPairing, processDecayToEESkimmedWithCovNoTwoProngFitter, "Run electron-electron pairing, with skimmed covariant tracks but no two prong fitter", false);

0 commit comments

Comments
 (0)