--- yoda/techmodel/CalibAcReader.cpp 2004/09/21 20:50:54 2.0 +++ yoda/techmodel/CalibAcReader.cpp 2004/10/17 12:28:38 2.1 @@ -1,6 +1,6 @@ /** @file * $Source: /home/cvsmanager/yoda/techmodel/CalibAcReader.cpp,v $ - * $Id: CalibAcReader.cpp,v 1.5 2004/09/21 20:24:33 kusanagi Exp $ + * $Id: CalibAcReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $ * $Author: kusanagi $ * * Implementation of the ArrDumpReader class. @@ -12,8 +12,8 @@ #include "stdio.h" extern "C" { #include "CRC.h" - #include "forroutines/anticounter/ACcalib.h" - extern int ACcalib(int length, unsigned short* datapointer, struct datastruct* calibpointer); + #include "forroutines/anticounter/AC.h" + extern int ACcalib(int length, unsigned char* calibpointer, struct calibstruct* calibpointer); } #include "ReaderAlgorithms.h" @@ -36,7 +36,7 @@ * Get a string with the version info of the algorithm. */ std::string CalibAcReader::GetVersionInfo(void) const { - return "$Header: /home/cvsmanager/yoda/techmodel/CalibAcReader.cpp,v 1.5 2004/09/21 20:24:33 kusanagi Exp $\n"; + return "$Header: /home/cvsmanager/yoda/techmodel/CalibAcReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $\n"; } /** @@ -71,9 +71,9 @@ readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF); if (subCRC == readCRC){ - datastruct output; + calibstruct output; int ERROR; - ERROR = ACcalib(dataLength, (unsigned short*)subData, &output); + ERROR = ACcalib(dataLength, (unsigned char*)subData, &output); CalibAc->header = output.header; memcpy(CalibAc->status, output.status, sizeof(CalibAc->status));