Skip to content

Commit 0d79f01

Browse files
abilandzabilandz
authored
[PWGCF] massive fix for O2linter + minor fix for vs M calculus in Internal Va… (#17043)
1 parent cf1677e commit 0d79f01

7 files changed

Lines changed: 3061 additions & 2903 deletions

File tree

‎PWGCF/MultiparticleCorrelations/Core/MuPa-Configurables.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// or submit itself to any jurisdiction.
1111

1212
/// \file MuPa-Configurables.h
13-
/// \brief ... TBI 20250425
13+
/// \brief Task to calculate multiparticle correlations and related observables
1414
/// \author Ante.Bilandzic@cern.ch
1515

1616
#ifndef PWGCF_MULTIPARTICLECORRELATIONS_CORE_MUPA_CONFIGURABLES_H_
@@ -231,9 +231,9 @@ struct : ConfigurableGroup {
231231
Configurable<bool> cfUseDiffPhiPtWeights{"cfUseDiffPhiPtWeights", false, "use or not differential phi(pt) weights"};
232232
Configurable<bool> cfUseDiffPhiEtaWeights{"cfUseDiffPhiEtaWeights", false, "use or not differential phi(eta) weights"};
233233
Configurable<std::vector<std::string>> cfWhichDiffPhiWeights{"cfWhichDiffPhiWeights", {"1-wPhi", "1-wPt", "1-wEta", "1-wCharge", "1-wCentrality", "1-wVertexZ"}, "use (1) or do not use (0) differential phi weight for particular dimension. If only phi is set to 1, integrated phi weights are used. If phi is set to 0, ALL dimensions are switched off (yes!)"};
234-
Configurable<std::vector<std::string>> cfWhichDiffPtWeights{"cfWhichDiffPtWeights", {"0-wPt", "0-wEta", "0-wCharge", "0-wCentrality"}, "use (1) or do not use (0) differential pt weight for particular dimension. If only pt is set to 1, integrated pt weights are used. If pt is set to 0, ALL dimensions are switched off (yes!)"};
235-
Configurable<std::vector<std::string>> cfWhichDiffEtaWeights{"cfWhichDiffEtaWeights", {"0-wEta", "0-wPt", "0-wCharge", "0-wCentrality"}, "use (1) or do not use (0) differential eta weight for particular dimension. If only eta is set to 1, integrated eta weights are used. If eta is set to 0, ALL dimensions are switched off (yes!)"};
236-
Configurable<std::vector<std::string>> cfWhichDiffChargeWeights{"cfWhichDiffChargeWeights", {"0-wCharge", "0-wPt", "0-wEta", "0-wCentrality"}, "use (1) or do not use (0) differential charge weight for particular dimension. If only charge is set to 1, integrated charge weights are used. If charge is set to 0, ALL dimensions are switched off (yes!)"};
234+
Configurable<std::vector<std::string>> cfWhichDiffPtWeights{"cfWhichDiffPtWeights", {"0-wPt", "0-wEta", "0-wCharge", "0-wCentrality", "0-wVertexZ"}, "use (1) or do not use (0) differential pt weight for particular dimension. If only pt is set to 1, integrated pt weights are used. If pt is set to 0, ALL dimensions are switched off (yes!)"};
235+
Configurable<std::vector<std::string>> cfWhichDiffEtaWeights{"cfWhichDiffEtaWeights", {"0-wEta", "0-wPt", "0-wCharge", "0-wCentrality", "0-wVertexZ"}, "use (1) or do not use (0) differential eta weight for particular dimension. If only eta is set to 1, integrated eta weights are used. If eta is set to 0, ALL dimensions are switched off (yes!)"};
236+
Configurable<std::vector<std::string>> cfWhichDiffChargeWeights{"cfWhichDiffChargeWeights", {"0-wCharge", "0-wPt", "0-wEta", "0-wCentrality", "0-wVertexZ"}, "use (1) or do not use (0) differential charge weight for particular dimension. If only charge is set to 1, integrated charge weights are used. If charge is set to 0, ALL dimensions are switched off (yes!)"};
237237
Configurable<std::string> cfFileWithWeights{"cfFileWithWeights", "/home/abilandz/DatasetsO2/weights.root", "path to external ROOT file which holds all particle weights in O2 format"}; // for AliEn file prepend "/alice/cern.ch/", for CCDB prepend "/alice-ccdb.cern.ch"
238238
} cf_pw;
239239

‎PWGCF/MultiparticleCorrelations/Core/MuPa-DataMembers.h‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// or submit itself to any jurisdiction.
1111

1212
/// \file MuPa-DataMembers.h
13-
/// \brief ... TBI 20250425
13+
/// \brief Task to calculate multiparticle correlations and related observables
1414
/// \author Ante.Bilandzic@cern.ch
1515

1616
#ifndef PWGCF_MULTIPARTICLECORRELATIONS_CORE_MUPA_DATAMEMBERS_H_
@@ -86,7 +86,8 @@ struct TaskConfiguration {
8686
// || es.fCalculateEtaSeparationsAsFunctionOf[AFO_PT]
8787
bool fCalculate2DAsFunctionOf[eAsFunctionOf2D_N] = {false}; //! See example above for 1D case + enum for 2D details
8888
bool fCalculate3DAsFunctionOf[eAsFunctionOf3D_N] = {false}; //! See example above for 1D case + enum for 3D details
89-
TDatabasePDG* fDatabasePDG = NULL; // booked only when MC info is available. There is a standard memory blow-up when booked, therefore I need to request also fUseDatabasePDG = true
89+
TDatabasePDG* fDatabasePDG = NULL; // o2-linter: disable=pdg/database (using until o2::framework::O2DatabasePDG lazy initialization is provided)
90+
// booked only when MC info is available. There is a standard memory blow-up when booked, therefore I need to request also fUseDatabasePDG = true
9091
// TBI 20250625 replace eventually with the service O2DatabasePDG, when memory consumption problem is resolved
9192
bool fUseSetBinLabel = false; // until SetBinLabel(...) large memory consumption is resolved, do not use hist->SetBinLabel(...), see ROOT Forum
9293
// See also local executable PostprocessLabels.C
@@ -165,15 +166,15 @@ struct QualityAssurance {
165166
bool fBookQACorrelationsVsHistograms2D[eQACorrelationsVsHistograms2D_N] = {true}; // book or not this 2D histogram, see configurable cfBookQACorrelationsVsHistograms2D
166167
float fQACorrelationsVsHistogramsBins2D[eQACorrelationsVsHistograms2D_N][2][3] = {{{0.}}}; // [type - see enum][x,y][nBins,min,max]
167168
TString fQACorrelationsVsHistogramsName2D[eQACorrelationsVsHistograms2D_N] = {""}; // name of fQACorrelationsVsHistograms2D, determined programatically from other 1D names, to ease bookkeeping
168-
int fQACorrelationsVsHistogramsMinMaxHarmonic[2]; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
169+
int fQACorrelationsVsHistogramsMinMaxHarmonic[2] = {0}; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
169170

170171
TList* fQACorrelationsVsInteractionRateVsList = NULL; //!<! base list to hold all QA "CorrelationsVsInteractionRateVs" output object
171172
TProfile2D* fQACorrVsIRVsProfiles2D[eQACorrelationsVsInteractionRateVsProfiles2D_N][gMaxHarmonic][2] = {{{NULL}}}; //! [ type - see enum eQACorrelationsVsInteractionRateVsProfiles2D_N ][reco,sim]. I do not have here support for [before, after], because I do not fill Q-vectors before cuts
172173
bool fFillQACorrelationsVsInteractionRateVsProfiles2D = true; // if false, all 2D profiles in this category are not filled. If true, the ones for which fBookQACorrelationsVsInteractionRateVsProfiles2D[...] is true, are filled
173174
bool fBookQACorrelationsVsInteractionRateVsProfiles2D[eQACorrelationsVsInteractionRateVsProfiles2D_N] = {true}; // book or not this 2D profile, see configurable cfBookQACorrelationsVsInteractionRateVsProfiles2D
174175
float fQACorrelationsVsInteractionRateVsProfilesBins2D[eQACorrelationsVsInteractionRateVsProfiles2D_N][2][3] = {{{0.}}}; // [type - see enum][x,y][nBins,min,max]
175176
TString fQACorrelationsVsInteractionRateVsProfilesName2D[eQACorrelationsVsInteractionRateVsProfiles2D_N] = {""}; // name of fQACorrelationsVsInteractionRateVsProfiles2D, determined programatically from other 1D names, to ease bookkeeping
176-
int fQACorrelationsVsInteractionRateVsProfilesMinMaxHarmonic[2]; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
177+
int fQACorrelationsVsInteractionRateVsProfilesMinMaxHarmonic[2] = {0}; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
177178

178179
float fReferenceMultiplicity[eReferenceMultiplicityEstimators_N] = {0.}; // used mostly in QA correlation plots
179180
TString fReferenceMultiplicityEstimatorName[eReferenceMultiplicityEstimators_N] = {""}; // TBI 20241123 add comment
@@ -428,14 +429,14 @@ struct Test0 {
428429

429430
// *) Eta separations:
430431
struct EtaSeparations {
431-
TList* fEtaSeparationsList; // list to hold all correlations with eta separations
432-
TProfile* fEtaSeparationsFlagsPro; // profile to hold all flags for correlations with eta separations
433-
bool fCalculateEtaSeparations; // calculate correlations with eta separations
434-
bool fCalculateEtaSeparationsAsFunctionOf[eAsFunctionOf_N] = {false}; //! [0=integrated,1=vs. multiplicity,2=vs. centrality,3=pT,4=eta,5=vs. occupancy, ...]
435-
float fEtaSeparationsValues[gMaxNumberEtaSeparations] = {-1.}; // this array holds eta separation interals for which 2p correlations with eta separation will be calculated
436-
// See the corresponding cofigurable cfEtaSeparationsValues. If entry is -1, it's ignored
437-
bool fEtaSeparationsSkipHarmonics[gMaxHarmonic] = {false}; // For calculation of 2p correlation with eta separation these harmonics will be skipped
438-
TProfile* fEtaSeparationsPro[gMaxHarmonic][gMaxNumberEtaSeparations][eAsFunctionOf_N]; // [harmonic, 0 = v1, 8 = v9][ different eta Separations - see that enum ] [ AFO ]
432+
TList* fEtaSeparationsList = NULL; // list to hold all correlations with eta separations
433+
TProfile* fEtaSeparationsFlagsPro = NULL; // profile to hold all flags for correlations with eta separations
434+
bool fCalculateEtaSeparations = false; // calculate correlations with eta separations
435+
bool fCalculateEtaSeparationsAsFunctionOf[eAsFunctionOf_N] = {false}; //! [0=integrated,1=vs. multiplicity,2=vs. centrality,3=pT,4=eta,5=vs. occupancy, ...]
436+
float fEtaSeparationsValues[gMaxNumberEtaSeparations] = {-1.}; // this array holds eta separation interals for which 2p correlations with eta separation will be calculated
437+
// See the corresponding cofigurable cfEtaSeparationsValues. If entry is -1, it's ignored
438+
bool fEtaSeparationsSkipHarmonics[gMaxHarmonic] = {false}; // For calculation of 2p correlation with eta separation these harmonics will be skipped
439+
TProfile* fEtaSeparationsPro[gMaxHarmonic][gMaxNumberEtaSeparations][eAsFunctionOf_N] = {{{NULL}}}; // [harmonic, 0 = v1, 8 = v9][ different eta Separations - see that enum ] [ AFO ]
439440
} es;
440441

441442
// *) Global cosmetics:

0 commit comments

Comments
 (0)