Skip to content

Commit 95edb4f

Browse files
prottayCMTProttay Das
prottayCMT
and
Prottay Das
authored
[PWGLF] added Sumw2 in TProfiles and changed float to double and switch coordinates (#8270)
Co-authored-by: Prottay Das <prottay@alipap1.cern.ch>
1 parent 95d40f0 commit 95edb4f

File tree

2 files changed

+121
-64
lines changed

2 files changed

+121
-64
lines changed

‎PWGLF/TableProducer/Common/spvector.cxx‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ struct spvector {
161161
int mRunNumber{-1};
162162

163163
template <typename TCollision>
164-
bool eventSelected(TCollision collision, const float& centrality)
164+
bool eventSelected(TCollision collision, const double& centrality)
165165
{
166166
auto multNTracksPV = collision.multNTracksPV();
167167
if (multNTracksPV < fMultPVCutLow->Eval(centrality))
@@ -309,8 +309,8 @@ struct spvector {
309309
auto vx = collision.posX();
310310
auto vy = collision.posY();
311311

312-
float psiZDCC = -99;
313-
float psiZDCA = -99;
312+
double psiZDCC = -99;
313+
double psiZDCA = -99;
314314
auto qxZDCA = 0.0;
315315
auto qxZDCC = 0.0;
316316
auto qyZDCA = 0.0;
@@ -338,12 +338,12 @@ struct spvector {
338338
return;
339339
}
340340

341-
if (znaEnergy[0] < 0.0 || znaEnergy[1] < 0.0 || znaEnergy[2] < 0.0 || znaEnergy[3] < 0.0) {
341+
if (znaEnergy[0] <= 0.0 || znaEnergy[1] <= 0.0 || znaEnergy[2] <= 0.0 || znaEnergy[3] <= 0.0) {
342342
triggerevent = false;
343343
spcalibrationtable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3], qxZDCA, qxZDCC, qyZDCA, qyZDCC, psiZDCC, psiZDCA);
344344
return;
345345
}
346-
if (zncEnergy[0] < 0.0 || zncEnergy[1] < 0.0 || zncEnergy[2] < 0.0 || zncEnergy[3] < 0.0) {
346+
if (zncEnergy[0] <= 0.0 || zncEnergy[1] <= 0.0 || zncEnergy[2] <= 0.0 || zncEnergy[3] <= 0.0) {
347347
triggerevent = false;
348348
spcalibrationtable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3], qxZDCA, qxZDCC, qyZDCA, qyZDCC, psiZDCC, psiZDCA);
349349
return;
@@ -360,8 +360,8 @@ struct spvector {
360360

361361
auto gainequal = 1.0;
362362
auto alphaZDC = 0.395;
363-
constexpr float x[4] = {-1.75, 1.75, -1.75, 1.75};
364-
constexpr float y[4] = {-1.75, -1.75, 1.75, 1.75};
363+
constexpr double x[4] = {-1.75, 1.75, -1.75, 1.75};
364+
constexpr double y[4] = {-1.75, -1.75, 1.75, 1.75};
365365

366366
// histos.fill(HIST("ZDCAmpCommon"), 0.5, vz, centrality, znaEnergycommon);
367367
// histos.fill(HIST("ZDCAmpCommon"), 1.5, vz, centrality, zncEnergycommon);
@@ -384,11 +384,11 @@ struct spvector {
384384
spcalibrationtable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3], qxZDCA, qxZDCC, qyZDCA, qyZDCC, psiZDCC, psiZDCA);
385385
return;
386386
} else {
387-
float ampl = gainequal * znaEnergy[iChA];
387+
double ampl = gainequal * znaEnergy[iChA];
388388
if (followpub) {
389389
ampl = TMath::Power(ampl, alphaZDC);
390390
}
391-
qxZDCA = qxZDCA + ampl * x[iChA];
391+
qxZDCA = qxZDCA - ampl * x[iChA];
392392
qyZDCA = qyZDCA + ampl * y[iChA];
393393
sumA = sumA + ampl;
394394
histos.fill(HIST("ZDCAmp"), chanelid + 0.5, vz, ampl);
@@ -400,11 +400,11 @@ struct spvector {
400400
spcalibrationtable(triggerevent, currentRunNumber, centrality, vx, vy, vz, znaEnergycommon, zncEnergycommon, znaEnergy[0], znaEnergy[1], znaEnergy[2], znaEnergy[3], zncEnergy[0], zncEnergy[1], zncEnergy[2], zncEnergy[3], qxZDCA, qxZDCC, qyZDCA, qyZDCC, psiZDCC, psiZDCA);
401401
return;
402402
} else {
403-
float ampl = gainequal * zncEnergy[iChA - 4];
403+
double ampl = gainequal * zncEnergy[iChA - 4];
404404
if (followpub) {
405405
ampl = TMath::Power(ampl, alphaZDC);
406406
}
407-
qxZDCC = qxZDCC - ampl * x[iChA - 4];
407+
qxZDCC = qxZDCC + ampl * x[iChA - 4];
408408
qyZDCC = qyZDCC + ampl * y[iChA - 4];
409409
sumC = sumC + ampl;
410410
histos.fill(HIST("ZDCAmp"), chanelid + 0.5, vz, ampl);
@@ -474,24 +474,24 @@ struct spvector {
474474

475475
// Get the global bin for meanxA
476476
int globalBinMeanxA = hrecentereSp->GetBin(binCoords);
477-
float meanxA = hrecentereSp->GetBinContent(globalBinMeanxA);
478-
float meanxAerror = hrecentereSp->GetBinError(globalBinMeanxA);
477+
double meanxA = hrecentereSp->GetBinContent(globalBinMeanxA);
478+
double meanxAerror = hrecentereSp->GetBinError(globalBinMeanxA);
479479

480480
// Repeat for other channels (meanyA, meanxC, meanyC)
481481
binCoords[4] = channelAxis->FindBin(1.5); // Channel for meanyA
482482
int globalBinMeanyA = hrecentereSp->GetBin(binCoords);
483-
float meanyA = hrecentereSp->GetBinContent(globalBinMeanyA);
484-
float meanyAerror = hrecentereSp->GetBinError(globalBinMeanyA);
483+
double meanyA = hrecentereSp->GetBinContent(globalBinMeanyA);
484+
double meanyAerror = hrecentereSp->GetBinError(globalBinMeanyA);
485485

486486
binCoords[4] = channelAxis->FindBin(2.5); // Channel for meanxC
487487
int globalBinMeanxC = hrecentereSp->GetBin(binCoords);
488-
float meanxC = hrecentereSp->GetBinContent(globalBinMeanxC);
489-
float meanxCerror = hrecentereSp->GetBinError(globalBinMeanxC);
488+
double meanxC = hrecentereSp->GetBinContent(globalBinMeanxC);
489+
double meanxCerror = hrecentereSp->GetBinError(globalBinMeanxC);
490490

491491
binCoords[4] = channelAxis->FindBin(3.5); // Channel for meanyC
492492
int globalBinMeanyC = hrecentereSp->GetBin(binCoords);
493-
float meanyC = hrecentereSp->GetBinContent(globalBinMeanyC);
494-
float meanyCerror = hrecentereSp->GetBinError(globalBinMeanyC);
493+
double meanyC = hrecentereSp->GetBinContent(globalBinMeanyC);
494+
double meanyCerror = hrecentereSp->GetBinError(globalBinMeanyC);
495495

496496
if (rejbadevent) {
497497
if ((TMath::Abs(meanxA) > 90000.0 || TMath::Abs(meanxC) > 90000.0 || TMath::Abs(meanyA) > 90000.0 || TMath::Abs(meanyC) > 90000.0) && (TMath::Abs(meanxAerror) > 9000.0 || TMath::Abs(meanxCerror) > 9000.0 || TMath::Abs(meanyAerror) > 9000.0 || TMath::Abs(meanyCerror) > 9000.0)) {
@@ -524,15 +524,15 @@ struct spvector {
524524

525525
if (useRecenterefineSp && hrecenterecentSp) {
526526

527-
float meanxAcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 0.5));
528-
float meanyAcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 1.5));
529-
float meanxCcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 2.5));
530-
float meanyCcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 3.5));
527+
double meanxAcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 0.5));
528+
double meanyAcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 1.5));
529+
double meanxCcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 2.5));
530+
double meanyCcent = hrecenterecentSp->GetBinContent(hrecenterecentSp->FindBin(centrality, 3.5));
531531

532-
float meanxAcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 0.5));
533-
float meanyAcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 1.5));
534-
float meanxCcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 2.5));
535-
float meanyCcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 3.5));
532+
double meanxAcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 0.5));
533+
double meanyAcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 1.5));
534+
double meanxCcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 2.5));
535+
double meanyCcenterror = hrecenterecentSp->GetBinError(hrecenterecentSp->FindBin(centrality, 3.5));
536536

537537
if (rejbadeventcent) {
538538
if ((TMath::Abs(meanxAcent) > 90000.0 || TMath::Abs(meanxCcent) > 90000.0 || TMath::Abs(meanyAcent) > 90000.0 || TMath::Abs(meanyCcent) > 90000.0) && (TMath::Abs(meanxAcenterror) > 9000.0 || TMath::Abs(meanxCcenterror) > 9000.0 || TMath::Abs(meanyAcenterror) > 9000.0 || TMath::Abs(meanyCcenterror) > 9000.0)) {
@@ -557,15 +557,15 @@ struct spvector {
557557

558558
if (useRecenterefineSp && hrecenterevxSp) {
559559

560-
float meanxAvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 0.5));
561-
float meanyAvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 1.5));
562-
float meanxCvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 2.5));
563-
float meanyCvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 3.5));
560+
double meanxAvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 0.5));
561+
double meanyAvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 1.5));
562+
double meanxCvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 2.5));
563+
double meanyCvx = hrecenterevxSp->GetBinContent(hrecenterevxSp->FindBin(vx, 3.5));
564564

565-
float meanxAvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 0.5));
566-
float meanyAvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 1.5));
567-
float meanxCvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 2.5));
568-
float meanyCvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 3.5));
565+
double meanxAvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 0.5));
566+
double meanyAvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 1.5));
567+
double meanxCvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 2.5));
568+
double meanyCvxerror = hrecenterevxSp->GetBinError(hrecenterevxSp->FindBin(vx, 3.5));
569569

570570
if (rejbadeventvx) {
571571
if ((TMath::Abs(meanxAvx) > 90000.0 || TMath::Abs(meanxCvx) > 90000.0 || TMath::Abs(meanyAvx) > 90000.0 || TMath::Abs(meanyCvx) > 90000.0) && (TMath::Abs(meanxAvxerror) > 9000.0 || TMath::Abs(meanxCvxerror) > 9000.0 || TMath::Abs(meanyAvxerror) > 9000.0 || TMath::Abs(meanyCvxerror) > 9000.0)) {
@@ -590,15 +590,15 @@ struct spvector {
590590

591591
if (useRecenterefineSp && hrecenterevySp) {
592592

593-
float meanxAvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 0.5));
594-
float meanyAvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 1.5));
595-
float meanxCvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 2.5));
596-
float meanyCvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 3.5));
593+
double meanxAvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 0.5));
594+
double meanyAvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 1.5));
595+
double meanxCvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 2.5));
596+
double meanyCvy = hrecenterevySp->GetBinContent(hrecenterevySp->FindBin(vy, 3.5));
597597

598-
float meanxAvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 0.5));
599-
float meanyAvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 1.5));
600-
float meanxCvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 2.5));
601-
float meanyCvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 3.5));
598+
double meanxAvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 0.5));
599+
double meanyAvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 1.5));
600+
double meanxCvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 2.5));
601+
double meanyCvyerror = hrecenterevySp->GetBinError(hrecenterevySp->FindBin(vy, 3.5));
602602

603603
if (rejbadeventvy) {
604604
if ((TMath::Abs(meanxAvy) > 90000.0 || TMath::Abs(meanxCvy) > 90000.0 || TMath::Abs(meanyAvy) > 90000.0 || TMath::Abs(meanyCvy) > 90000.0) && (TMath::Abs(meanxAvyerror) > 9000.0 || TMath::Abs(meanxCvyerror) > 9000.0 || TMath::Abs(meanyAvyerror) > 9000.0 || TMath::Abs(meanyCvyerror) > 9000.0)) {
@@ -623,15 +623,15 @@ struct spvector {
623623

624624
if (useRecenterefineSp && hrecenterevzSp) {
625625

626-
float meanxAvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 0.5));
627-
float meanyAvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 1.5));
628-
float meanxCvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 2.5));
629-
float meanyCvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 3.5));
626+
double meanxAvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 0.5));
627+
double meanyAvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 1.5));
628+
double meanxCvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 2.5));
629+
double meanyCvz = hrecenterevzSp->GetBinContent(hrecenterevzSp->FindBin(vz, 3.5));
630630

631-
float meanxAvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 0.5));
632-
float meanyAvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 1.5));
633-
float meanxCvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 2.5));
634-
float meanyCvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 3.5));
631+
double meanxAvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 0.5));
632+
double meanyAvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 1.5));
633+
double meanxCvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 2.5));
634+
double meanyCvzerror = hrecenterevzSp->GetBinError(hrecenterevzSp->FindBin(vz, 3.5));
635635

636636
if (rejbadeventvz) {
637637
if ((TMath::Abs(meanxAvz) > 90000.0 || TMath::Abs(meanxCvz) > 90000.0 || TMath::Abs(meanyAvz) > 90000.0 || TMath::Abs(meanyCvz) > 90000.0) && (TMath::Abs(meanxAvzerror) > 9000.0 || TMath::Abs(meanxCvzerror) > 9000.0 || TMath::Abs(meanyAvzerror) > 9000.0 || TMath::Abs(meanyCvzerror) > 9000.0)) {

0 commit comments

Comments
 (0)