Skip to content

Commit 21672ae

Browse files
mcoquet642mcoquet642
committed
fixing casts
1 parent 0108fc4 commit 21672ae

2 files changed

Lines changed: 37 additions & 37 deletions

File tree

‎PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ struct TableMakerMC {
494494
if (addTrackCutsStr != "") {
495495
std::vector<AnalysisCut*> addTrackCuts = dqcuts::GetCutsFromJSON(addTrackCutsStr.Data());
496496
for (const auto& t : addTrackCuts) {
497-
fTrackCuts.push_back(static_cast<AnalysisCompositeCut*>(t));
497+
fTrackCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
498498
}
499499
}
500500

@@ -511,7 +511,7 @@ struct TableMakerMC {
511511
if (addMuonCutsStr != "") {
512512
std::vector<AnalysisCut*> addMuonCuts = dqcuts::GetCutsFromJSON(addMuonCutsStr.Data());
513513
for (const auto& t : addMuonCuts) {
514-
fMuonCuts.push_back(static_cast<AnalysisCompositeCut*>(t));
514+
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
515515
}
516516
}
517517

@@ -728,10 +728,10 @@ struct TableMakerMC {
728728
// Fill the stats event histogram with the event selection bits
729729
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
730730
if (collision.selection_bit(i)) {
731-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(1.0, static_cast<float>(i));
731+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(1.0, static_cast<float>(i));
732732
}
733733
}
734-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(1.0, static_cast<float>(o2::aod::evsel::kNsel));
734+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(1.0, static_cast<float>(o2::aod::evsel::kNsel));
735735

736736
auto bc = collision.template bc_as<BCsWithTimestamps>();
737737
// store the selection decisions
@@ -762,10 +762,10 @@ struct TableMakerMC {
762762
// fill stats information, before selections
763763
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
764764
if (collision.selection_bit(i)) {
765-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(2.0, static_cast<float>(i));
765+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(2.0, static_cast<float>(i));
766766
}
767767
}
768-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(2.0, static_cast<float>(o2::aod::evsel::kNsel));
768+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(2.0, static_cast<float>(o2::aod::evsel::kNsel));
769769

770770
// Apply the user specified event selection
771771
if (!fEventCut->IsSelected(dqtablemakermc_helpers::varValues()) || (fConfigRCT.fConfigUseRCT.value && !(rctChecker(collision)))) {
@@ -775,10 +775,10 @@ struct TableMakerMC {
775775
// fill stats information, after selections
776776
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
777777
if (collision.selection_bit(i)) {
778-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(3.0, static_cast<float>(i));
778+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(3.0, static_cast<float>(i));
779779
}
780780
}
781-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(3.0, static_cast<float>(o2::aod::evsel::kNsel));
781+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(3.0, static_cast<float>(o2::aod::evsel::kNsel));
782782

783783
// Fill historams after event cuts
784784
fHistMan->FillHistClass("Event_AfterCuts", dqtablemakermc_helpers::varValues());
@@ -879,7 +879,7 @@ struct TableMakerMC {
879879
if (fConfigHistOutput.fConfigQA) {
880880
fHistMan->FillHistClass(Form("TrackBarrel_%s", (*cut)->GetName()), dqtablemakermc_helpers::varValues());
881881
}
882-
(static_cast<TH1I*>(fStatsList->At(1)))->Fill(static_cast<float>(i));
882+
(dynamic_cast<TH1I*>(fStatsList->At(1)))->Fill(static_cast<float>(i));
883883
}
884884
}
885885
if (!trackTempFilterMap) {
@@ -898,7 +898,7 @@ struct TableMakerMC {
898898
trackFilteringTag |= static_cast<uint64_t>(track.pidbit());
899899
for (int iv0 = 0; iv0 < 5; iv0++) {
900900
if (track.pidbit() & (uint8_t(1) << iv0)) {
901-
(static_cast<TH1I*>(fStatsList->At(1)))->Fill(fTrackCuts.size() + static_cast<float>(iv0));
901+
(dynamic_cast<TH1I*>(fStatsList->At(1)))->Fill(fTrackCuts.size() + static_cast<float>(iv0));
902902
}
903903
}
904904
} // end if V0Bits
@@ -1165,7 +1165,7 @@ struct TableMakerMC {
11651165
if (fConfigHistOutput.fConfigQA) {
11661166
fHistMan->FillHistClass(Form("Muons_%s", (*cut)->GetName()), dqtablemakermc_helpers::varValues());
11671167
}
1168-
(static_cast<TH1I*>(fStatsList->At(2)))->Fill(static_cast<float>(i));
1168+
(dynamic_cast<TH1I*>(fStatsList->At(2)))->Fill(static_cast<float>(i));
11691169
}
11701170
}
11711171

@@ -1494,11 +1494,11 @@ struct TableMakerMC {
14941494
mctrack.vx(), mctrack.vy(), mctrack.vz(), mctrack.vt(), mcflags);
14951495
for (unsigned int isig = 0; isig < fMCSignals.size(); isig++) {
14961496
if (mcflags & (static_cast<uint16_t>(1) << isig)) {
1497-
(static_cast<TH1I*>(fStatsList->At(3)))->Fill(static_cast<float>(isig));
1497+
(dynamic_cast<TH1I*>(fStatsList->At(3)))->Fill(static_cast<float>(isig));
14981498
}
14991499
}
15001500
if (mcflags == 0) {
1501-
(static_cast<TH1I*>(fStatsList->At(3)))->Fill(static_cast<float>(fMCSignals.size()));
1501+
(dynamic_cast<TH1I*>(fStatsList->At(3)))->Fill(static_cast<float>(fMCSignals.size()));
15021502
}
15031503
} // end loop over labels
15041504
}
@@ -1692,10 +1692,10 @@ struct TableMakerMC {
16921692
{
16931693
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
16941694
if (static_cast<int>(bc.alias_bit(i)) > 0) {
1695-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(0.0, static_cast<float>(i));
1695+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(0.0, static_cast<float>(i));
16961696
}
16971697
}
1698-
(static_cast<TH2I*>(fStatsList->At(0)))->Fill(0.0, static_cast<float>(o2::aod::evsel::kNsel));
1698+
(dynamic_cast<TH2I*>(fStatsList->At(0)))->Fill(0.0, static_cast<float>(o2::aod::evsel::kNsel));
16991699
}
17001700

17011701
PROCESS_SWITCH(TableMakerMC, processPP, "Produce both barrel and muon skims, pp settings", false);

‎PWGDQ/TableProducer/tableMaker_withAssoc.cxx‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ struct TableMaker {
597597
if (addMuonCutsStr != "") {
598598
std::vector<AnalysisCut*> addMuonCuts = dqcuts::GetCutsFromJSON(addMuonCutsStr.Data());
599599
for (const auto& t : addMuonCuts) {
600-
fMuonCuts.push_back(static_cast<AnalysisCompositeCut*>(t));
600+
fMuonCuts.push_back(dynamic_cast<AnalysisCompositeCut*>(t));
601601
}
602602
}
603603

@@ -1020,20 +1020,20 @@ struct TableMaker {
10201020

10211021
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(0.0, muTVX);
10221022
if (isTvx) {
1023-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(1.0, muTVX);
1023+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(1.0, muTVX);
10241024
if (noBorder) {
1025-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(2.0, muTVX);
1025+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(2.0, muTVX);
10261026
if (isCentral) {
1027-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(3.0, muTVX);
1027+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(3.0, muTVX);
10281028
}
10291029
if (isSemiCentral) {
1030-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(4.0, muTVX);
1030+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(4.0, muTVX);
10311031
}
10321032
if (isCentral || isSemiCentral) {
1033-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(5.0, muTVX);
1033+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(5.0, muTVX);
10341034
}
10351035
if (isTriggerZNA && isTriggerZNC) {
1036-
(static_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(6.0, muTVX);
1036+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsBcs)))->Fill(6.0, muTVX);
10371037
}
10381038
}
10391039
}
@@ -1045,10 +1045,10 @@ struct TableMaker {
10451045

10461046
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
10471047
if (collision.selection_bit(i)) {
1048-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(1.0, static_cast<float>(i));
1048+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(1.0, static_cast<float>(i));
10491049
}
10501050
}
1051-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(1.0, static_cast<float>(o2::aod::evsel::kNsel));
1051+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(1.0, static_cast<float>(o2::aod::evsel::kNsel));
10521052

10531053
// apply the event filter computed by filter-PP
10541054
if constexpr ((TEventFillMap & VarManager::ObjTypes::EventFilter) > 0) {
@@ -1130,22 +1130,22 @@ struct TableMaker {
11301130
// fill stats information, before selections
11311131
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
11321132
if (collision.selection_bit(i)) {
1133-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(2.0, static_cast<float>(i));
1133+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(2.0, static_cast<float>(i));
11341134
}
11351135
}
1136-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(2.0, static_cast<float>(o2::aod::evsel::kNsel));
1136+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(2.0, static_cast<float>(o2::aod::evsel::kNsel));
11371137

11381138
if (fConfigZorro.fConfigRunZorro) {
11391139
zorro.setBaseCCDBPath(fConfigCCDB.fConfigCcdbPathZorro.value);
11401140
zorro.setBCtolerance(fConfigZorro.fBcTolerance);
11411141
zorro.initCCDB(fCCDB.service, fCurrentRun, bc.timestamp(), fConfigZorro.fConfigZorroTrigMask.value);
1142-
zorro.populateExternalHists(fCurrentRun, static_cast<TH2D*>(fStatsList->At(kStatsZorroInfo)), static_cast<TH2D*>(fStatsList->At(kStatsZorroSel)));
1142+
zorro.populateExternalHists(fCurrentRun, dynamic_cast<TH2D*>(fStatsList->At(kStatsZorroInfo)), dynamic_cast<TH2D*>(fStatsList->At(kStatsZorroSel)));
11431143

11441144
if (!fEventCut->IsSelected(dqtablemaker_helpers::varValues()) || (fConfigRCT.fConfigUseRCT.value && !rctChecker(collision))) {
11451145
continue;
11461146
}
11471147

1148-
bool zorroSel = zorro.isSelected(bc.globalBC(), fConfigZorro.fBcTolerance, static_cast<TH2D*>(fStatsList->At(kStatsZorroSel)));
1148+
bool zorroSel = zorro.isSelected(bc.globalBC(), fConfigZorro.fBcTolerance, dynamic_cast<TH2D*>(fStatsList->At(kStatsZorroSel)));
11491149
if (zorroSel) {
11501150
tag |= (static_cast<uint64_t>(true) << 56); // the same bit is used for this zorro selections from ccdb
11511151
}
@@ -1161,10 +1161,10 @@ struct TableMaker {
11611161
// fill stats information, after selections
11621162
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
11631163
if (collision.selection_bit(i)) {
1164-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(3.0, static_cast<float>(i));
1164+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(3.0, static_cast<float>(i));
11651165
}
11661166
}
1167-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(3.0, static_cast<float>(o2::aod::evsel::kNsel));
1167+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(3.0, static_cast<float>(o2::aod::evsel::kNsel));
11681168

11691169
fHistMan->FillHistClass("Event_AfterCuts", dqtablemaker_helpers::varValues());
11701170

@@ -1323,7 +1323,7 @@ struct TableMaker {
13231323
if (fConfigHistOutput.fConfigQA && (fTrackIndexMap.find(track.globalIndex()) == fTrackIndexMap.end())) {
13241324
fHistMan->FillHistClass(Form("TrackBarrel_%s", (*cut)->GetName()), dqtablemaker_helpers::varValues());
13251325
}
1326-
(static_cast<TH1D*>(fStatsList->At(kStatsTracks)))->Fill(static_cast<float>(i));
1326+
(dynamic_cast<TH1D*>(fStatsList->At(kStatsTracks)))->Fill(static_cast<float>(i));
13271327
}
13281328
}
13291329
if (!trackTempFilterMap) {
@@ -1342,7 +1342,7 @@ struct TableMaker {
13421342
trackFilteringTag |= static_cast<uint64_t>(track.pidbit());
13431343
for (int iv0 = 0; iv0 < 5; iv0++) {
13441344
if (track.pidbit() & (uint8_t(1) << iv0)) {
1345-
(static_cast<TH1D*>(fStatsList->At(kStatsTracks)))->Fill(fTrackCuts.size() + static_cast<float>(iv0));
1345+
(dynamic_cast<TH1D*>(fStatsList->At(kStatsTracks)))->Fill(fTrackCuts.size() + static_cast<float>(iv0));
13461346
}
13471347
}
13481348
// TODO: this part should be removed since the calibration histogram can be filled as any other histogram
@@ -1379,9 +1379,9 @@ struct TableMaker {
13791379

13801380
// Calculating the percentage of orphan tracks i.e., tracks which have no collisions associated to it
13811381
if (!track.has_collision()) {
1382-
(static_cast<TH1D*>(fStatsList->At(kStatsOrphanTracks)))->Fill(static_cast<float>(-1));
1382+
(dynamic_cast<TH1D*>(fStatsList->At(kStatsOrphanTracks)))->Fill(static_cast<float>(-1));
13831383
} else {
1384-
(static_cast<TH1D*>(fStatsList->At(kStatsOrphanTracks)))->Fill(0.9);
1384+
(dynamic_cast<TH1D*>(fStatsList->At(kStatsOrphanTracks)))->Fill(0.9);
13851385
}
13861386

13871387
// NOTE: The collision ID written in the table is the one of the original collision assigned in the AO2D.
@@ -1593,7 +1593,7 @@ struct TableMaker {
15931593
if (fConfigHistOutput.fConfigQA && (fFwdTrackIndexMap.find(muon.globalIndex()) == fFwdTrackIndexMap.end())) {
15941594
fHistMan->FillHistClass(Form("Muons_%s", (*cut)->GetName()), dqtablemaker_helpers::varValues());
15951595
}
1596-
(static_cast<TH1D*>(fStatsList->At(kStatsMuons)))->Fill(static_cast<float>(i));
1596+
(dynamic_cast<TH1D*>(fStatsList->At(kStatsMuons)))->Fill(static_cast<float>(i));
15971597
}
15981598
}
15991599

@@ -2044,10 +2044,10 @@ struct TableMaker {
20442044
{
20452045
for (int i = 0; i < o2::aod::evsel::kNsel; i++) {
20462046
if (static_cast<int>(bc.selection_bit(i)) > 0) {
2047-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(0.0, static_cast<float>(i));
2047+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(0.0, static_cast<float>(i));
20482048
}
20492049
}
2050-
(static_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(0.0, static_cast<float>(o2::aod::evsel::kNsel));
2050+
(dynamic_cast<TH2D*>(fStatsList->At(kStatsEvent)))->Fill(0.0, static_cast<float>(o2::aod::evsel::kNsel));
20512051
}
20522052

20532053
PROCESS_SWITCH(TableMaker, processPP, "Build full DQ skimmed data model for pp/p-Pb w/o event filtering (use Zorro)", false);

0 commit comments

Comments
 (0)