Skip to content

Commit

Permalink
Fix deprecated-enum-float-conversion to keep C++20 happy (#2116)
Browse files Browse the repository at this point in the history
  • Loading branch information
ktf authored and Barthelemy committed Feb 1, 2024
1 parent fca19e0 commit c9a22de
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Modules/ITS/src/ITSDecodingErrorTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,26 @@ void ITSDecodingErrorTask::initialize(o2::framework::InitContext& /*ctx*/)

void ITSDecodingErrorTask::createDecodingPlots()
{
mLinkErrorVsFeeid = new TH2D("General/LinkErrorVsFeeid", "GBTLink errors per FeeId", NFees, 0, NFees, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mLinkErrorVsFeeid = new TH2D("General/LinkErrorVsFeeid", "GBTLink errors per FeeId", NFees, 0, NFees, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, (float)o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mLinkErrorVsFeeid->SetMinimum(0);
mLinkErrorVsFeeid->SetStats(0);
getObjectsManager()->startPublishing(mLinkErrorVsFeeid);
for (int ilayer = 0; ilayer < 7; ilayer++) {
mChipErrorVsChipid[ilayer] = new TH2D(Form("General/Layer%dChipErrorVsChipid", ilayer), Form("Layer%d Chip errors per FeeId", ilayer), ChipBoundary[ilayer + 1] - ChipBoundary[ilayer], 0, ChipBoundary[ilayer + 1] - ChipBoundary[ilayer], o2::itsmft::ChipStat::NErrorsDefined, 0.5, o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorVsChipid[ilayer] = new TH2D(Form("General/Layer%dChipErrorVsChipid", ilayer), Form("Layer%d Chip errors per FeeId", ilayer), ChipBoundary[ilayer + 1] - ChipBoundary[ilayer], 0, ChipBoundary[ilayer + 1] - ChipBoundary[ilayer], o2::itsmft::ChipStat::NErrorsDefined, 0.5, (float)o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorVsChipid[ilayer]->SetMinimum(0);
mChipErrorVsChipid[ilayer]->SetStats(0);
getObjectsManager()->startPublishing(mChipErrorVsChipid[ilayer]);
}
mChipErrorVsFeeid = new TH2D("General/ChipErrorVsFeeid", "Chip decoding errors per FeeId", NFees, 0, NFees, o2::itsmft::ChipStat::NErrorsDefined, 0.5, o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorVsFeeid = new TH2D("General/ChipErrorVsFeeid", "Chip decoding errors per FeeId", NFees, 0, NFees, o2::itsmft::ChipStat::NErrorsDefined, 0.5, (float)o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorVsFeeid->SetMinimum(0);
mChipErrorVsFeeid->SetStats(0);
getObjectsManager()->startPublishing(mChipErrorVsFeeid);
mLinkErrorPlots = new TH1D("General/LinkErrorPlots", "GBTLink decoding Errors", o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mLinkErrorPlots = new TH1D("General/LinkErrorPlots", "GBTLink decoding Errors", o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, (float)o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mLinkErrorPlots->SetMinimum(0);
mLinkErrorPlots->SetStats(0);
mLinkErrorPlots->SetFillColor(kOrange);
getObjectsManager()->startPublishing(mLinkErrorPlots); // mLinkErrorPlots
mChipErrorPlots = new TH1D("General/ChipErrorPlots", "Chip Decoding Errors", o2::itsmft::ChipStat::NErrorsDefined, 0.5, o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorPlots = new TH1D("General/ChipErrorPlots", "Chip Decoding Errors", o2::itsmft::ChipStat::NErrorsDefined, 0.5, (float)o2::itsmft::ChipStat::NErrorsDefined + 0.5);
mChipErrorPlots->SetMinimum(0);
mChipErrorPlots->SetStats(0);
mChipErrorPlots->SetFillColor(kOrange);
Expand Down
4 changes: 2 additions & 2 deletions Modules/ITS/src/ITSFhrTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ void ITSFhrTask::initialize(o2::framework::InitContext& /*ctx*/)

void ITSFhrTask::createErrorTriggerPlots()
{
mErrorPlots = new TH1D("General/ErrorPlots", "Decoding Errors", o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mErrorPlots = new TH1D("General/ErrorPlots", "Decoding Errors", o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, (float)o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mErrorPlots->SetMinimum(0);
mErrorPlots->SetFillColor(kRed);
getObjectsManager()->startPublishing(mErrorPlots); // mErrorPlots
Expand All @@ -255,7 +255,7 @@ void ITSFhrTask::createGeneralPlots()

createErrorTriggerPlots();

mErrorVsFeeid = new TH2I("General/ErrorVsFeeid", "Error count vs Error id and Fee id", (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), 0, (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mErrorVsFeeid = new TH2I("General/ErrorVsFeeid", "Error count vs Error id and Fee id", (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), 0, (3 * StaveBoundary[3]) + (2 * (StaveBoundary[7] - StaveBoundary[3])), o2::itsmft::GBTLinkDecodingStat::NErrorsDefined, 0.5, (float)o2::itsmft::GBTLinkDecodingStat::NErrorsDefined + 0.5);
mErrorVsFeeid->SetMinimum(0);
mErrorVsFeeid->SetStats(0);
getObjectsManager()->startPublishing(mErrorVsFeeid);
Expand Down
2 changes: 1 addition & 1 deletion Modules/ZDC/src/ZDCRecDataTask.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ void ZDCRecDataTask::initHisto()
addNewHisto("TDC_A_A", "h_TDC_ZPCS_ZPCC", "TDC amplitude ZPC SUM vs TDC amplitude ZPC TC", "TDCA", "ZPCC", "TDCA", "ZPCS", 0);

// msg histo
setBinHisto2D(o2::zdc::NChannels, -0.5, o2::zdc::NChannels - 0.5, o2::zdc::MsgEnd, -0.5, o2::zdc::MsgEnd - 0.5);
setBinHisto2D(o2::zdc::NChannels, -0.5, (float)o2::zdc::NChannels - 0.5, o2::zdc::MsgEnd, -0.5, (float)o2::zdc::MsgEnd - 0.5);
addNewHisto("MSG_REC", "h_msg", "Reconstruction messages", "INFO", "CH", "INFO", "MSG", 0);
int idh_msg = (int)mHisto2D.size() - 1;
setBinHisto1D(10, -0.5, 9.5);
Expand Down

0 comments on commit c9a22de

Please sign in to comment.