Skip to content

Commit a329771

Browse files
author
Sabrina Hernandez
committed
Fixed linter warnings for FlowZDCtask
1 parent 5f80ec2 commit a329771

File tree

1 file changed

+122
-35
lines changed

1 file changed

+122
-35
lines changed

‎PWGCF/Flow/Tasks/FlowZDCtask.cxx‎

Lines changed: 122 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ using namespace o2::framework;
4141
using namespace o2::framework::expressions;
4242
using namespace o2::aod::mult;
4343
using ColEvSels = soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs, aod::Mults>;
44-
using aodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>>;
45-
using aodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra>>;
44+
using AodCollisions = soa::Filtered<soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Cs>>;
45+
using AodTracks = soa::Filtered<soa::Join<aod::Tracks, aod::TrackSelection, aod::TracksExtra>>;
4646
using BCsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
47-
using aodZDCs = soa::Join<aod::ZDCMults, aod::Zdcs>;
47+
using AodZDCs = soa::Join<aod::ZDCMults, aod::Zdcs>;
4848

4949
#define O2_DEFINE_CONFIGURABLE(NAME, TYPE, DEFAULT, HELP) Configurable<TYPE> NAME{#NAME, DEFAULT, HELP};
5050

@@ -63,56 +63,68 @@ struct FlowZDCtask {
6363

6464
Configurable<int> nBinsPt{"nBinsPt", 100, "N bins in pT histo"};
6565
Configurable<int> eventSelection{"eventSelection", 1, "event selection"};
66-
Configurable<float> MaxZP{"MaxZP", 3099.5, "Max ZP signal"};
66+
Configurable<float> maxZp{"maxZP", 3099.5, "Max ZP signal"};
6767
Configurable<float> vtxCut{"vtxCut", 10.0, "Z vertex cut"};
6868
Configurable<float> etaCut{"etaCut", 0.8, "Eta cut"};
6969
Configurable<float> etaGap{"etaGap", 0.5, "Eta gap"};
7070
Configurable<float> minPt{"minPt", 0.2, "Minimum pt"};
7171
Configurable<float> maxPt{"maxPt", 20.0, "Maximum pt"};
72-
Configurable<float> MaxZEM{"MaxZEM", 3099.5, "Max ZEM signal"};
72+
Configurable<float> maxZem{"maxZem", 3099.5, "Max ZEM signal"};
7373
// for ZDC info and analysis
7474
Configurable<int> nBinsADC{"nBinsADC", 1000, "nbinsADC"};
7575
Configurable<int> nBinsAmp{"nBinsAmp", 1025, "nbinsAmp"};
7676
Configurable<int> nBinsFT0Amp{"nBinsFT0Amp", 250000, "nbinsAmp"};
77+
<<<<<<< HEAD
7778
Configurable<float> MaxZN{"MaxZN", 4099.5, "Max ZN signal"};
7879
Configurable<float> acceptnace_ZNA{"acceptnace_ZNA", 0.92, "ZNA acceptance factor"};
7980
Configurable<float> acceptnace_ZNC{"acceptnace_ZNC", 0.90, "ZNC acceptance factor"};
8081
Configurable<float> acceptnace_ZPA{"acceptnace_ZPA", 0.52, "ZPA acceptance factor"};
8182
Configurable<float> acceptnace_ZPC{"acceptnace_ZPC", 0.50, "ZPC acceptance factor"};
83+
=======
84+
Configurable<float> maxZn{"maxZn", 4099.5, "Max ZN signal"};
85+
Configurable<float> acceptanceZna{"acceptanceZna", 0.92, "ZNA acceptance factor"};
86+
Configurable<float> acceptanceZnc{"acceptanceZnc", 0.90, "ZNC acceptance factor"};
87+
Configurable<float> acceptanceZpa{"acceptanceZpa", 0.52, "ZPA acceptance factor"};
88+
Configurable<float> acceptanceZpc{"acceptanceZpc", 0.50, "ZPC acceptance factor"};
89+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
8290

8391
ConfigurableAxis axisVertex{"axisVertex", {20, -10, 10}, "vertex axis for histograms"};
8492
ConfigurableAxis axisPhi{"axisPhi", {60, 0.0, constants::math::TwoPI}, "phi axis for histograms"};
8593
ConfigurableAxis axisEta{"axisEta", {40, -1., 1.}, "eta axis for histograms"};
8694
ConfigurableAxis axisPt{"axisPt", {VARIABLE_WIDTH, 0.2, 0.25, 0.30, 0.40, 0.45, 0.50, 0.55, 0.60, 0.65, 0.70, 0.75, 0.80, 0.85, 0.90, 0.95, 1.00, 1.10, 1.20, 1.30, 1.40, 1.50, 1.60, 1.70, 1.80, 1.90, 2.00, 2.20, 2.40, 2.60, 2.80, 3.00}, "pt axis for histograms"};
8795
ConfigurableAxis axisMultiplicity{"axisMultiplicity", {3500, 0, 3500}, "centrality axis for histograms"};
8896
ConfigurableAxis axisEnergy{"axisEnergy", {100, 0, 700}, "energy axis for zdc histos"};
97+
<<<<<<< HEAD
8998
ConfigurableAxis axisMultTPC{"axisaxisMultTPC", {1000, -0.5f, 1999.5f}, "TPCmultiplicity"};
99+
=======
100+
ConfigurableAxis axismulttpc{"axisaxisMultTPC", {1000, -0.5f, 1999.5f}, "TPCmultiplicity"};
101+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
90102
ConfigurableAxis axisZN{"axisZN", {5000, 0, 500}, "axisZN"};
91103
ConfigurableAxis axisZP{"axisZP", {5000, 0, 500}, "axisZP"};
92104
ConfigurableAxis axisFT0CAmp{"axisFT0CAmp", {60000, 0, 60000}, "axisFT0CAmp"};
93105

94106
Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex;
95107
Filter trackFilter = (nabs(aod::track::eta) < cfgCutEta) && (aod::track::pt > cfgCutPtMin) && (aod::track::pt < cfgCutPtMax) && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t) true)) && (aod::track::tpcChi2NCl < cfgCutChi2prTPCcls);
96-
Partition<aodTracks> tracksIUWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
108+
Partition<AodTracks> tracksIUWithTPC = (aod::track::tpcNClsFindable > (uint8_t)0);
97109

98-
TComplex qTPC; // init q TPC
99-
TComplex qZNA{0, 0}; // init qZNA
100-
TComplex qZNC{0, 0}; // init qZNC
110+
std::complex<double> qTPC; // init q TPC
111+
std::complex<double> qZNA{0, 0}; // init qZNA
112+
std::complex<double> qZNC{0, 0}; // init qZNC
101113

102114
// Begin Histogram Registry
103115

104116
HistogramRegistry histos{"histos", {}, OutputObjHandlingPolicy::AnalysisObject};
105-
OutputObj<TProfile> Q2_real_mean{TProfile("Q2_real_mean", "q2 real vs centrality", 10, 0, 100.)};
106-
OutputObj<TProfile> Q2_imag_mean{TProfile("Q2_imag_mean", "q2 imag vs centrality", 10, 0, 100.)};
107-
OutputObj<TProfile> Q2_after{TProfile("Q2_after", "q2 recentered vs centrality", 10, 0, 100.)};
108-
OutputObj<TProfile> Q2before{TProfile("Q2_imag_mean", "q2 re vs imag", 10, 0, 100.)};
109-
OutputObj<TProfile> Q2_ZNA_real{TProfile("Q2_ZNA_real", "q2_ZNA real vs centrality", 10, 0, 100.)};
110-
OutputObj<TProfile> Q2_ZNA_imag{TProfile("Q2_ZNA_imag", "q2_ZNA imag vs centrality", 10, 0, 100.)};
111-
OutputObj<TProfile> Q2_ZNC_real{TProfile("Q2_ZNC_real", "q2_ZNC real vs centrality", 10, 0, 100.)};
112-
OutputObj<TProfile> Q2_ZNC_imag{TProfile("Q2_ZNC_imag", "q2_ZNC imag vs centrality", 10, 0, 100.)};
117+
OutputObj<TProfile> q2RealMean{TProfile("q2_real_mean", "q2 real vs centrality", 10, 0, 100.)};
118+
OutputObj<TProfile> q2ImagMean{TProfile("q2_imag_mean", "q2 imag vs centrality", 10, 0, 100.)};
119+
OutputObj<TProfile> q2After{TProfile("q2after", "q2 recentered vs centrality", 10, 0, 100.)};
120+
OutputObj<TProfile> q2Before{TProfile("q2before", "q2 re vs imag", 10, 0, 100.)};
121+
OutputObj<TProfile> q2ZnaReal{TProfile("Q2_ZNA_real", "q2_ZNA real vs centrality", 10, 0, 100.)};
122+
OutputObj<TProfile> q2ZnaImag{TProfile("Q2_ZNA_imag", "q2_ZNA imag vs centrality", 10, 0, 100.)};
123+
OutputObj<TProfile> q2ZncReal{TProfile("Q2_ZNC_real", "q2_ZNC real vs centrality", 10, 0, 100.)};
124+
OutputObj<TProfile> qZncImag{TProfile("Q2_ZNC_imag", "q2_ZNC imag vs centrality", 10, 0, 100.)};
113125
OutputObj<TProfile> avgQ2TPCRe{TProfile("avgQ2TPCRe", "Average Q2 Real part vs Centrality", 10, 0, 100)};
114126
OutputObj<TProfile> avgQ2TPCIm{TProfile("avgQ2TPCIm", "Average Q2 Imaginary part vs Centrality", 10, 0, 100)};
115-
OutputObj<TProfile> ZDC_ZEM_Energy{TProfile("ZDC_ZEM_Energy", "ZDC vs ZEM Energy", 10, 0, 1000)};
127+
OutputObj<TProfile> zdcZemEnergy{TProfile("ZDC_ZEM_Energy", "ZDC vs ZEM Energy", 10, 0, 1000)};
116128
OutputObj<TProfile> pCosPsiDifferences{TProfile("pCosPsiDifferences", "Differences in cos(psi) vs Centrality;Centrality;Mean cos(psi) Difference", 200, 0, 100, -1, 1)};
117129
OutputObj<TProfile> pSinPsiDifferences{TProfile("pSinPsiDifferences", "Differences in sin(psi) vs Centrality;Centrality;Mean sin(psi) Difference", 200, 0, 100, -1, 1)};
118130
OutputObj<TProfile> pZNvsFT0Ccent{TProfile("pZNvsFT0Ccent", "ZN Energy vs FT0C Centrality", 100, 0, 100, 0, 500)};
@@ -153,7 +165,7 @@ struct FlowZDCtask {
153165
histos.add("multHistogram", "multHistogram", kTH1F, {axisMultiplicity});
154166
histos.add("multvsCent", "centrality vs multiplicity", kTH2F, {axisCent, axisMultiplicity});
155167
histos.add("phiHistogram", "phiHistogram", kTH1F, {axisPhi});
156-
histos.add("TPCmultiplicity", "TPCmultiplicity", kTH1F, {axisMultTPC});
168+
histos.add("TPCmultiplicity", "TPCmultiplicity", kTH1F, {axismulttpc});
157169

158170
histos.add("REqHistogram", "REqHistogram", kTH1F, {axisQ});
159171
histos.add("IMqHistogram", "IMqHistogram", kTH1F, {axisQ});
@@ -180,12 +192,12 @@ struct FlowZDCtask {
180192
histos.add("revsimag", "revsimag", kTH2F, {axisREQ, axisIMQ});
181193

182194
if (doprocessZdcCollAssoc) { // Check if the process function for ZDCCollAssoc is enabled
183-
histos.add("ZNAcoll", "ZNAcoll; ZNA amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, MaxZN}}});
184-
histos.add("ZNCcoll", "ZNCcoll; ZNC amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, MaxZN}}});
185-
histos.add("ZEM1coll", "ZEM1coll; ZEM1 amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, MaxZEM}}});
186-
histos.add("ZEM2coll", "ZEM2coll; ZEM2 amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, MaxZEM}}});
187-
histos.add("ZNvsZEMcoll", "ZNvsZEMcoll; ZEM; ZNA+ZNC", {HistType::kTH2F, {{{nBinsAmp, -0.5, MaxZEM}, {nBinsAmp, -0.5, 2. * MaxZN}}}});
188-
histos.add("ZNAvsZNCcoll", "ZNAvsZNCcoll; ZNC; ZNA", {HistType::kTH2F, {{{nBinsAmp, -0.5, MaxZN}, {nBinsAmp, -0.5, MaxZN}}}});
195+
histos.add("ZNAcoll", "ZNAcoll; ZNA amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, maxZn}}});
196+
histos.add("ZNCcoll", "ZNCcoll; ZNC amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, maxZn}}});
197+
histos.add("ZEM1coll", "ZEM1coll; ZEM1 amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, maxZem}}});
198+
histos.add("ZEM2coll", "ZEM2coll; ZEM2 amplitude; Entries", {HistType::kTH1F, {{nBinsAmp, -0.5, maxZem}}});
199+
histos.add("ZNvsZEMcoll", "ZNvsZEMcoll; ZEM; ZNA+ZNC", {HistType::kTH2F, {{{nBinsAmp, -0.5, maxZem}, {nBinsAmp, -0.5, 2. * maxZn}}}});
200+
histos.add("ZNAvsZNCcoll", "ZNAvsZNCcoll; ZNC; ZNA", {HistType::kTH2F, {{{nBinsAmp, -0.5, maxZn}, {nBinsAmp, -0.5, maxZn}}}});
189201

190202
histos.add("RealQHistogramZNA", "RealQHistogramZNA", kTH1F, {axisQZNA});
191203
histos.add("ImagQHistogramZNA", "ImagQHistogramZNA", kTH1F, {axisQZNA});
@@ -201,7 +213,7 @@ struct FlowZDCtask {
201213
histos.add("CosPsiDifferences", "Differences in cos(psi);cos(psiZNC) - cos(psiZNA);Entries", {HistType::kTH1F, {{100, -2, 2}}});
202214
histos.add("hSinDifferences", "Differences in sin(psi);sin(psiZNC) - sin(psiZNA);Entries", {HistType::kTH1F, {{100, -2, 2}}});
203215
histos.add("CosPsiDifferencesAvg", "Differences in cos(psi);cos(psiZNC) - cos(psiZNA);Entries", {HistType::kTH2F, {{axisCent}, {100, -2, 2}}});
204-
histos.add("ZDC_energy_vs_ZEM", "ZDCvsZEM; ZEM; ZNA+ZNC+ZPA+ZPC", {HistType::kTH2F, {{{nBinsAmp, -0.5, MaxZEM}, {nBinsAmp, -0.5, 2. * MaxZN}}}});
216+
histos.add("ZDC_energy_vs_ZEM", "ZDCvsZEM; ZEM; ZNA+ZNC+ZPA+ZPC", {HistType::kTH2F, {{{nBinsAmp, -0.5, maxZem}, {nBinsAmp, -0.5, 2. * maxZn}}}});
205217
// common energies information for ZDC
206218
histos.add("ZNCenergy", "ZN energy side c", kTH1F, {axisEnergy});
207219
histos.add("ZNAenergy", "ZN energy side a", kTH1F, {axisEnergy});
@@ -222,7 +234,7 @@ struct FlowZDCtask {
222234
}
223235
}
224236

225-
void processQVector(aodCollisions::iterator const& collision, aod::BCsWithTimestamps const&, aodTracks const& tracks, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcsData*/, aod::ZDCMults const& /*zdcMults*/)
237+
void processQVector(AodCollisions::iterator const& collision, aod::BCsWithTimestamps const&, AodTracks const& tracks, BCsRun3 const& /*bcs*/, aod::Zdcs const& /*zdcsData*/, aod::ZDCMults const& /*zdcMults*/)
226238
{
227239
histos.fill(HIST("eventCounter"), 0.5);
228240
if (!collision.sel8())
@@ -231,19 +243,19 @@ struct FlowZDCtask {
231243
const auto& tracksGrouped = tracksIUWithTPC->sliceByCached(aod::track::collisionId, collision.globalIndex(), cache);
232244
const int multTPC = tracksGrouped.size();
233245
const auto cent = collision.centFT0C();
234-
int Ntot = tracks.size();
246+
int nTot = tracks.size();
235247

236248
// this is the q vector for the TPC data. it is a complex function
237-
double qTPC_real = 0.0; // Initialize qTPC_real
238-
double qTPC_im = 0.0; // init qTPC_imaginary
249+
double qTpcReal = 0.0; // Initialize qTPC_real
250+
double qTpcIm = 0.0; // init qTPC_imaginary
239251

240252
Int_t multTrk = tracks.size(); // Tracks are already filtered with GlobalTrack || GlobalTrackSDD
241253

242254
if (cent < 0.0 && cent > 70)
243255
return;
244256
std::complex<double> qTPC(0, 0); // Starting with a q-vector of zero
245257

246-
for (auto& track : tracks) {
258+
for (const auto& track : tracks) {
247259
double phi = track.phi();
248260

249261
histos.fill(HIST("etaHistogram"), track.eta());
@@ -252,40 +264,60 @@ struct FlowZDCtask {
252264

253265
qTPC += std::complex<double>(std::cos(2.0 * phi), std::sin(2.0 * phi));
254266

255-
histos.fill(HIST("multvsCent"), cent, Ntot);
267+
histos.fill(HIST("multvsCent"), cent, nTot);
256268

257269
} // end track loop
258270

271+
<<<<<<< HEAD
259272
qTPC_real = qTPC.real() / Ntot; // normalize these vectors by the total number of particles
260273
qTPC_im = qTPC.imag() / Ntot;
274+
=======
275+
qTpcReal = qTPC.real() / nTot; // normalize these vectors by the total number of particles
276+
qTpcIm = qTPC.imag() / nTot;
277+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
261278

262-
histos.fill(HIST("REqHistogram"), qTPC_real);
263-
histos.fill(HIST("IMqHistogram"), qTPC_im);
279+
histos.fill(HIST("REqHistogram"), qTpcReal);
280+
histos.fill(HIST("IMqHistogram"), qTpcIm);
264281

265282
histos.fill(HIST("multHistogram"), multTrk);
266283
histos.fill(HIST("TPCmultiplicity"), multTPC);
267284

268-
histos.fill(HIST("revsimag"), qTPC_real, qTPC_im);
285+
histos.fill(HIST("revsimag"), qTpcReal, qTpcIm);
269286
}
270287
void processZdcCollAssoc(
288+
<<<<<<< HEAD
271289
aodCollisions::iterator const& collision,
272290
aodTracks const& tracks,
291+
=======
292+
AodCollisions::iterator const& collision,
293+
AodTracks const& tracks,
294+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
273295
BCsRun3 const& /*bcs*/,
274296
aod::Zdcs const& /*zdcs*/,
275297
aod::FT0s const& /*ft0s*/)
276298
{
299+
<<<<<<< HEAD
277300
int Ntot = tracks.size();
278301
double sumCosPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
279302
double sumSinPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
280303
int countEvents = 0; // initialize Counter for the number of events processed
281304
double FT0AAmp = 0;
282305
double FT0CAmp = 0;
306+
=======
307+
int nTot = tracks.size();
308+
double sumCosPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
309+
double sumSinPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
310+
int countEvents = 0; // initialize Counter for the number of events processed
311+
double ft0aAmp = 0;
312+
double ft0cAmp = 0;
313+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
283314
// collision-based event selection
284315
if (!collision.sel8())
285316
return;
286317
const auto& foundBC = collision.foundBC_as<BCsRun3>();
287318
if (collision.has_foundFT0()) {
288319
auto ft0 = collision.foundFT0();
320+
<<<<<<< HEAD
289321
for (auto amplitude : ft0.amplitudeA()) {
290322
FT0AAmp += amplitude;
291323
histos.fill(HIST("hFT0AAmp"), FT0AAmp);
@@ -297,6 +329,19 @@ struct FlowZDCtask {
297329
}
298330
double FT0MAmp = FT0AAmp + FT0CAmp;
299331
histos.fill(HIST("hFT0MAmp"), FT0MAmp);
332+
=======
333+
for (const auto& amplitude : ft0.amplitudeA()) {
334+
ft0aAmp += amplitude;
335+
histos.fill(HIST("hFT0AAmp"), ft0aAmp);
336+
}
337+
for (const auto& amplitude : ft0.amplitudeC()) {
338+
ft0cAmp += amplitude;
339+
histos.fill(HIST("hFT0CAmp"), ft0cAmp);
340+
}
341+
}
342+
double ft0mAmp = ft0aAmp + ft0cAmp;
343+
histos.fill(HIST("hFT0MAmp"), ft0mAmp);
344+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
300345
if (foundBC.has_zdc()) {
301346
const auto& zdcread = foundBC.zdc();
302347
const auto cent = collision.centFT0C();
@@ -318,15 +363,23 @@ struct FlowZDCtask {
318363
float sumZEM = zdcread.amplitudeZEM1() + zdcread.amplitudeZEM2();
319364

320365
// common energies
366+
<<<<<<< HEAD
321367
float common_sumZNC = (zdcread.energyCommonZNC()) / acceptnace_ZNC;
322368
float common_sumZNA = (zdcread.energyCommonZNA()) / acceptnace_ZNA;
323369
float common_sumZPC = (zdcread.energyCommonZPC()) / acceptnace_ZPC;
324370
float common_sumZPA = (zdcread.energyCommonZPA()) / acceptnace_ZPA;
371+
=======
372+
float commonSumZnc = (zdcread.energyCommonZNC()) / acceptanceZnc;
373+
float commonSumZna = (zdcread.energyCommonZNA()) / acceptanceZna;
374+
float commonSumZpc = (zdcread.energyCommonZPC()) / acceptanceZpc;
375+
float commonSumZpa = (zdcread.energyCommonZPA()) / acceptanceZpa;
376+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
325377
float sumZN = (sumZNC) + (sumZNA);
326378
float sumZP = (sumZPC) + (sumZPA);
327379

328380
histos.fill(HIST("ZNenergy"), sumZN);
329381
histos.fill(HIST("ZPenergy"), sumZP);
382+
<<<<<<< HEAD
330383
histos.fill(HIST("ZNCenergy"), common_sumZNC);
331384
histos.fill(HIST("ZNAenergy"), common_sumZNA);
332385
histos.fill(HIST("ZPAenergy"), common_sumZPA);
@@ -337,6 +390,18 @@ struct FlowZDCtask {
337390
histos.fill(HIST("hZPvsFT0CAmp"), FT0CAmp, sumZP);
338391
histos.fill(HIST("hZNvsMult"), Ntot, sumZN);
339392
histos.fill(HIST("hZPvsMult"), Ntot, sumZP);
393+
=======
394+
histos.fill(HIST("ZNCenergy"), commonSumZnc);
395+
histos.fill(HIST("ZNAenergy"), commonSumZna);
396+
histos.fill(HIST("ZPAenergy"), commonSumZpa);
397+
histos.fill(HIST("ZPCenergy"), commonSumZpc);
398+
histos.fill(HIST("hZNvsFT0Ccent"), cent, sumZN);
399+
histos.fill(HIST("hZPvsFT0Ccent"), cent, sumZP);
400+
histos.fill(HIST("hZNvsFT0CAmp"), ft0cAmp, sumZN);
401+
histos.fill(HIST("hZPvsFT0CAmp"), ft0cAmp, sumZP);
402+
histos.fill(HIST("hZNvsMult"), nTot, sumZN);
403+
histos.fill(HIST("hZPvsMult"), nTot, sumZP);
404+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
340405

341406
float ratioZN = sumZNC / sumZNA;
342407
float ratioZP = sumZPC / sumZPA;
@@ -348,12 +413,21 @@ struct FlowZDCtask {
348413
histos.get<TH2>(HIST("ZDC_energy_vs_ZEM"))->Fill(sumZEM, sumZDC);
349414

350415
// Spectator plane angle calculations and histograms
416+
<<<<<<< HEAD
351417
const auto Ntot_ZNA = zdcread.amplitudeZNA();
352418
const auto Ntot_ZNC = zdcread.amplitudeZNC();
353419
double qZNA_real = 0.0;
354420
double qZNA_im = 0.0;
355421
double qZNC_real = 0.0;
356422
double qZNC_im = 0.0;
423+
=======
424+
const auto nTot_zna = zdcread.amplitudeZNA();
425+
const auto nTot_znc = zdcread.amplitudeZNC();
426+
double qZnaReal = 0.0;
427+
double qZnaIm = 0.0;
428+
double qZncReal = 0.0;
429+
double qZncIm = 0.0;
430+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
357431
const double phiRadians[4] = {45 * o2::constants::math::PI / 180, 135 * o2::constants::math::PI / 180, 225 * o2::constants::math::PI / 180, 315 * o2::constants::math::PI / 180};
358432
std::complex<double> qZNA = std::complex<double>(0.0, 0.0);
359433
std::complex<double> qZNC = std::complex<double>(0.0, 0.0);
@@ -366,6 +440,7 @@ struct FlowZDCtask {
366440
qZNC += std::complex<double>(std::cos(2 * phiRadians[sector]) * energyZNC / sumZNC, std::sin(2 * phiRadians[sector]) * energyZNC / sumZNC);
367441
}
368442

443+
<<<<<<< HEAD
369444
qZNA_real = qZNA.real() / Ntot_ZNA;
370445
qZNA_im = qZNA.imag() / Ntot_ZNA;
371446
qZNC_real = qZNC.real() / Ntot_ZNC;
@@ -376,6 +451,18 @@ struct FlowZDCtask {
376451
histos.fill(HIST("ImagQHistogramZNA"), qZNA_im);
377452
histos.fill(HIST("RealQHistogramZNC"), qZNC_real);
378453
histos.fill(HIST("ImagQHistogramZNC"), qZNC_im);
454+
=======
455+
qZnaReal = qZNA.real() / nTot_zna;
456+
qZnaIm = qZNA.imag() / nTot_zna;
457+
qZncReal = qZNC.real() / nTot_znc;
458+
qZncIm = qZNC.imag() / nTot_znc;
459+
460+
histos.fill(HIST("Acorrelations"), qZNA.real(), qZNA.imag());
461+
histos.fill(HIST("RealQHistogramZNA"), qZnaReal);
462+
histos.fill(HIST("ImagQHistogramZNA"), qZnaIm);
463+
histos.fill(HIST("RealQHistogramZNC"), qZncReal);
464+
histos.fill(HIST("ImagQHistogramZNC"), qZncIm);
465+
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
379466

380467
// Calculate the spectator plane angles for ZNA and ZNC
381468
double psiZNA = std::atan2(qZNA.imag(), qZNA.real()) / 2.0;

0 commit comments

Comments
 (0)