Skip to content

Commit 7dd81dd

Browse files
committed
bugfix for-loop nHarmonics; Qtracks vector[int->float]
1 parent 402ef38 commit 7dd81dd

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

PWGCF/Flow/Tasks/flowSP.cxx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ DECLARE_SOA_COLUMN(Bc_timestamp, bc_timestamp, int); //Ilya
7676
DECLARE_SOA_COLUMN(Collision_sel8, collision_sel8, bool); //Ilya
7777
DECLARE_SOA_COLUMN(NumContrib, numContrib, int); //Ilya
7878
DECLARE_SOA_COLUMN(TrackOccupancyInTimeRange, trackOccupancyInTimeRange, float); //Ilya
79-
DECLARE_SOA_COLUMN(Qtracks, qtracks, std::vector<int>); //Ilya
79+
DECLARE_SOA_COLUMN(Qtracks, qtracks, std::vector<float>); //Ilya
8080
} // namespace flowsp
8181

8282
DECLARE_SOA_TABLE(FlowSPEvents, "AOD", "FLOWSP",
@@ -1300,7 +1300,7 @@ struct FlowSP {
13001300
collision.sel8(), // Ilya
13011301
collision.numContrib(), // Ilya
13021302
collision.trackOccupancyInTimeRange(), // Ilya
1303-
std::vector<int>{} // Ilya
1303+
std::vector<float>{} // Ilya
13041304
// Q_tracks was not decalred yet. Replaced with an empty vector. In three more places the same
13051305
); // Ilya
13061306
return;
@@ -1320,7 +1320,7 @@ struct FlowSP {
13201320
collision.sel8(), // Ilya
13211321
collision.numContrib(), // Ilya
13221322
collision.trackOccupancyInTimeRange(), // Ilya
1323-
std::vector<int>{} // Ilya
1323+
std::vector<float>{} // Ilya
13241324
); // Ilya
13251325
return;
13261326
}
@@ -1379,7 +1379,7 @@ struct FlowSP {
13791379
collision.sel8(), // Ilya
13801380
collision.numContrib(), // Ilya
13811381
collision.trackOccupancyInTimeRange(), // Ilya
1382-
std::vector<int>{} // Ilya
1382+
std::vector<float>{} // Ilya
13831383
); // Ilya
13841384
return;
13851385
}
@@ -1545,7 +1545,7 @@ struct FlowSP {
15451545
int uPtBin = etaPtBin_map->GetYaxis()->FindBin(track.pt()); //Ilya
15461546
sum_u[0][spm.charge][0][uEtaBin][uPtBin]+=1; //Ilya
15471547
sum_u[0][spm.charge][1][uEtaBin][uPtBin]+=track.pt(); //Ilya
1548-
for (int iH=1; iH < nHarmonics; iH++) //Ilya
1548+
for (int iH=1; iH <= nHarmonics; iH++) //Ilya
15491549
{ //Ilya
15501550
sum_u[iH][spm.charge][0][uEtaBin][uPtBin]+=cos(iH*phi); //Ilya
15511551
sum_u[iH][spm.charge][1][uEtaBin][uPtBin]+=sin(iH*phi); //Ilya
@@ -1651,15 +1651,14 @@ struct FlowSP {
16511651

16521652
} // end of track loop
16531653

1654-
std::vector<int> Q_tracks;
1654+
std::vector<float> Q_tracks;
16551655
for (int iH=0; iH < nHarmonics+1; iH++){ //Ilya
16561656
for (int iCh=0; iCh < nCharges; iCh++){ //Ilya
16571657
for (int iQc=0; iQc < nQcomponents; iQc++){ //Ilya
16581658
for (int iEta=0; iEta < nEtaBins; iEta++){ //Ilya
16591659
for (int iPt=0; iPt < nPtBins; iPt++){ //Ilya
1660-
int value=int(10000*sum_u[iH][iCh][iQc][iEta][iPt]); //Ilya
1661-
if (iH==0 && iQc==0) value = sum_u[iH][iCh][iQc][iEta][iPt]; //Ilya
1662-
Q_tracks.push_back(value); //Ilya
1660+
const float value = sum_u[iH][iCh][iQc][iEta][iPt]; //Ilya
1661+
Q_tracks.push_back(value); //Ilya
16631662
}}}}} //Ilya
16641663

16651664
// Now we want to fill the final relPt histogram

0 commit comments

Comments
 (0)