Skip to content

Commit 8130ae2

Browse files
Adding extra zdc tables for SP calibrations (#6973)
Co-authored-by: Lucamicheletti93 <luca.mike93@gmail.com>
1 parent 57e9cc6 commit 8130ae2

4 files changed

Lines changed: 62 additions & 0 deletions

File tree

PWGDQ/Core/HistogramsLibrary.cxx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,19 @@ void o2::aod::dqhistograms::DefineHistograms(HistogramManager* hm, const char* h
154154
hm->AddHistogram(histClass, "IntercalibZNA_CentFT0C", "", false, 18, 0.0, 90.0, VarManager::kCentFT0C, 500, -50.0, 50.0, VarManager::KIntercalibZNA);
155155
hm->AddHistogram(histClass, "IntercalibZNC_CentFT0C", "", false, 18, 0.0, 90.0, VarManager::kCentFT0C, 500, -50.0, 50.0, VarManager::KIntercalibZNC);
156156

157+
hm->AddHistogram(histClass, "EnergyCommonZNA", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyCommonZNA);
158+
hm->AddHistogram(histClass, "EnergyCommonZNC", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyCommonZNC);
159+
160+
hm->AddHistogram(histClass, "EnergyZNA1", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNA1);
161+
hm->AddHistogram(histClass, "EnergyZNA2", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNA2);
162+
hm->AddHistogram(histClass, "EnergyZNA3", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNA3);
163+
hm->AddHistogram(histClass, "EnergyZNA4", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNA4);
164+
165+
hm->AddHistogram(histClass, "EnergyZNC1", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNC1);
166+
hm->AddHistogram(histClass, "EnergyZNC2", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNC2);
167+
hm->AddHistogram(histClass, "EnergyZNC3", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNC3);
168+
hm->AddHistogram(histClass, "EnergyZNC4", "", false, 90, 0.0, 90.0, VarManager::kCentFT0C, 2000, 0, 2000, VarManager::kEnergyZNC4);
169+
157170
hm->AddHistogram(histClass, "Q2X0A", "", false, 500, -10.0, 10.0, VarManager::kQ2X0A);
158171
hm->AddHistogram(histClass, "Q2Y0A", "", false, 500, -10.0, 10.0, VarManager::kQ2Y0A);
159172
hm->AddHistogram(histClass, "Q2X0B", "", false, 500, -10.0, 10.0, VarManager::kQ2X0B);

PWGDQ/Core/VarManager.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,14 @@ class VarManager : public TObject
343343
kEnergyCommonZNC,
344344
kEnergyCommonZPA,
345345
kEnergyCommonZPC,
346+
kEnergyZNA1,
347+
kEnergyZNA2,
348+
kEnergyZNA3,
349+
kEnergyZNA4,
350+
kEnergyZNC1,
351+
kEnergyZNC2,
352+
kEnergyZNC3,
353+
kEnergyZNC4,
346354
kTimeZNA,
347355
kTimeZNC,
348356
kTimeZPA,
@@ -3732,6 +3740,26 @@ void VarManager::FillSpectatorPlane(C const& collision, float* values)
37323740
}
37333741
float znaCommon = collision.energyCommonZNA() < 0 ? -1.f : collision.energyCommonZNA();
37343742
float zncCommon = collision.energyCommonZNC() < 0 ? -1.f : collision.energyCommonZNC();
3743+
float zpaCommon = collision.energyCommonZPA() < 0 ? -1.f : collision.energyCommonZPA();
3744+
float zpcCommon = collision.energyCommonZPC() < 0 ? -1.f : collision.energyCommonZPC();
3745+
3746+
// Store ZNA and ZNC energies for calibrations
3747+
values[kEnergyCommonZNA] = znaCommon;
3748+
values[kEnergyCommonZNC] = zncCommon;
3749+
values[kEnergyCommonZPA] = zpaCommon;
3750+
values[kEnergyCommonZPC] = zpcCommon;
3751+
values[kEnergyZNA1] = znaEnergy[0];
3752+
values[kEnergyZNA2] = znaEnergy[1];
3753+
values[kEnergyZNA3] = znaEnergy[2];
3754+
values[kEnergyZNA4] = znaEnergy[3];
3755+
values[kEnergyZNC1] = zncEnergy[0];
3756+
values[kEnergyZNC2] = zncEnergy[1];
3757+
values[kEnergyZNC3] = zncEnergy[2];
3758+
values[kEnergyZNC4] = zncEnergy[3];
3759+
values[kTimeZNA] = collision.timeZNA();
3760+
values[kTimeZNC] = collision.timeZNC();
3761+
values[kTimeZPA] = collision.timeZPA();
3762+
values[kTimeZPC] = collision.timeZPC();
37353763

37363764
constexpr float beamEne = 5.36 * 0.5;
37373765
constexpr float x[4] = {-1.75, 1.75, -1.75, 1.75};

PWGDQ/DataModel/ReducedInfoTables.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,14 @@ DECLARE_SOA_COLUMN(EnergyCommonZNA, energyCommonZNA, float); //!
192192
DECLARE_SOA_COLUMN(EnergyCommonZNC, energyCommonZNC, float); //!
193193
DECLARE_SOA_COLUMN(EnergyCommonZPA, energyCommonZPA, float); //!
194194
DECLARE_SOA_COLUMN(EnergyCommonZPC, energyCommonZPC, float); //!
195+
DECLARE_SOA_COLUMN(EnergyZNA1, energyZNA1, float); //!
196+
DECLARE_SOA_COLUMN(EnergyZNA2, energyZNA2, float); //!
197+
DECLARE_SOA_COLUMN(EnergyZNA3, energyZNA3, float); //!
198+
DECLARE_SOA_COLUMN(EnergyZNA4, energyZNA4, float); //!
199+
DECLARE_SOA_COLUMN(EnergyZNC1, energyZNC1, float); //!
200+
DECLARE_SOA_COLUMN(EnergyZNC2, energyZNC2, float); //!
201+
DECLARE_SOA_COLUMN(EnergyZNC3, energyZNC3, float); //!
202+
DECLARE_SOA_COLUMN(EnergyZNC4, energyZNC4, float); //!
195203
DECLARE_SOA_COLUMN(TimeZNA, timeZNA, float); //!
196204
DECLARE_SOA_COLUMN(TimeZNC, timeZNC, float); //!
197205
DECLARE_SOA_COLUMN(TimeZPA, timeZPA, float); //!
@@ -204,7 +212,12 @@ DECLARE_SOA_TABLE(ReducedZdcs, "AOD", "REDUCEDZDC", //! Event ZDC information
204212
reducedzdc::TimeZNA, reducedzdc::TimeZNC,
205213
reducedzdc::TimeZPA, reducedzdc::TimeZPC);
206214

215+
DECLARE_SOA_TABLE(ReducedZdcsExtra, "AOD", "REDUCEDZDCEXTRA", //! Event ZDC extra information
216+
reducedzdc::EnergyZNA1, reducedzdc::EnergyZNA2, reducedzdc::EnergyZNA3, reducedzdc::EnergyZNA4,
217+
reducedzdc::EnergyZNC1, reducedzdc::EnergyZNC2, reducedzdc::EnergyZNC3, reducedzdc::EnergyZNC4);
218+
207219
using ReducedZdc = ReducedZdcs::iterator;
220+
using ReducedZdcExtra = ReducedZdcsExtra::iterator;
208221

209222
namespace reducedtrack
210223
{

PWGDQ/Tasks/dqFlow.cxx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ struct DQEventQvector {
101101
Produces<ReducedEventsQvectorCentr> eventQvectorCentr;
102102
Produces<ReducedEventsRefFlow> eventRefFlow;
103103
Produces<ReducedEventsQvectorZN> eventQvectorZN;
104+
Produces<ReducedZdc> eventReducedZdc;
105+
Produces<ReducedZdcExtra> eventReducedZdcExtra;
104106

105107
Configurable<std::string> fConfigEventCuts{"cfgEventCuts", "eventStandard", "Event selection"};
106108
Configurable<bool> fConfigQA{"cfgQA", true, "If true, fill QA histograms"};
@@ -481,8 +483,14 @@ struct DQEventQvector {
481483
collision.sumAmplFT0A(), collision.sumAmplFT0C(), collision.sumAmplFT0M(), collision.sumAmplFV0A(), collision.nTrkBPos(), collision.nTrkBNeg());
482484
if (bc.has_zdc()) {
483485
eventQvectorZN(VarManager::fgValues[VarManager::kQ1ZNAX], VarManager::fgValues[VarManager::kQ1ZNAY], VarManager::fgValues[VarManager::kQ1ZNCX], VarManager::fgValues[VarManager::kQ1ZNCY]);
486+
eventReducedZdc(VarManager::fgValues[VarManager::kEnergyCommonZNA], VarManager::fgValues[VarManager::kEnergyCommonZNC], VarManager::fgValues[VarManager::kEnergyCommonZPA], VarManager::fgValues[VarManager::kEnergyCommonZPC],
487+
VarManager::fgValues[VarManager::kTimeZNA], VarManager::fgValues[VarManager::kTimeZNC], VarManager::fgValues[VarManager::kTimeZPA], VarManager::fgValues[VarManager::kTimeZPC]);
488+
eventReducedZdcExtra(VarManager::fgValues[VarManager::kEnergyZNA1], VarManager::fgValues[VarManager::kEnergyZNA2], VarManager::fgValues[VarManager::kEnergyZNA3], VarManager::fgValues[VarManager::kEnergyZNA4],
489+
VarManager::fgValues[VarManager::kEnergyZNC1], VarManager::fgValues[VarManager::kEnergyZNC2], VarManager::fgValues[VarManager::kEnergyZNC3], VarManager::fgValues[VarManager::kEnergyZNC4]);
484490
} else {
485491
eventQvectorZN(-999, -999, -999, -999);
492+
eventReducedZdc(-999, -999, -999, -999, -999, -999, -999, -999);
493+
eventReducedZdcExtra(-999, -999, -999, -999, -999, -999, -999, -999);
486494
}
487495
}
488496
}

0 commit comments

Comments
 (0)