diff --git a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp index 6ff9bcf..05d7367 100644 --- a/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp +++ b/src/ConformToTheEnergySpectrum/ConformToTheEnergySpectrum.cpp @@ -18,6 +18,7 @@ struct SpectrumData { + int event_id; int board_id; int channel_id; double energy; @@ -92,18 +93,20 @@ void ConformToTheEnergySpectrum::loadAndProcess() return; std::vector rawData; - io::CSVReader<4> in(QStrToSysPath(_data_filename)); + io::CSVReader<5> in(QStrToSysPath(_data_filename)); in.read_header(io::ignore_extra_column, + QString(QStringLiteral(u"事件ID")).toStdString(), QString(QStringLiteral(u"板卡号")).toStdString(), QString(QStringLiteral(u"通道号")).toStdString(), QString(QStringLiteral(u"能量(KeV)")).toStdString(), QString(QStringLiteral(u"时间计数")).toStdString()); - int board, channel; + int eventId,board, channel; double energy; unsigned long long time_count; - while (in.read_row(board, channel, energy, time_count)) { + while (in.read_row(eventId,board, channel, energy, time_count)) { SpectrumData sd; + sd.event_id = eventId; sd.board_id = board; sd.channel_id = channel; sd.energy = energy;