Skip to content

Commit 72b04bc

Browse files
committed
fix for ML, part 1
1 parent 31c2470 commit 72b04bc

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

PWGCF/MultiparticleCorrelations/Core/MuPa-DataMembers.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@ struct QualityAssurance {
165165
bool fBookQACorrelationsVsHistograms2D[eQACorrelationsVsHistograms2D_N] = {true}; // book or not this 2D histogram, see configurable cfBookQACorrelationsVsHistograms2D
166166
float fQACorrelationsVsHistogramsBins2D[eQACorrelationsVsHistograms2D_N][2][3] = {{{0.}}}; // [type - see enum][x,y][nBins,min,max]
167167
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]
168+
int fQACorrelationsVsHistogramsMinMaxHarmonic[2] = {0}; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
169169

170170
TList* fQACorrelationsVsInteractionRateVsList = NULL; //!<! base list to hold all QA "CorrelationsVsInteractionRateVs" output object
171171
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
172172
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
173173
bool fBookQACorrelationsVsInteractionRateVsProfiles2D[eQACorrelationsVsInteractionRateVsProfiles2D_N] = {true}; // book or not this 2D profile, see configurable cfBookQACorrelationsVsInteractionRateVsProfiles2D
174174
float fQACorrelationsVsInteractionRateVsProfilesBins2D[eQACorrelationsVsInteractionRateVsProfiles2D_N][2][3] = {{{0.}}}; // [type - see enum][x,y][nBins,min,max]
175175
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]
176+
int fQACorrelationsVsInteractionRateVsProfilesMinMaxHarmonic[2] = {0}; // book only for MinMaxHarmonic[0] <= harmonics < MinMaxHarmonic[1]
177177

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

429429
// *) Eta separations:
430430
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 ]
431+
TList* fEtaSeparationsList = NULL; // list to hold all correlations with eta separations
432+
TProfile* fEtaSeparationsFlagsPro = NULL; // profile to hold all flags for correlations with eta separations
433+
bool fCalculateEtaSeparations = false; // 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] = {{{NULL}}}; // [harmonic, 0 = v1, 8 = v9][ different eta Separations - see that enum ] [ AFO ]
439439
} es;
440440

441441
// *) Global cosmetics:

PWGCF/MultiparticleCorrelations/Core/MuPa-MemberFunctions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1976,7 +1976,7 @@ void initializeFixedLengthBins(EnAsFunctionOf afo)
19761976
} // switch(afo)
19771977

19781978
// From this point onward, the code is the same for any afo variable:
1979-
long unsigned int lFixedLengthBinsExpected = 3; // In this array, I expect three entries: nBins, min, max
1979+
unsigned long int lFixedLengthBinsExpected = 3; // In this array, I expect three entries: nBins, min, max
19801980
if (lFixedLengthBins.size() != lFixedLengthBinsExpected) {
19811981
LOGF(fatal, "in function \033[1;31m%s at line %d => The array cfFixedLength_bins must have have 3 entries: {nBins, min, max} \n \033[0m", __FUNCTION__, __LINE__);
19821982
}
@@ -2044,7 +2044,7 @@ void initializeVariableLengthBins(EnAsFunctionOf afo)
20442044
} // switch(afo)
20452045

20462046
// From this point onward, the code is the same for any afo variable:
2047-
long unsigned int lVariableLengthBinsMinExpected = 2; // In this array, I should have at least 2 entries, otherwise, it's pointless...
2047+
unsigned long int lVariableLengthBinsMinExpected = 2; // In this array, I should have at least 2 entries, otherwise, it's pointless...
20482048
if (lVariableLengthBins.size() < lVariableLengthBinsMinExpected) {
20492049
LOGF(fatal, "in function \033[1;31m%s at line %d => The array cfVariableLength_bins must have at least 2 entries \n \033[0m", __FUNCTION__, __LINE__);
20502050
}

0 commit comments

Comments
 (0)