--- yoda/techmodel/PhysEndRunReader.cpp 2005/03/16 16:33:34 4.4 +++ yoda/techmodel/PhysEndRunReader.cpp 2006/02/07 17:11:09 6.0 @@ -34,7 +34,7 @@ */ std::string PhysEndRunReader::GetVersionInfo(void) const { return - "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 4.3 2005/03/15 17:17:14 kusanagi Exp $\n"; + "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 5.1 2006/02/04 12:37:45 kusanagi Exp $\n"; } /** @@ -55,23 +55,20 @@ char subData[length]; UINT16 subCRC; //CRC of the data UINT16 readCRC; //CRC read from the end of the subpacket - long int dataLength; - long int tbInitPos; + long int dataLength = length - 2; + long int tbInitPos = dataLength - 19; // 19 is the length of th TB - //int numRecords = ((length - 2)/6); - dataLength = length - (long int)2; - tbInitPos = dataLength - 19; // 19 is the length of th TB //physEndRun->CALO_ENDRUN[]; //physEndRun->TB_ENDRUN; - InputFile->read(subData, sizeof(unsigned char)*length); + InputFile->read(subData, sizeof(subData)); subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength); readCRC = (((UINT16)(subData[length - 2]<<8))&0xFF00) + (((UINT16)subData[length - 1])&0x00FF); //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for PhysEndRun Packet "); - /*if (subCRC != readCRC) { + if (subCRC != readCRC) { logger->error(" Wrong CRC for PhysEndRun Packet but I process it anyway"); - }*/ + } //--------------- CALO SECTION------------------------------------ long int offset = 0; int j = 0;