Skip to content

Commit 1d2e07f

Browse files
mcoquet642mcoquet642
committed
bug fixes tableReader_withAssoc_direct
1 parent b9f5598 commit 1d2e07f

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

‎PWGDQ/Tasks/tableReader_withAssoc_direct.cxx‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ struct AnalysisEventSelection {
370370
if (fConfigQA) {
371371
fHistMan = new HistogramManager("analysisHistos", "", VarManager::kNVars);
372372
fHistMan->SetUseDefaultVariableNames(true);
373-
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
373+
fHistMan->SetDefaultVarNames(static_cast<TString*>(VarManager::fgVariableNames), static_cast<TString*>(VarManager::fgVariableUnits));
374374
DefineHistograms(fHistMan, "TimeFrameStats;Event_BeforeCuts;Event_AfterCuts;", fConfigAddEventHistogram.value.data());
375375
if (fConfigCheckSplitCollisions) {
376376
DefineHistograms(fHistMan, "OutOfBunchCorrelations;SameBunchCorrelations;", "");
@@ -481,7 +481,7 @@ struct AnalysisEventSelection {
481481
VarManager::FillTimeFrame(bcs);
482482
VarManager::FillTimeFrame(events);
483483
if (fConfigQA) {
484-
fHistMan->FillHistClass("TimeFrameStats", VarManager::fgValues);
484+
fHistMan->FillHistClass("TimeFrameStats", static_cast<float*>(VarManager::fgValues));
485485
}
486486

487487
fSelMap.clear();
@@ -496,7 +496,7 @@ struct AnalysisEventSelection {
496496

497497
// the hash table is joined to the events by row order, so publish one row per event before any event selection
498498
if (fMixHandler != nullptr) {
499-
int hh = fMixHandler->FindEventCategory(VarManager::fgValues);
499+
int hh = fMixHandler->FindEventCategory(static_cast<float*>(VarManager::fgValues));
500500
// events outside the mixing limits (-1) get a distinct negative hash so that they are not mixed with each other
501501
if (hh < 0) {
502502
hh = -1 - static_cast<int>(event.globalIndex());
@@ -506,7 +506,7 @@ struct AnalysisEventSelection {
506506

507507
bool decision = false;
508508
if (fConfigQA) {
509-
fHistMan->FillHistClass("Event_BeforeCuts", VarManager::fgValues);
509+
fHistMan->FillHistClass("Event_BeforeCuts", static_cast<float*>(VarManager::fgValues));
510510
}
511511

512512
if (fConfigZorro.fConfigRunZorro) {
@@ -515,7 +515,7 @@ struct AnalysisEventSelection {
515515
zorro.initCCDB(fCCDB.service, fCurrentRun, bc.timestamp(), fConfigZorro.fConfigZorroTrigMask.value);
516516
zorro.populateExternalHists(fCurrentRun, dynamic_cast<TH2D*>(fStatsList->At(kStatsZorroInfo)), dynamic_cast<TH2D*>(fStatsList->At(kStatsZorroSel)));
517517

518-
if (!fEventCut->IsSelected(VarManager::fgValues) || (fConfigRCT.fConfigUseRCT.value && !rctChecker(event))) {
518+
if (!fEventCut->IsSelected(static_cast<float*>(VarManager::fgValues)) || (fConfigRCT.fConfigUseRCT.value && !rctChecker(event))) {
519519
continue;
520520
}
521521

@@ -525,14 +525,14 @@ struct AnalysisEventSelection {
525525
}
526526
} else {
527527

528-
if (!fEventCut->IsSelected(VarManager::fgValues) || (fConfigRCT.fConfigUseRCT.value && !rctChecker(event))) {
528+
if (!fEventCut->IsSelected(static_cast<float*>(VarManager::fgValues)) || (fConfigRCT.fConfigUseRCT.value && !rctChecker(event))) {
529529
continue;
530530
}
531531
}
532532

533533
decision = true;
534534
if (fConfigQA) {
535-
fHistMan->FillHistClass("Event_AfterCuts", VarManager::fgValues);
535+
fHistMan->FillHistClass("Event_AfterCuts", static_cast<float*>(VarManager::fgValues));
536536
}
537537

538538
fSelMap[event.globalIndex()] = decision;
@@ -572,7 +572,7 @@ struct AnalysisEventSelection {
572572
collisionSplittingMap[*ev2It] = true;
573573
}
574574
if (fConfigQA) {
575-
fHistMan->FillHistClass("SameBunchCorrelations", VarManager::fgValues);
575+
fHistMan->FillHistClass("SameBunchCorrelations", static_cast<float*>(VarManager::fgValues));
576576
}
577577
} // end second event loop
578578
} // end first event loop
@@ -599,7 +599,7 @@ struct AnalysisEventSelection {
599599
collisionSplittingMap[ev2It] = true;
600600
}
601601
if (fConfigQA) {
602-
fHistMan->FillHistClass("OutOfBunchCorrelations", VarManager::fgValues);
602+
fHistMan->FillHistClass("OutOfBunchCorrelations", static_cast<float*>(VarManager::fgValues));
603603
}
604604
}
605605
}
@@ -707,7 +707,7 @@ struct AnalysisTrackSelection {
707707
if (fConfigQA) {
708708
fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
709709
fHistMan->SetUseDefaultVariableNames(kTRUE);
710-
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
710+
fHistMan->SetDefaultVarNames(static_cast<TString*>(VarManager::fgVariableNames), static_cast<TString*>(VarManager::fgVariableUnits));
711711

712712
// Configure histogram classes for each track cut;
713713
TString histClasses = "TimeFrameStats;AssocsBarrel_BeforeCuts;";
@@ -747,7 +747,7 @@ struct AnalysisTrackSelection {
747747
VarManager::FillTimeFrame(events);
748748
VarManager::FillTimeFrame(tracks);
749749
if (fConfigQA) {
750-
fHistMan->FillHistClass("TimeFrameStats", VarManager::fgValues);
750+
fHistMan->FillHistClass("TimeFrameStats", static_cast<float*>(VarManager::fgValues));
751751
}
752752

753753
if (bcs.size() > 0 && fCurrentRun != bcs.begin().runNumber()) {
@@ -799,16 +799,16 @@ struct AnalysisTrackSelection {
799799
}
800800

801801
if (fConfigQA) {
802-
fHistMan->FillHistClass("AssocsBarrel_BeforeCuts", VarManager::fgValues);
802+
fHistMan->FillHistClass("AssocsBarrel_BeforeCuts", static_cast<float*>(VarManager::fgValues));
803803
}
804804

805805
int iCut = 0;
806806
auto filterMap = static_cast<uint32_t>(0);
807807
for (auto cut = fTrackCuts.begin(); cut != fTrackCuts.end(); cut++, iCut++) {
808-
if ((*cut)->IsSelected(VarManager::fgValues)) {
808+
if ((*cut)->IsSelected(static_cast<float*>(VarManager::fgValues))) {
809809
filterMap |= (static_cast<uint32_t>(1) << iCut);
810810
if (fConfigQA) {
811-
fHistMan->FillHistClass(fHistNamesReco[iCut], VarManager::fgValues);
811+
fHistMan->FillHistClass(fHistNamesReco[iCut], static_cast<float*>(VarManager::fgValues));
812812
}
813813
}
814814
} // end loop over cuts
@@ -850,7 +850,7 @@ struct AnalysisTrackSelection {
850850
VarManager::ResetValues(0, VarManager::kNBarrelTrackVariables);
851851
VarManager::FillTrack<TTrackFillMap>(track);
852852
VarManager::fgValues[VarManager::kBarrelNAssocsInBunch] = static_cast<float>(evIndices.size());
853-
fHistMan->FillHistClass("TrackBarrel_AmbiguityInBunch", VarManager::fgValues);
853+
fHistMan->FillHistClass("TrackBarrel_AmbiguityInBunch", static_cast<float*>(VarManager::fgValues));
854854
} // end loop over in-bunch ambiguous tracks
855855

856856
for (auto& [trackIdx, evIndices] : fNAssocsOutOfBunch) {
@@ -861,7 +861,7 @@ struct AnalysisTrackSelection {
861861
VarManager::ResetValues(0, VarManager::kNBarrelTrackVariables);
862862
VarManager::FillTrack<TTrackFillMap>(track);
863863
VarManager::fgValues[VarManager::kBarrelNAssocsOutOfBunch] = static_cast<float>(evIndices.size());
864-
fHistMan->FillHistClass("TrackBarrel_AmbiguityOutOfBunch", VarManager::fgValues);
864+
fHistMan->FillHistClass("TrackBarrel_AmbiguityOutOfBunch", static_cast<float*>(VarManager::fgValues));
865865
} // end loop over out-of-bunch ambiguous tracks
866866
}
867867

@@ -1029,7 +1029,7 @@ struct AnalysisPrefilterSelection {
10291029
VarManager::FillPairCollision<VarManager::kDecayToEE, gkTrackFillMapWithCov>(event, track1, track2);
10301030
}
10311031
// if the pair fullfils the criteria, add an entry into the prefilter map for the two tracks
1032-
if (fPairCut->IsSelected(VarManager::fgValues)) {
1032+
if (fPairCut->IsSelected(static_cast<float*>(VarManager::fgValues))) {
10331033
if (fPrefilterMap.find(track1.globalIndex()) == fPrefilterMap.end() && track1Candidate > 0) {
10341034
fPrefilterMap[track1.globalIndex()] = track1Candidate;
10351035
}
@@ -1147,7 +1147,7 @@ struct AnalysisMuonSelection {
11471147
if (fHistMan == nullptr) {
11481148
fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
11491149
fHistMan->SetUseDefaultVariableNames(kTRUE);
1150-
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
1150+
fHistMan->SetDefaultVarNames(static_cast<TString*>(VarManager::fgVariableNames), static_cast<TString*>(VarManager::fgVariableUnits));
11511151

11521152
TString histDirNames = "TrackMuon_BeforeCuts;";
11531153
for (auto& cut : fMuonCuts) {
@@ -1211,14 +1211,14 @@ struct AnalysisMuonSelection {
12111211
filterMap = static_cast<uint32_t>(0);
12121212
VarManager::FillTrack<TMuonFillMap>(track);
12131213
if (fConfigQA) {
1214-
fHistMan->FillHistClass("TrackMuon_BeforeCuts", VarManager::fgValues);
1214+
fHistMan->FillHistClass("TrackMuon_BeforeCuts", static_cast<float*>(VarManager::fgValues));
12151215
}
12161216
iCut = 0;
12171217
for (auto cut = fMuonCuts.begin(); cut != fMuonCuts.end(); cut++, iCut++) {
1218-
if ((*cut)->IsSelected(VarManager::fgValues)) {
1218+
if ((*cut)->IsSelected(static_cast<float*>(VarManager::fgValues))) {
12191219
filterMap |= (static_cast<uint32_t>(1) << iCut);
12201220
if (fConfigQA) {
1221-
fHistMan->FillHistClass(Form("TrackMuon_%s", (*cut)->GetName()), VarManager::fgValues);
1221+
fHistMan->FillHistClass(Form("TrackMuon_%s", (*cut)->GetName()), static_cast<float*>(VarManager::fgValues));
12221222
}
12231223
}
12241224
}
@@ -1251,7 +1251,7 @@ struct AnalysisMuonSelection {
12511251
VarManager::ResetValues(0, VarManager::kNMuonTrackVariables);
12521252
VarManager::FillTrack<TMuonFillMap>(track);
12531253
VarManager::fgValues[VarManager::kMuonNAssocsInBunch] = static_cast<float>(evIndices.size());
1254-
fHistMan->FillHistClass("TrackMuon_AmbiguityInBunch", VarManager::fgValues);
1254+
fHistMan->FillHistClass("TrackMuon_AmbiguityInBunch", static_cast<float*>(VarManager::fgValues));
12551255
}
12561256
for (auto& [trackIdx, evIndices] : fNAssocsOutOfBunch) {
12571257
if (evIndices.size() <= 1) {
@@ -1261,7 +1261,7 @@ struct AnalysisMuonSelection {
12611261
VarManager::ResetValues(0, VarManager::kNMuonTrackVariables);
12621262
VarManager::FillTrack<TMuonFillMap>(track);
12631263
VarManager::fgValues[VarManager::kMuonNAssocsOutOfBunch] = static_cast<float>(evIndices.size());
1264-
fHistMan->FillHistClass("TrackMuon_AmbiguityOutOfBunch", VarManager::fgValues);
1264+
fHistMan->FillHistClass("TrackMuon_AmbiguityOutOfBunch", static_cast<float*>(VarManager::fgValues));
12651265
}
12661266
}
12671267
// publish ambiguity table (one row per FwdTrack)
@@ -1549,7 +1549,7 @@ struct AnalysisSameEventPairing {
15491549

15501550
fHistMan = new HistogramManager("analysisHistos", "aa", VarManager::kNVars);
15511551
fHistMan->SetUseDefaultVariableNames(kTRUE);
1552-
fHistMan->SetDefaultVarNames(VarManager::fgVariableNames, VarManager::fgVariableUnits);
1552+
fHistMan->SetDefaultVarNames(static_cast<TString*>(VarManager::fgVariableNames), static_cast<TString*>(VarManager::fgVariableUnits));
15531553

15541554
VarManager::SetCollisionSystem((TString)fConfigOptions.collisionSystem, fConfigOptions.centerMassEnergy); // set collision system and center of mass energy
15551555

@@ -1722,7 +1722,7 @@ struct AnalysisSameEventPairing {
17221722
}
17231723

17241724
VarManager::ResetValues(0, VarManager::kNVars);
1725-
VarManager::FillEvent<TEventFillMap>(event, VarManager::fgValues);
1725+
VarManager::FillEvent<TEventFillMap>(event, static_cast<float*>(VarManager::fgValues));
17261726

17271727
auto groupedAssocs = assocs.sliceBy(preslice, event.globalIndex());
17281728
if (groupedAssocs.size() == 0) {
@@ -1822,53 +1822,53 @@ struct AnalysisSameEventPairing {
18221822
for (int icut = 0; icut < ncuts; icut++) { // loop over cut definitions
18231823
if (twoTrackFilter & (static_cast<uint32_t>(1) << icut)) {
18241824
if (sign1 * sign2 < 0) { // opposite sign pairs
1825-
fHistMan->FillHistClass(histNames[icut][0].Data(), VarManager::fgValues);
1825+
fHistMan->FillHistClass(histNames[icut][0].Data(), static_cast<float*>(VarManager::fgValues));
18261826
PromptNonPromptSepTable(VarManager::fgValues[VarManager::kMass], VarManager::fgValues[VarManager::kPt], VarManager::fgValues[VarManager::kEta], VarManager::fgValues[VarManager::kRap], VarManager::fgValues[VarManager::kPhi],
18271827
VarManager::fgValues[VarManager::kVertexingTauxyProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMass], VarManager::fgValues[VarManager::kVertexingTauzProjected], VarManager::fgValues[VarManager::kVertexingTauxyProjectedPoleJPsiMassRecalculatePV],
18281828
VarManager::fgValues[VarManager::kVtxX], VarManager::fgValues[VarManager::kVtxY], VarManager::fgValues[VarManager::kVtxZ], VarManager::fgValues[VarManager::kDCAxy1], VarManager::fgValues[VarManager::kDCAz1], VarManager::fgValues[VarManager::kITSclusterMap1], VarManager::fgValues[VarManager::kTPCnSigmaEl1], VarManager::fgValues[VarManager::kDCAxy2], VarManager::fgValues[VarManager::kDCAz2], VarManager::fgValues[VarManager::kITSclusterMap2], VarManager::fgValues[VarManager::kTPCnSigmaEl2],
18291829
isAmbiInBunch, isAmbiOutOfBunch, VarManager::fgValues[VarManager::kMultFT0A], VarManager::fgValues[VarManager::kMultFT0C], VarManager::fgValues[VarManager::kCentFT0M], VarManager::fgValues[VarManager::kVtxNcontribReal]);
18301830
if (fConfigOptions.fConfigQA) {
18311831
if (isAmbiInBunch) {
1832-
fHistMan->FillHistClass(histNames[icut][3].Data(), VarManager::fgValues);
1832+
fHistMan->FillHistClass(histNames[icut][3].Data(), static_cast<float*>(VarManager::fgValues));
18331833
}
18341834
if (isAmbiOutOfBunch) {
1835-
fHistMan->FillHistClass(histNames[icut][3 + 3].Data(), VarManager::fgValues);
1835+
fHistMan->FillHistClass(histNames[icut][3 + 3].Data(), static_cast<float*>(VarManager::fgValues));
18361836
}
18371837
}
18381838
} else if (sign1 > 0) { // ++ pairs
1839-
fHistMan->FillHistClass(histNames[icut][1].Data(), VarManager::fgValues);
1839+
fHistMan->FillHistClass(histNames[icut][1].Data(), static_cast<float*>(VarManager::fgValues));
18401840
if (fConfigOptions.fConfigQA) {
18411841
if (isAmbiInBunch) {
1842-
fHistMan->FillHistClass(histNames[icut][4].Data(), VarManager::fgValues);
1842+
fHistMan->FillHistClass(histNames[icut][4].Data(), static_cast<float*>(VarManager::fgValues));
18431843
}
18441844
if (isAmbiOutOfBunch) {
1845-
fHistMan->FillHistClass(histNames[icut][4 + 3].Data(), VarManager::fgValues);
1845+
fHistMan->FillHistClass(histNames[icut][4 + 3].Data(), static_cast<float*>(VarManager::fgValues));
18461846
}
18471847
}
18481848
} else { // -- pairs
1849-
fHistMan->FillHistClass(histNames[icut][2].Data(), VarManager::fgValues);
1849+
fHistMan->FillHistClass(histNames[icut][2].Data(), static_cast<float*>(VarManager::fgValues));
18501850
if (fConfigOptions.fConfigQA) {
18511851
if (isAmbiInBunch) {
1852-
fHistMan->FillHistClass(histNames[icut][5].Data(), VarManager::fgValues);
1852+
fHistMan->FillHistClass(histNames[icut][5].Data(), static_cast<float*>(VarManager::fgValues));
18531853
}
18541854
if (isAmbiOutOfBunch) {
1855-
fHistMan->FillHistClass(histNames[icut][5 + 3].Data(), VarManager::fgValues);
1855+
fHistMan->FillHistClass(histNames[icut][5 + 3].Data(), static_cast<float*>(VarManager::fgValues));
18561856
}
18571857
}
18581858
}
18591859

18601860
// Pair cuts
18611861
for (unsigned int iPairCut = 0; iPairCut < fPairCuts.size(); iPairCut++) {
18621862
AnalysisCompositeCut cut = fPairCuts.at(iPairCut);
1863-
if (!cut.IsSelected(VarManager::fgValues)) {
1863+
if (!cut.IsSelected(static_cast<float*>(VarManager::fgValues))) {
18641864
continue; // apply pair cuts
18651865
}
18661866
if (sign1 * sign2 < 0) { // opposite sign pairs
1867-
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][0].Data(), VarManager::fgValues);
1867+
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][0].Data(), static_cast<float*>(VarManager::fgValues));
18681868
} else if (sign1 > 0) { // ++ pairs
1869-
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][1].Data(), VarManager::fgValues);
1869+
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][1].Data(), static_cast<float*>(VarManager::fgValues));
18701870
} else { // -- pairs
1871-
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][2].Data(), VarManager::fgValues);
1871+
fHistMan->FillHistClass(histNames[ncuts + icut * fPairCuts.size() + iPairCut][2].Data(), static_cast<float*>(VarManager::fgValues));
18721872
}
18731873
} // end loop (pair cuts)
18741874
}
@@ -1912,7 +1912,7 @@ struct AnalysisSameEventPairing {
19121912
}
19131913

19141914
VarManager::ResetValues(0, VarManager::kNVars);
1915-
VarManager::FillEvent<TEventFillMap>(event, VarManager::fgValues);
1915+
VarManager::FillEvent<TEventFillMap>(event, static_cast<float*>(VarManager::fgValues));
19161916

19171917
auto groupedAssocs1 = assocs1.sliceBy(preslice1, event.globalIndex());
19181918
if (groupedAssocs1.size() == 0) {
@@ -1984,11 +1984,11 @@ struct AnalysisSameEventPairing {
19841984
continue;
19851985
}
19861986
if (sign1 * sign2 < 0) {
1987-
fHistMan->FillHistClass(itHist->second[0].Data(), VarManager::fgValues);
1987+
fHistMan->FillHistClass(itHist->second[0].Data(), static_cast<float*>(VarManager::fgValues));
19881988
} else if (sign1 > 0) {
1989-
fHistMan->FillHistClass(itHist->second[1].Data(), VarManager::fgValues);
1989+
fHistMan->FillHistClass(itHist->second[1].Data(), static_cast<float*>(VarManager::fgValues));
19901990
} else {
1991-
fHistMan->FillHistClass(itHist->second[2].Data(), VarManager::fgValues);
1991+
fHistMan->FillHistClass(itHist->second[2].Data(), static_cast<float*>(VarManager::fgValues));
19921992
}
19931993
} // end muon cut loop
19941994
} // end barrel cut loop

0 commit comments

Comments
 (0)