--- yoda/techmodel/Calib1_Ac2Reader.cpp 2005/03/04 15:54:11 3.0 +++ yoda/techmodel/Calib1_Ac2Reader.cpp 2006/05/30 19:10:02 6.2 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/Calib1_Ac2Reader.cpp,v $ - * $Id: Calib1_Ac2Reader.cpp,v 2.4 2005/02/08 08:21:09 kusanagi Exp $ + * $Id: Calib1_Ac2Reader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the Calib1_Ac2Reader class. @@ -36,7 +36,7 @@ * Get a string with the version info of the algorithm. */ std::string Calib1_Ac2Reader::GetVersionInfo(void) const { - return "$Header: /home/cvsmanager/yoda/techmodel/Calib1_Ac2Reader.cpp,v 2.4 2005/02/08 08:21:09 kusanagi Exp $\n"; + return "$Header: /home/cvsmanager/yoda/techmodel/Calib1_Ac2Reader.cpp,v 6.1 2006/05/30 19:10:01 kusanagi Exp $\n"; } /** @@ -53,10 +53,27 @@ * Unpack the Calib1_Ac2Reader event from an input file. */ void Calib1_Ac2Reader::RunEvent(int EventNumber, long int dataLength) throw (Exception){ -/* + char *subData = new char[dataLength]; + struct calibstruct output = {0}; -*/ + InputFile->read(subData, sizeof(unsigned char)*dataLength); + + calib1_Ac2->ERROR = ACcalib(dataLength, (unsigned char*)subData, &output); + memcpy(calib1_Ac2->header, output.header, sizeof(output.header)); + memcpy(calib1_Ac2->status, output.status, sizeof(output.status)); + memcpy(calib1_Ac2->temp, output.temp, sizeof(output.temp)); + memcpy(calib1_Ac2->DAC1, output.DAC1, sizeof(output.DAC1)); + memcpy(calib1_Ac2->DAC2, output.DAC2, sizeof(output.DAC2)); + memcpy(calib1_Ac2->regist, output.regist, sizeof(output.regist)); + memcpy(calib1_Ac2->time, output.time, sizeof(output.time)); + calib1_Ac2->n_tr = output.n_tr; + memcpy(calib1_Ac2->hitmap_tr, output.hitmap_tr, sizeof(output.hitmap_tr)); + memcpy(calib1_Ac2->curve1, output.curve1, sizeof(output.curve1)); + memcpy(calib1_Ac2->curve2, output.curve2, sizeof(output.curve2)); + calib1_Ac2->iCRC = output.iCRC; + calib1_Ac2->tail = output.tail; + calib1_Ac2->CRC = output.CRC; + calib1_Ac2->CRCcheck = output.CRCcheck; - //delete [] subData; }