Skip to content

Commit 2c4b78f

Browse files
author
Sabrina Hernandez
committed
Fixed linter warnings for FlowZDCtask
1 parent a329771 commit 2c4b78f

File tree

1 file changed

+0
-87
lines changed

1 file changed

+0
-87
lines changed

‎PWGCF/Flow/Tasks/FlowZDCtask.cxx‎

Lines changed: 0 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -74,31 +74,19 @@ struct FlowZDCtask {
7474
Configurable<int> nBinsADC{"nBinsADC", 1000, "nbinsADC"};
7575
Configurable<int> nBinsAmp{"nBinsAmp", 1025, "nbinsAmp"};
7676
Configurable<int> nBinsFT0Amp{"nBinsFT0Amp", 250000, "nbinsAmp"};
77-
<<<<<<< HEAD
78-
Configurable<float> MaxZN{"MaxZN", 4099.5, "Max ZN signal"};
79-
Configurable<float> acceptnace_ZNA{"acceptnace_ZNA", 0.92, "ZNA acceptance factor"};
80-
Configurable<float> acceptnace_ZNC{"acceptnace_ZNC", 0.90, "ZNC acceptance factor"};
81-
Configurable<float> acceptnace_ZPA{"acceptnace_ZPA", 0.52, "ZPA acceptance factor"};
82-
Configurable<float> acceptnace_ZPC{"acceptnace_ZPC", 0.50, "ZPC acceptance factor"};
83-
=======
8477
Configurable<float> maxZn{"maxZn", 4099.5, "Max ZN signal"};
8578
Configurable<float> acceptanceZna{"acceptanceZna", 0.92, "ZNA acceptance factor"};
8679
Configurable<float> acceptanceZnc{"acceptanceZnc", 0.90, "ZNC acceptance factor"};
8780
Configurable<float> acceptanceZpa{"acceptanceZpa", 0.52, "ZPA acceptance factor"};
8881
Configurable<float> acceptanceZpc{"acceptanceZpc", 0.50, "ZPC acceptance factor"};
89-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
9082

9183
ConfigurableAxis axisVertex{"axisVertex", {20, -10, 10}, "vertex axis for histograms"};
9284
ConfigurableAxis axisPhi{"axisPhi", {60, 0.0, constants::math::TwoPI}, "phi axis for histograms"};
9385
ConfigurableAxis axisEta{"axisEta", {40, -1., 1.}, "eta axis for histograms"};
9486
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"};
9587
ConfigurableAxis axisMultiplicity{"axisMultiplicity", {3500, 0, 3500}, "centrality axis for histograms"};
9688
ConfigurableAxis axisEnergy{"axisEnergy", {100, 0, 700}, "energy axis for zdc histos"};
97-
<<<<<<< HEAD
98-
ConfigurableAxis axisMultTPC{"axisaxisMultTPC", {1000, -0.5f, 1999.5f}, "TPCmultiplicity"};
99-
=======
10089
ConfigurableAxis axismulttpc{"axisaxisMultTPC", {1000, -0.5f, 1999.5f}, "TPCmultiplicity"};
101-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
10290
ConfigurableAxis axisZN{"axisZN", {5000, 0, 500}, "axisZN"};
10391
ConfigurableAxis axisZP{"axisZP", {5000, 0, 500}, "axisZP"};
10492
ConfigurableAxis axisFT0CAmp{"axisFT0CAmp", {60000, 0, 60000}, "axisFT0CAmp"};
@@ -268,13 +256,8 @@ struct FlowZDCtask {
268256

269257
} // end track loop
270258

271-
<<<<<<< HEAD
272-
qTPC_real = qTPC.real() / Ntot; // normalize these vectors by the total number of particles
273-
qTPC_im = qTPC.imag() / Ntot;
274-
=======
275259
qTpcReal = qTPC.real() / nTot; // normalize these vectors by the total number of particles
276260
qTpcIm = qTPC.imag() / nTot;
277-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
278261

279262
histos.fill(HIST("REqHistogram"), qTpcReal);
280263
histos.fill(HIST("IMqHistogram"), qTpcIm);
@@ -285,51 +268,24 @@ struct FlowZDCtask {
285268
histos.fill(HIST("revsimag"), qTpcReal, qTpcIm);
286269
}
287270
void processZdcCollAssoc(
288-
<<<<<<< HEAD
289-
aodCollisions::iterator const& collision,
290-
aodTracks const& tracks,
291-
=======
292271
AodCollisions::iterator const& collision,
293272
AodTracks const& tracks,
294-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
295273
BCsRun3 const& /*bcs*/,
296274
aod::Zdcs const& /*zdcs*/,
297275
aod::FT0s const& /*ft0s*/)
298276
{
299-
<<<<<<< HEAD
300-
int Ntot = tracks.size();
301-
double sumCosPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
302-
double sumSinPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
303-
int countEvents = 0; // initialize Counter for the number of events processed
304-
double FT0AAmp = 0;
305-
double FT0CAmp = 0;
306-
=======
307277
int nTot = tracks.size();
308278
double sumCosPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
309279
double sumSinPsiDiff = 0.0; // initialize Sum of cosPsiDiff for averaging
310280
int countEvents = 0; // initialize Counter for the number of events processed
311281
double ft0aAmp = 0;
312282
double ft0cAmp = 0;
313-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
314283
// collision-based event selection
315284
if (!collision.sel8())
316285
return;
317286
const auto& foundBC = collision.foundBC_as<BCsRun3>();
318287
if (collision.has_foundFT0()) {
319288
auto ft0 = collision.foundFT0();
320-
<<<<<<< HEAD
321-
for (auto amplitude : ft0.amplitudeA()) {
322-
FT0AAmp += amplitude;
323-
histos.fill(HIST("hFT0AAmp"), FT0AAmp);
324-
}
325-
for (auto amplitude : ft0.amplitudeC()) {
326-
FT0CAmp += amplitude;
327-
histos.fill(HIST("hFT0CAmp"), FT0CAmp);
328-
}
329-
}
330-
double FT0MAmp = FT0AAmp + FT0CAmp;
331-
histos.fill(HIST("hFT0MAmp"), FT0MAmp);
332-
=======
333289
for (const auto& amplitude : ft0.amplitudeA()) {
334290
ft0aAmp += amplitude;
335291
histos.fill(HIST("hFT0AAmp"), ft0aAmp);
@@ -341,7 +297,6 @@ struct FlowZDCtask {
341297
}
342298
double ft0mAmp = ft0aAmp + ft0cAmp;
343299
histos.fill(HIST("hFT0MAmp"), ft0mAmp);
344-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
345300
if (foundBC.has_zdc()) {
346301
const auto& zdcread = foundBC.zdc();
347302
const auto cent = collision.centFT0C();
@@ -363,34 +318,15 @@ struct FlowZDCtask {
363318
float sumZEM = zdcread.amplitudeZEM1() + zdcread.amplitudeZEM2();
364319

365320
// common energies
366-
<<<<<<< HEAD
367-
float common_sumZNC = (zdcread.energyCommonZNC()) / acceptnace_ZNC;
368-
float common_sumZNA = (zdcread.energyCommonZNA()) / acceptnace_ZNA;
369-
float common_sumZPC = (zdcread.energyCommonZPC()) / acceptnace_ZPC;
370-
float common_sumZPA = (zdcread.energyCommonZPA()) / acceptnace_ZPA;
371-
=======
372321
float commonSumZnc = (zdcread.energyCommonZNC()) / acceptanceZnc;
373322
float commonSumZna = (zdcread.energyCommonZNA()) / acceptanceZna;
374323
float commonSumZpc = (zdcread.energyCommonZPC()) / acceptanceZpc;
375324
float commonSumZpa = (zdcread.energyCommonZPA()) / acceptanceZpa;
376-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
377325
float sumZN = (sumZNC) + (sumZNA);
378326
float sumZP = (sumZPC) + (sumZPA);
379327

380328
histos.fill(HIST("ZNenergy"), sumZN);
381329
histos.fill(HIST("ZPenergy"), sumZP);
382-
<<<<<<< HEAD
383-
histos.fill(HIST("ZNCenergy"), common_sumZNC);
384-
histos.fill(HIST("ZNAenergy"), common_sumZNA);
385-
histos.fill(HIST("ZPAenergy"), common_sumZPA);
386-
histos.fill(HIST("ZPCenergy"), common_sumZPC);
387-
histos.fill(HIST("hZNvsFT0Ccent"), cent, sumZN);
388-
histos.fill(HIST("hZPvsFT0Ccent"), cent, sumZP);
389-
histos.fill(HIST("hZNvsFT0CAmp"), FT0CAmp, sumZN);
390-
histos.fill(HIST("hZPvsFT0CAmp"), FT0CAmp, sumZP);
391-
histos.fill(HIST("hZNvsMult"), Ntot, sumZN);
392-
histos.fill(HIST("hZPvsMult"), Ntot, sumZP);
393-
=======
394330
histos.fill(HIST("ZNCenergy"), commonSumZnc);
395331
histos.fill(HIST("ZNAenergy"), commonSumZna);
396332
histos.fill(HIST("ZPAenergy"), commonSumZpa);
@@ -401,7 +337,6 @@ struct FlowZDCtask {
401337
histos.fill(HIST("hZPvsFT0CAmp"), ft0cAmp, sumZP);
402338
histos.fill(HIST("hZNvsMult"), nTot, sumZN);
403339
histos.fill(HIST("hZPvsMult"), nTot, sumZP);
404-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
405340

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

415350
// Spectator plane angle calculations and histograms
416-
<<<<<<< HEAD
417-
const auto Ntot_ZNA = zdcread.amplitudeZNA();
418-
const auto Ntot_ZNC = zdcread.amplitudeZNC();
419-
double qZNA_real = 0.0;
420-
double qZNA_im = 0.0;
421-
double qZNC_real = 0.0;
422-
double qZNC_im = 0.0;
423-
=======
424351
const auto nTot_zna = zdcread.amplitudeZNA();
425352
const auto nTot_znc = zdcread.amplitudeZNC();
426353
double qZnaReal = 0.0;
427354
double qZnaIm = 0.0;
428355
double qZncReal = 0.0;
429356
double qZncIm = 0.0;
430-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
431357
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};
432358
std::complex<double> qZNA = std::complex<double>(0.0, 0.0);
433359
std::complex<double> qZNC = std::complex<double>(0.0, 0.0);
@@ -440,18 +366,6 @@ struct FlowZDCtask {
440366
qZNC += std::complex<double>(std::cos(2 * phiRadians[sector]) * energyZNC / sumZNC, std::sin(2 * phiRadians[sector]) * energyZNC / sumZNC);
441367
}
442368

443-
<<<<<<< HEAD
444-
qZNA_real = qZNA.real() / Ntot_ZNA;
445-
qZNA_im = qZNA.imag() / Ntot_ZNA;
446-
qZNC_real = qZNC.real() / Ntot_ZNC;
447-
qZNC_im = qZNC.imag() / Ntot_ZNC;
448-
449-
histos.fill(HIST("Acorrelations"), qZNA.real(), qZNA.imag());
450-
histos.fill(HIST("RealQHistogramZNA"), qZNA_real);
451-
histos.fill(HIST("ImagQHistogramZNA"), qZNA_im);
452-
histos.fill(HIST("RealQHistogramZNC"), qZNC_real);
453-
histos.fill(HIST("ImagQHistogramZNC"), qZNC_im);
454-
=======
455369
qZnaReal = qZNA.real() / nTot_zna;
456370
qZnaIm = qZNA.imag() / nTot_zna;
457371
qZncReal = qZNC.real() / nTot_znc;
@@ -462,7 +376,6 @@ struct FlowZDCtask {
462376
histos.fill(HIST("ImagQHistogramZNA"), qZnaIm);
463377
histos.fill(HIST("RealQHistogramZNC"), qZncReal);
464378
histos.fill(HIST("ImagQHistogramZNC"), qZncIm);
465-
>>>>>>> 86ab262aa (Fixed linter warnings for FlowZDCtask)
466379

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

0 commit comments

Comments
 (0)