Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11724) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11725) @@ -12,7 +12,23 @@ #include +#include "DimWriteStatistics.h" + +#include "DataCalib.h" +#include "DataWriteRaw.h" + #ifdef HAVE_FITS -#include "FitsFile.h" +#include "DataWriteFits.h" +#else +#define DataWriteFits DataWriteRaw #endif + +namespace ba = boost::asio; +namespace bs = boost::system; + +using ba::ip::tcp; + +using namespace std; + +// ======================================================================== #include "EventBuilder.h" @@ -23,784 +39,5 @@ } -namespace ba = boost::asio; -namespace bs = boost::system; - -using ba::ip::tcp; - -using namespace std; - -class DataFileImp : public MessageImp -{ - uint32_t fRunId; - - int Write(const Time &time, const std::string &txt, int qos) - { - return fMsg.Write(time, txt, qos); - } - -protected: - MessageImp &fMsg; - string fFileName; - -public: - DataFileImp(uint32_t id, MessageImp &imp) : fRunId(id), fMsg(imp) { } - virtual ~DataFileImp() { } - - virtual bool OpenFile(RUN_HEAD* h) = 0; - virtual bool WriteEvt(EVENT *) = 0; - virtual bool Close(RUN_TAIL * = 0) = 0; - - const string &GetFileName() const { return fFileName; } - - uint32_t GetRunId() const { return fRunId; } - - // -------------------------------------------------------------------------- - // - //! This creates an appropriate file name for a particular run number and type - //! @param runNumber the run number for which a filename is to be created - //! @param runType an int describing the kind of run. 0=Data, 1=Pedestal, 2=Calibration, 3=Calibrated data - //! @param extension a string containing the extension to be appened to the file name - // - static string FormFileName(uint32_t runid, const string &extension) - { - ostringstream name; - name << Time().NightAsInt() << '_' << setfill('0') << setw(3) << runid << '.' << extension; - return name.str(); - } -}; - -class DataFileNone : public DataFileImp -{ -public: - DataFileNone(uint32_t id, MessageImp &imp) : DataFileImp(id, imp) { } - - Time fTime; - - bool OpenFile(RUN_HEAD* h) - { - fFileName = "/dev/null"; - - ostringstream str; - str << this << " - " - << "OPEN_FILE #" << GetRunId() << ":" - << " Ver=" << h->Version - << " Typ=" << h->RunType - << " Nb=" << h->NBoard - << " Np=" << h->NPix - << " NTm=" << h->NTm - << " roi=" << h->Nroi; - - Debug(str); - - fTime = Time(); - - return true; - } - bool WriteEvt(EVENT *e) - { - const Time now; - if (now-fTimeEventNum << " / " << e->TriggerNum; - Debug(str); - - return true; - } - bool Close(RUN_TAIL * = 0) - { - ostringstream str; - str << this << " - CLOSE FILE #" << GetRunId(); - - Debug(str); - - return true; - } -}; - -#include "DrsCalib.h" - -class DataFileCalib : public DataFileImp, CalibData -{ - static vector fOffset; - static vector fGain; - static vector fTrgOff; - - static vector fStats; - - static uint64_t fNumOffset; - static uint64_t fNumGain; - static uint64_t fNumTrgOff; - - static int fStep; - - DimDescribedService &fDim; - -public: - DataFileCalib(uint32_t id, DimDescribedService &dim, MessageImp &imp) : DataFileImp(id, imp), fDim(dim) - { - } - - static void Restart() - { - // Default gain: - // 0.575*[45590]*2.5V / 2^16 = 0.99999 V - fOffset.assign(1440*1024, 0); - fGain.assign (1440*1024, 2); - fTrgOff.assign(1440*1024, 0); - - fNumOffset = 1; - fNumGain = 1; - fNumTrgOff = 1; - - reinterpret_cast(fStats.data())[0] = 0; - reinterpret_cast(fStats.data())[1] = 0; - reinterpret_cast(fStats.data())[2] = 0; - - int i=0; - while (i<1024*1440*2+3) // Set mean and RMS to 0 - fStats[i++] = 0; - while (i<1024*1440*3+3) - fStats[i++] = 0.5; // Set mean to 0.5 - while (i<1024*1440*6+3) - fStats[i++] = 0; // Set everything else to 0 - - fStep = 0; - } - - static void Update(DimDescribedService &dim) - { - dim.Update(fStats); - } - - bool OpenFile(RUN_HEAD* h) - { - if (fStep==4) - { - fMsg.Warn("DRS Calibration already finished... please restart!"); - return false; - } - - if (h->NPix != 1440) - { - fMsg.Error("Number of pixels in header not 1440."); - return false; - } - - if (h->Nroi != 1024) - { - fMsg.Error("Region of interest not 1024."); - return false; - } - - ostringstream name; - name << "drs-calib-" << fStep; - fFileName = name.str(); - - Reset(); - InitSize(1440, 1024); - - fFileName = FormFileName(GetRunId(), "drs.fits"); - - return true; - } - bool WriteEvt(EVENT *e) - { - // FIXME: SET StartPix to 0 if StartPix is -1 - - if (fStep==0) - { - AddRel(e->Adc_Data, e->StartPix); - } - if (fStep==1) - { - AddRel(e->Adc_Data, e->StartPix, fOffset.data(), fNumOffset); - } - if (fStep==2) - { - AddAbs(e->Adc_Data, e->StartPix, fOffset.data(), fNumOffset); - } - - return true; - } - - void WriteFits() - { -#ifdef HAVE_FITS - FitsFile file(fMsg); - - file.AddColumn('I', "RunNumberBaseline"); - file.AddColumn('I', "RunNumberGain"); - file.AddColumn('I', "RunNumberTriggerOffset"); - file.AddColumn('F', "BaselineMean", 1024*1440); - file.AddColumn('F', "BaselineRms", 1024*1440); - file.AddColumn('F', "GainMean", 1024*1440); - file.AddColumn('F', "GainRms", 1024*1440); - file.AddColumn('F', "TriggerOffsetMean", 1024*1440); - file.AddColumn('F', "TriggerOffsetRms", 1024*1440); - - if (!file.OpenFile(fFileName)) - return; - - if (!file.OpenTable("DrsCalibration")) - return; - - if (!file.WriteDefaultKeys("fadctrl")) - return; - - if (!file.WriteKeyNT("STEP", fStep, "")) - return; - - vector buf; - buf.reserve(fStats.size()*sizeof(float)); - - char *src = reinterpret_cast(fStats.data()); - char *end = reinterpret_cast(fStats.data()+1024*1440*6+3); - char *dest = buf.data(); - - while (src(fStats.data())[0] = GetRunId();; - } - if (fStep==1) - { - fGain.assign(fSum.begin(), fSum.end()); - //fNumGain = fNumEntries*1000; - - // DAC: 0..2.5V == 0..65535 - // V-mV: 1000 - for (int i=0; i<1024*1440; i++) - fGain[i] *= 125; - fNumGain = fNumEntries * 65535; - - // 0.5: Scale from ADC to Millivolt - GetSampleStats(fStats.data()+1024*1440*2+3, 0.5); - reinterpret_cast(fStats.data())[1] = GetRunId();; - } - if (fStep==2) - { - fTrgOff.assign(fSum.begin(), fSum.end()); - fNumTrgOff = fNumEntries; - - // 0.5: Scale from ADC to Millivolt - GetSampleStats(fStats.data()+1024*1440*4+3, 0.5); - reinterpret_cast(fStats.data())[2] = GetRunId();; - } - - if (fStep>=0 && fStep<=2) - WriteFits(); - - fDim.Update(fStats); - - fStep++; - - return true; - } - - static void Apply(int16_t *val, const int16_t *start, uint32_t roi) - { - CalibData::Apply(val, start, roi, - fOffset.data(), fNumOffset, - fGain.data(), fNumGain, - fTrgOff.data(), fNumTrgOff); - } - - static void Apply(float *vec, int16_t *val, const int16_t *start, uint32_t roi) - { - CalibData::Apply(vec, val, start, roi, - fOffset.data(), fNumOffset, - fGain.data(), fNumGain, - fTrgOff.data(), fNumTrgOff); - } -}; - -int DataFileCalib::fStep = 0; - -vector DataFileCalib::fOffset(1440*1024, 0); -vector DataFileCalib::fGain (1440*1024, 2); -vector DataFileCalib::fTrgOff(1440*1024, 0); -vector DataFileCalib::fStats (1440*1024*6+3); - -uint64_t DataFileCalib::fNumOffset = 1; -uint64_t DataFileCalib::fNumGain = 1; -uint64_t DataFileCalib::fNumTrgOff = 1; - - -class DataFileDebug : public DataFileNone -{ -public: - DataFileDebug(uint32_t id, MessageImp &imp) : DataFileNone(id, imp) { } - - bool WriteEvt(EVENT *e) - { - cout << "WRITE_EVENT #" << GetRunId() << " (" << e->EventNum << ")" << endl; - cout << " Typ=" << e->TriggerType << endl; - cout << " roi=" << e->Roi << endl; - cout << " trg=" << e->SoftTrig << endl; - cout << " tim=" << e->PCTime << endl; - - return true; - } -}; - -#include "FAD.h" - -class DataFileRaw : public DataFileImp -{ - ofstream fOut; - - off_t fPosTail; - - uint32_t fCounter; - - - // WRITE uint32_t 0xFAC77e1e (FACT Tele) - // === - // WRITE uint32_t TYPE(>0) == 1 - // WRITE uint32_t ID(>0) == 0 - // WRITE uint32_t VERSION(>0) == 1 - // WRITE uint32_t LENGTH - // - - // WRITE uint32_t TELESCOPE ID - // WRITE uint32_t RUNID - // === - // WRITE uint32_t TYPE(>0) == 2 - // WRITE uint32_t ID(>0) == 0 - // WRITE uint32_t VERSION(>0) == 1 - // WRITE uint32_t LENGTH - // - - // WRITE HEADER - // === - // [ 40 TIMES - // WRITE uint32_t TYPE(>0) == 3 - // WRITE uint32_t ID(>0) == 0..39 - // WRITE uint32_t VERSION(>0) == 1 - // WRITE uint32_t LENGTH - // - - // WRITE BOARD-HEADER - // ] - // === - // WRITE uint32_t TYPE(>0) == 4 - // WRITE uint32_t ID(>0) == 0 - // WRITE uint32_t VERSION(>0) == 1 - // WRITE uint32_t LENGTH - // - - // WRITE FOOTER (empty) - // === - // [ N times - // WRITE uint32_t TYPE(>0) == 10 - // WRITE uint32_t ID(>0) == counter - // WRITE uint32_t VERSION(>0) == 1 - // WRITE uint32_t LENGTH HEADER - // - - // WRITE HEADER+DATA - // ] - // === - // WRITE uint32_t TYPE ==0 - // WRITE uint32_t VERSION==0 - // WRITE uint32_t LENGTH ==0 - // === - // Go back and write footer - -public: - DataFileRaw(uint32_t id, MessageImp &imp) : DataFileImp(id, imp), fPosTail(0) { } - ~DataFileRaw() { if (fOut.is_open()) Close(); } - - void WriteBlockHeader(uint32_t type, uint32_t ver, uint32_t cnt, uint32_t len) - { - const uint32_t val[4] = { type, ver, cnt, len }; - - fOut.write(reinterpret_cast(val), sizeof(val)); - } - - template - void WriteValue(const T &t) - { - fOut.write(reinterpret_cast(&t), sizeof(T)); - } - - enum - { - kEndOfFile = 0, - kIdentifier = 1, - kRunHeader, - kBoardHeader, - kRunSummary, - kEvent, - }; - - bool OpenFile(RUN_HEAD *h) - { - const string name = FormFileName(GetRunId(), "bin"); - if (access(name.c_str(), F_OK)==0) - { - Error("File '"+name+"' already exists."); - return false; - } - - fFileName = name; - - errno = 0; - fOut.open(name.c_str(), ios_base::out); - if (!fOut) - { - ostringstream str; - str << "ofstream::open() failed for '" << name << "': " << strerror(errno) << " [errno=" << errno << "]"; - Error(str); - - return false; - } - - fCounter = 0; - - static uint32_t FACT = 0xFAC77e1e; - - fOut.write(reinterpret_cast(&FACT), 4); - - WriteBlockHeader(kIdentifier, 1, 0, 8); - WriteValue(uint32_t(0)); - WriteValue(GetRunId()); - - WriteBlockHeader(kRunHeader, 1, 0, sizeof(RUN_HEAD)-sizeof(PEVNT_HEADER*)); - fOut.write(reinterpret_cast(h), sizeof(RUN_HEAD)-sizeof(PEVNT_HEADER*)); - - for (int i=0; i<40; i++) - { - WriteBlockHeader(kBoardHeader, 1, i, sizeof(PEVNT_HEADER)); - fOut.write(reinterpret_cast(h->FADhead+i), sizeof(PEVNT_HEADER)); - } - - // FIXME: Split this - const vector block(sizeof(uint32_t)+sizeof(RUN_TAIL)); - WriteBlockHeader(kRunSummary, 1, 0, block.size()); - - fPosTail = fOut.tellp(); - fOut.write(block.data(), block.size()); - - if (!fOut) - { - ostringstream str; - str << "ofstream::write() failed for '" << name << "': " << strerror(errno) << " [errno=" << errno << "]"; - Error(str); - - return false; - } - - return true; - } - bool WriteEvt(EVENT *evt) - { - const int sh = sizeof(EVENT)-2 + NPIX*evt->Roi*2; - - WriteBlockHeader(kEvent, 1, fCounter++, sh); - fOut.write(reinterpret_cast(evt)+2, sh); - return true; - } - bool Close(RUN_TAIL *tail= 0) - { - WriteBlockHeader(kEndOfFile, 0, 0, 0); - - if (tail) - { - fOut.seekp(fPosTail); - - WriteValue(uint32_t(1)); - fOut.write(reinterpret_cast(tail), sizeof(RUN_TAIL)); - } - - if (!fOut) - { - ostringstream str; - - str << "ofstream::write() failed for '" << GetFileName() << "': " << strerror(errno) << " [errno=" << errno << "]"; - Error(str); - - return false; - } - - fOut.close(); - - if (!fOut) - { - ostringstream str; - str << "ofstream::close() failed for '" << GetFileName() << "': " << strerror(errno) << " [errno=" << errno << "]"; - Error(str); - - return false; - } - - return true; - } -}; - -#ifdef HAVE_FITS - - -class DataFileFits : public DataFileImp -{ - Converter *fConv; - - FitsFile fFile; - -public: - DataFileFits(uint32_t runid, MessageImp &imp) : - DataFileImp(runid, imp), fFile(imp) - { - } - - // -------------------------------------------------------------------------- - // - //! Default destructor - //! The Fits file SHOULD have been closed already, otherwise the informations - //! related to the RUN_TAIL will NOT be written to the file. - // - ~DataFileFits() { Close(); delete fConv; } - - template - void WriteKey(const string &name, const int idx, const T &value, const string &comment) - { - ostringstream str; - str << name << idx; - - ostringstream com; - com << "Board " << setw(2) << idx << ": " << comment; - - fFile.WriteKey(str.str(), value, com.str()); - } - - // -------------------------------------------------------------------------- - // - //! DataFileFits constructor. This is the one that should be used, not the default one (parameter-less) - //! @param runid This parameter should probably be removed. I first thought it was the run number, but apparently it is not - //! @param h a pointer to the RUN_HEAD structure that contains the informations relative to this run - // - bool OpenFile(RUN_HEAD* h) - { - fFile.AddColumn('I', "EventNum"); - fFile.AddColumn('I', "TriggerNum"); - fFile.AddColumn('S', "TriggerType"); - fFile.AddColumn('I', "NumBoards"); - fFile.AddColumn('I', "reserved"); - fFile.AddColumn('I', "SoftTrig"); - fFile.AddColumn('I', "PCTime", 2); - fFile.AddColumn('I', "BoardTime", NBOARDS); - fFile.AddColumn('S', "StartCellData", NPIX); - fFile.AddColumn('S', "StartCellTimeMarker", NTMARK); - fFile.AddColumn('S', "Data", h->NPix*h->Nroi); - fFile.AddColumn('S', "TimeMarker", h->NTm*h->NroiTM); - - // Write length of physical pipeline (1024) - - fConv = new Converter(Converter::ToFormat(fFile.GetColumnTypes())); - - const size_t sz = (h->NPix*h->Nroi + h->NTm*h->NroiTM)*2; - if (fConv->GetSize()-sz+4!=sizeof(EVENT)) - { - ostringstream str; - str << "The EVENT structure size (" << sizeof(EVENT) << ") doesn't match the described FITS row ("; - str << fConv->GetSize()-sz+4 << ")"; - Error(str); - return false; - } - - //Form filename, based on runid and run-type - fFileName = FormFileName(GetRunId(), "fits"); - - if (!fFile.OpenFile(fFileName)) - return false; - - if (!fFile.OpenTable("Events")) - return false; - - if (!fFile.WriteDefaultKeys("fadctrl")) - return false; - - Info("==> TODO: Write sampling frequency..."); - - //write header data - //first the "standard" keys - try - { - fFile.WriteKey("BLDVER", h->Version, "Builder version"); - fFile.WriteKey("RUNID", GetRunId(), "Run number"); - fFile.WriteKey("RUNTYPE", h->RunType, "Type of run"); - fFile.WriteKey("NBOARD", h->NBoard, "Number of acquisition boards"); - fFile.WriteKey("NPIX", h->NPix, "Number of pixels"); - fFile.WriteKey("NTMARK", h->NTm, "Number of Time marks"); - fFile.WriteKey("NROI", h->Nroi, "Number of slices per pixels"); - fFile.WriteKey("NROITM", h->NroiTM, "Number of slices per time-marker"); - - //FIXME should we also put the start and stop time of the received data ? - //now the events header related variables - fFile.WriteKey("CAMERA", "MGeomCamFACT", ""); - fFile.WriteKey("DAQ", "DRS4", ""); - - fFile.WriteKey("ADCCOUNT", 2.0f, "ADC Counts per milliVolt"); - - - // Write a single key for: - // ----------------------- - // Start package flag - // package length - // version number - // status - // Prescaler - - // Write 40 kays for (?) - // Phaseshift - // DAC - - for (int i=0; iNBoard; i++) - { - const PEVNT_HEADER &hh = h->FADhead[i]; - - // Header values whihc won't change during the run - WriteKey("ID", i, hh.board_id, "Board ID"); - WriteKey("DNA", i, hh.DNA, "DNA"); - WriteKey("FWVER", i, hh.version_no, "Firmware Version"); - } - } - catch (const CCfits::FitsException &e) - { - Error("CCfits::Table::addKey failed in "+fFileName+"': "+e.message()); - return false; - } - - /* - //now the boards related keywords - for (int i=0; iNBoard; i++) - { - const PEVNT_HEADER &hh = h->FADhead[i]; - - WriteKey("STPKGFG", i, hh.start_package_flag, "Start package flag"); - WriteKey("PKGLEN", i, hh.package_length, "Package length"); - WriteKey("STATUS", i, hh.PLLLCK, ""); - -// WriteKey("TRIGCRC", i, hh.trigger_crc, "Trigger CRC"); -// WriteKey("TRIGTYP", i, hh.trigger_type, "Trigger type"); -// WriteKey("TRIGID", i, hh.trigger_id, "Trigger ID"); -// WriteKey("EVTCNTR", i, hh.fad_evt_counter, "FAD Event Counter"); -// WriteKey("REFCLK", i, hh.REFCLK_frequency, "Reference Clock Frequency"); - - WriteKey("PHASESH", i, hh.adc_clock_phase_shift, "ADC clock phase shift"); - WriteKey("TRGGEN", i, hh.number_of_triggers_to_generate, "Number of triggers to generate"); - WriteKey("PRESC", i, hh.trigger_generator_prescaler, "Trigger generator prescaler"); - WriteKey("RUNNB", i, hh.runnumber, "Run number"); - - WriteKey("TIME", i, hh.time, "Time"); - -// for (int j=0;jFADhead[i].drs_temperature[j], str2.str()); -// } - for (int j=0;jStartPix)*e->Roi+sizeof(e->StartTM)*e->RoiTM; - - const vector data = fConv->ToFits(reinterpret_cast(e)+4, sz-4); - - return fFile.WriteData(data.data(), data.size()); - } - - bool WriteFooter(RUN_TAIL *rt) - { - try - { - fFile.WriteKey("NBEVTOK", rt ? rt->nEventsOk : uint32_t(0), - "How many events were written"); - - fFile.WriteKey("NBEVTREJ", rt ? rt->nEventsRej : uint32_t(0), - "How many events were rejected by SW-trig"); - - fFile.WriteKey("NBEVTBAD", rt ? rt->nEventsBad : uint32_t(0), - "How many events were rejected by Error"); - - //FIXME shouldn't we convert start and stop time to MjD first ? - //FIXME shouldn't we also add an MjD reference ? - - fFile.WriteKey("TSTART", rt ? rt->PCtime0 : uint32_t(0), - "Time when first event received"); - - fFile.WriteKey("TSTOP", rt ? rt->PCtimeX : uint32_t(0), - "Time when last event received"); - } - catch (const CCfits::FitsException &e) - { - Error("CCfits::Table::addKey failed in '"+fFile.GetName()+"': "+e.message()); - return false; - } - return true; - } - - // -------------------------------------------------------------------------- - // - //! Closes the file, and before this it write the TAIL data - //! @param rt the pointer to the RUN_TAIL data structure - // - bool Close(RUN_TAIL *rt = 0) - { - if (!fFile.IsOpen()) - return false; - - WriteFooter(rt); - - fFile.Close(); - - return true; - } - -}; -#else -#define DataFileFits DataFileRaw -#endif - -#include "DimWriteStatistics.h" +// ======================================================================== class EventBuilderWrapper @@ -885,5 +122,5 @@ while (--fRunNumber>0) { - const string name = DataFileImp::FormFileName(fRunNumber, ""); + const string name = DataProcessorImp::FormFileName(fRunNumber, ""); if (access((name+"bin").c_str(), F_OK) == 0) @@ -949,5 +186,5 @@ //ffMsg.Info("EventBuilder stopped."); - for (vector::iterator it=fFiles.begin(); it!=fFiles.end(); it++) + for (vector::iterator it=fFiles.begin(); it!=fFiles.end(); it++) delete *it; } @@ -1136,6 +373,6 @@ if (fFileFormat==kCalib) { - DataFileCalib::Restart(); - DataFileCalib::Update(fDimDrsCalibration); + DataCalib::Restart(); + DataCalib::Update(fDimDrsCalibration); fMsg.Message("Resetted DRS calibration."); } @@ -1211,8 +448,8 @@ }; - for (vector::const_iterator it=fFiles.begin(); + for (vector::const_iterator it=fFiles.begin(); it!=fFiles.end(); it++) { - const DataFileImp *file = *it; + const DataProcessorImp *file = *it; if (file->GetRunId() fFiles; + vector fFiles; FileHandle_t runOpen(uint32_t runid, RUN_HEAD *h, size_t) @@ -1239,17 +476,17 @@ // Check if file already exists... - DataFileImp *file = 0; + DataProcessorImp *file = 0; switch (fFileFormat) { - case kNone: file = new DataFileNone(runid, fMsg); break; - case kDebug: file = new DataFileDebug(runid, fMsg); break; - case kFits: file = new DataFileFits(runid, fMsg); break; - case kRaw: file = new DataFileRaw(runid, fMsg); break; - case kCalib: file = new DataFileCalib(runid, fDimDrsCalibration, fMsg); break; + case kNone: file = new DataDump(runid, fMsg); break; + case kDebug: file = new DataDebug(runid, fMsg); break; + case kFits: file = new DataWriteFits(runid, fMsg); break; + case kRaw: file = new DataWriteRaw(runid, fMsg); break; + case kCalib: file = new DataCalib(runid, fDimDrsCalibration, fMsg); break; } try { - if (!file->OpenFile(h)) + if (!file->Open(h)) return 0; } @@ -1283,5 +520,5 @@ int runWrite(FileHandle_t handler, EVENT *e, size_t) { - DataFileImp *file = reinterpret_cast(handler); + DataProcessorImp *file = reinterpret_cast(handler); if (!file->WriteEvt(e)) @@ -1320,7 +557,7 @@ fMsg.Info(" ==> TODO: Update run configuration in database!"); - DataFileImp *file = reinterpret_cast(handler); - - const vector::iterator it = find(fFiles.begin(), fFiles.end(), file); + DataProcessorImp *file = reinterpret_cast(handler); + + const vector::iterator it = find(fFiles.begin(), fFiles.end(), file); if (it==fFiles.end()) { @@ -1513,6 +750,6 @@ memcpy(data.data(), event, sizeof(EVENT)); - DataFileCalib::Apply(reinterpret_cast(data.data()+sizeof(EVENT)), - event->Adc_Data, event->StartPix, event->Roi); + DataCalib::Apply(reinterpret_cast(data.data()+sizeof(EVENT)), + event->Adc_Data, event->StartPix, event->Roi); fDimEventData.Update(data);