|
19 | 19 | #include "Common/DataModel/EventSelection.h" |
20 | 20 | #include "Common/DataModel/Multiplicity.h" |
21 | 21 | #include "Common/DataModel/PIDResponse.h" |
| 22 | +#include "Common/DataModel/TrackSelectionTables.h" |
22 | 23 |
|
23 | 24 | #include "CCDB/BasicCCDBManager.h" |
24 | 25 | #include "CommonConstants/PhysicsConstants.h" |
25 | 26 | #include "Framework/ASoAHelpers.h" |
26 | 27 | #include "Framework/AnalysisTask.h" |
27 | 28 | #include "Framework/runDataProcessing.h" |
28 | 29 |
|
29 | | -#include "TPDGCode.h" |
30 | | - |
31 | 30 | #include <map> |
32 | 31 | #include <string> |
33 | 32 | #include <vector> |
@@ -206,11 +205,11 @@ struct FlowEventPlane { |
206 | 205 | histos.add("CorrHist/hYZNCVsVz", "Y^{ZNC}_{1} Vs V_{z}", kTProfile, {axisFineVz}); |
207 | 206 | histos.add("Checks/hPsiSPA", "#Psi_{SP}^{A} distribution", kTH2F, {axisCent, axisPsi}); |
208 | 207 | histos.add("Checks/hPsiSPC", "#Psi_{SP}^{C} distribution", kTH2F, {axisCent, axisPsi}); |
209 | | - histos.add("Checks/hXaXc", "X^{ZNC}_{1} Vs X^{ZNA}_{1}", kTH3F, {axisCent, axisXa, axisXc}); |
210 | | - histos.add("Checks/hYaYc", "Y^{ZNC}_{1} Vs Y^{ZNA}_{1}", kTH3F, {axisCent, axisYa, axisYc}); |
| 208 | + histos.add("Checks/hXaXc", "X^{ZNC}_{1} Vs X^{ZNA}_{1}", kTProfile, {axisCent}); |
| 209 | + histos.add("Checks/hYaYc", "Y^{ZNC}_{1} Vs Y^{ZNA}_{1}", kTProfile, {axisCent}); |
211 | 210 | histos.add("TrackQA/hPtDcaXY", "DCA_{XY} vs p_{T}", kTH2F, {axisTrackPt, axisTrackDcaXY}); |
212 | 211 | histos.add("TrackQA/hPtDcaZ", "DCA_{Z} vs p_{T}", kTH2F, {axisTrackPt, axisTrackDcaZ}); |
213 | | - histos.add("DF/hQaQc", "X^{A}_{1}X^{C}_{1} + Y^{A}_{1}Y^{C}_{1}", kTH2F, {axisCent, axisXYac}); |
| 212 | + histos.add("DF/hQaQc", "X^{A}_{1}X^{C}_{1} + Y^{A}_{1}Y^{C}_{1}", kTProfile, {axisCent}); |
214 | 213 | histos.add("DF/hAQuPos", "u_{x}X^{A}_{1} + u_{y}Y^{A}_{1}", kTH3F, {axisCent, axisV1, axisTrackEta}); |
215 | 214 | histos.add("DF/hCQuPos", "u_{x}X^{C}_{1} + u_{y}Y^{C}_{1}", kTH3F, {axisCent, axisV1, axisTrackEta}); |
216 | 215 | histos.add("DF/hAQuNeg", "u_{x}X^{A}_{1} + u_{y}Y^{A}_{1}", kTH3F, {axisCent, axisV1, axisTrackEta}); |
@@ -272,7 +271,7 @@ struct FlowEventPlane { |
272 | 271 | bool selectTrack(T const& track) |
273 | 272 | { |
274 | 273 | if (track.pt() <= cTrackMinPt || track.pt() >= cTrackMaxPt || std::abs(track.eta()) >= cTrackEtaCut) { |
275 | | - return false |
| 274 | + return false; |
276 | 275 | } |
277 | 276 |
|
278 | 277 | if (cTrackGlobal && !track.isGlobalTrackWoDCA()) { |
@@ -302,7 +301,7 @@ struct FlowEventPlane { |
302 | 301 | vAvgOutput[cntrx] += hp->GetBinContent(hp->GetXaxis()->FindBin(vCollParam[cntry])); |
303 | 302 | } else { |
304 | 303 | THnF* hn = reinterpret_cast<THnF*>(obj->Clone()); |
305 | | - for (int i = 0; i < vAvgOutput.size(); ++i) { |
| 304 | + for (int i = 0; i < (int)vHistNames.size(); ++i) { |
306 | 305 | binarray[i] = hn->GetAxis(i)->FindBin(vCollParam[i]); |
307 | 306 | } |
308 | 307 | vAvgOutput[cntrx] += hn->GetBinContent(hn->GetBin(binarray)); |
@@ -476,8 +475,8 @@ struct FlowEventPlane { |
476 | 475 |
|
477 | 476 | // Fill X and Y histograms |
478 | 477 | fillCorrHist(vCollParam, vSP); |
479 | | - histos.fill(HIST("Checks/hXaXc"), cent, vSP[kXa], vSP[kXc]); |
480 | | - histos.fill(HIST("Checks/hYaYc"), cent, vSP[kYa], vSP[kYc]); |
| 478 | + histos.fill(HIST("Checks/hXaXc"), cent, (vSP[kXa] * vSP[kXc])); |
| 479 | + histos.fill(HIST("Checks/hYaYc"), cent, (vSP[kYa] * vSP[kYc])); |
481 | 480 | histos.fill(HIST("Checks/hPsiSPA"), cent, std::atan2(vSP[kYa], vSP[kXa])); |
482 | 481 | histos.fill(HIST("Checks/hPsiSPC"), cent, std::atan2(vSP[kYc], vSP[kXc])); |
483 | 482 |
|
@@ -517,5 +516,5 @@ struct FlowEventPlane { |
517 | 516 | WorkflowSpec defineDataProcessing(ConfigContext const& cfgc) |
518 | 517 | { |
519 | 518 | return WorkflowSpec{ |
520 | | - adaptAnalysisTask<flowEventPlane>(cfgc)}; |
| 519 | + adaptAnalysisTask<FlowEventPlane>(cfgc)}; |
521 | 520 | } |
0 commit comments