Skip to content

Commit 43788ea

Browse files
committed
adding a new task for correlation studies (correction)
1 parent c99a5de commit 43788ea

1 file changed

Lines changed: 20 additions & 17 deletions

File tree

‎PWGCF/MultiparticleCorrelations/Tasks/multiparticleCorrelationsDm.cxx‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// granted to it by virtue of its status as an Intergovernmental Organization
1111
// or submit itself to any jurisdiction.
1212

13-
/// \file student-o2physics.cxx
13+
/// \file multiparticleCorrelationsDm.cxx
1414
/// \brief Task to calculate multiparticle correlations and related observables
1515
/// \author Daniel Molnar
1616

@@ -22,12 +22,12 @@
2222
#include "Common/DataModel/Multiplicity.h"
2323
#include "Common/DataModel/TrackSelectionTables.h" // needed for aod::TracksDCA table
2424

25-
#include "CommonConstants/MathConstants.h"
26-
#include "Framework/AnalysisDataModel.h"
27-
#include "Framework/AnalysisTask.h"
28-
#include "Framework/DataTypes.h"
29-
#include "Framework/runDataProcessing.h"
3025
#include <CCDB/BasicCCDBManager.h>
26+
#include <CommonConstants/MathConstants.h>
27+
#include <Framework/AnalysisDataModel.h>
28+
#include <Framework/AnalysisTask.h>
29+
#include <Framework/DataTypes.h>
30+
#include <Framework/runDataProcessing.h>
3131

3232
using namespace o2;
3333
using namespace o2::framework;
@@ -54,6 +54,9 @@ using TrackSim = aod::McParticles::iterator;
5454
#include <TString.h>
5555
#include <TSystem.h>
5656

57+
#include <string>
58+
#include <vector>
59+
5760
// *) Define enums:
5861
enum ERecSim { ERec = 0,
5962
ESim,
@@ -307,7 +310,7 @@ struct StudentO2Physics { // this name is used in lower-case format to name the
307310
// File you want to access is in your home directory in AliEn.
308311
// In this branch, there is a special code to support file access in that case.
309312

310-
TGrid* alien = TGrid::Connect("alien", gSystem->Getenv("USER"), "", "");
313+
const TGrid* alien = TGrid::Connect("alien", gSystem->Getenv("USER"), "", "");
311314
// add #include <TGrid.h> for it to work
312315

313316
if (!alien) {
@@ -458,7 +461,7 @@ struct StudentO2Physics { // this name is used in lower-case format to name the
458461
return true; // all particle cuts passed
459462
}
460463

461-
//__ Fill all event histograms __ ba = EBefore or EAfter
464+
//__ Fill all event histograms __ #ba = EBefore or EAfter
462465
template <ERecSim rs, typename T1, typename T2>
463466
void fillEventHistograms(T1 const& collision, T2 const& tracks, EBeforeAfter ba)
464467
{
@@ -679,47 +682,47 @@ struct StudentO2Physics { // this name is used in lower-case format to name the
679682

680683
// *) Book (pt distribution and azimuthal-angle histograms) + event quantities with binning defined through configurables in the json file:
681684
std::vector<float> lPtBins = cfPtBins.value; // define local array and initialize it from an array set in the configurables
682-
int nBins = (int)lPtBins[0];
685+
int nBins = static_cast<int>(lPtBins[0]);
683686
float min = lPtBins[1];
684687
float max = lPtBins[2];
685688

686689
std::vector<float> lPhiBins = cfPhiBins.value; // azimuthal angle
687-
int nPhiBins = (int)lPhiBins[0];
690+
int nPhiBins = static_cast<int>(lPhiBins[0]);
688691
float phiMin = lPhiBins[1];
689692
float phiMax = lPhiBins[2];
690693

691694
std::vector<float> lMultBins = cfMultiplicityBins.value; // multiplicity
692-
int nMultBins = (int)lMultBins[0];
695+
int nMultBins = static_cast<int>(lMultBins[0]);
693696
float multMin = lMultBins[1];
694697
float multMax = lMultBins[2];
695698

696699
std::vector<float> lRefmultBins = cfRefmultiplicityBins.value; // reference multiplicity
697-
int nRefMultBins = (int)lRefmultBins[0];
700+
int nRefMultBins = static_cast<int>(lRefmultBins[0]);
698701
float refMultMin = lRefmultBins[1];
699702
float refMultMax = lRefmultBins[2];
700703

701704
std::vector<float> lCentBins = cfCentralityBins.value; // centrality
702-
int nCentBins = (int)lCentBins[0];
705+
int nCentBins = static_cast<int>(lCentBins[0]);
703706
float centMin = lCentBins[1];
704707
float centMax = lCentBins[2];
705708

706709
std::vector<float> lBBins = cfImpactparameterBins.value; // impact parameter
707-
int nBBins = (int)lBBins[0];
710+
int nBBins = static_cast<int>(lBBins[0]);
708711
float bMin = lBBins[1];
709712
float bMax = lBBins[2];
710713

711714
std::vector<float> lVxBins = cfVertexXBins.value; // vertex X
712-
int nvxBins = (int)lVxBins[0];
715+
int nvxBins = static_cast<int>(lVxBins[0]);
713716
float vxMin = lVxBins[1];
714717
float vxMax = lVxBins[2];
715718

716719
std::vector<float> lVyBins = cfVertexYBins.value; // vertex y
717-
int nvyBins = (int)lVyBins[0];
720+
int nvyBins = static_cast<int>(lVyBins[0]);
718721
float vyMin = lVyBins[1];
719722
float vyMax = lVyBins[2];
720723

721724
std::vector<float> lVzBins = cfVertexZBins.value; // vertex z
722-
int nvzBins = (int)lVzBins[0];
725+
int nvzBins = static_cast<int>(lVzBins[0]);
723726
float vzMin = lVzBins[1];
724727
float vzMax = lVzBins[2];
725728

0 commit comments

Comments
 (0)