Skip to content

Commit c8a0992

Browse files
MaximVirtaMaximVirta
committed
[PWGCF] SPC computation fixed & correlators reset
1 parent 71cfc02 commit c8a0992

File tree

1 file changed

+36
-32
lines changed

1 file changed

+36
-32
lines changed

‎PWGCF/JCorran/Core/FlowJSPCAnalysis.cxx‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ void FlowJSPCAnalysis::calculateCorrelators(const int fCentBin)
8383
double correlationDenom;
8484
double weightCorrelationDenom;
8585

86+
for (int i = 0; i < 14; ++i) fCorrelDenoms[i] = 0;
87+
8688
for (int j = 0; j < 12; j++) {
8789
if (fHarmosArray[j][0] == 0) {
8890
continue;
@@ -113,11 +115,13 @@ void FlowJSPCAnalysis::calculateCorrelators(const int fCentBin)
113115

114116
fillHistograms(fCentBin, j, correlationNum, correlationDenom, weightCorrelationNum, weightCorrelationDenom);
115117

118+
116119
correlationNum = 0.;
117120
weightCorrelationNum = 0.;
118121
correlationDenom = 0.;
119122
weightCorrelationDenom = 0.;
120123
}
124+
121125
}
122126

123127
void FlowJSPCAnalysis::fillHistograms(const int fCentBin, int ind, double cNum, double cDenom, double wNum, double wDenom)
@@ -126,66 +130,66 @@ void FlowJSPCAnalysis::fillHistograms(const int fCentBin, int ind, double cNum,
126130
case 0: {
127131
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
128132
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
129-
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
130-
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
131-
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
132-
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
133+
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
134+
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
135+
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
136+
mHistRegistry->fill(HIST(MCentClasses[0]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
133137
} break;
134138
case 1: {
135139
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
136140
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
137-
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
138-
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
139-
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
140-
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
141+
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
142+
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
143+
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
144+
mHistRegistry->fill(HIST(MCentClasses[1]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
141145
} break;
142146
case 2: {
143147
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
144148
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
145-
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
146-
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
147-
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
148-
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
149+
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
150+
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
151+
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
152+
mHistRegistry->fill(HIST(MCentClasses[2]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
149153
} break;
150154
case 3: {
151155
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
152156
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
153-
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
154-
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
155-
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
156-
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
157+
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
158+
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
159+
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
160+
mHistRegistry->fill(HIST(MCentClasses[3]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
157161
} break;
158162
case 4: {
159163
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
160164
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
161-
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
162-
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
163-
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
164-
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
165+
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
166+
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
167+
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
168+
mHistRegistry->fill(HIST(MCentClasses[4]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
165169
} break;
166170
case 5: {
167171
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
168172
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
169-
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
170-
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
171-
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
172-
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
173+
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
174+
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
175+
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
176+
mHistRegistry->fill(HIST(MCentClasses[5]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
173177
} break;
174178
case 6: {
175179
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
176180
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
177-
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
178-
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
179-
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
180-
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
181+
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
182+
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
183+
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
184+
mHistRegistry->fill(HIST(MCentClasses[6]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
181185
} break;
182186
case 7: {
183187
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fResults"), 2. * static_cast<float>(ind) + 0.5, cNum, wNum);
184188
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fResults"), 2. * static_cast<float>(ind) + 1.5, cDenom, wDenom);
185-
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
186-
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
187-
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 2.5, wNum, 1.);
188-
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 2. * static_cast<float>(ind) + 3.5, wDenom, 1.);
189+
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 0.5, cNum * cDenom, wNum * wDenom);
190+
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 1.5, wNum * wDenom, 1.);
191+
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 2.5, wNum, 1.);
192+
mHistRegistry->fill(HIST(MCentClasses[7]) + HIST("fCovResults"), 4. * static_cast<float>(ind) + 3.5, wDenom, 1.);
189193
} break;
190194
default:
191195
return;

0 commit comments

Comments
 (0)