/[PAMELA software]/yoda/techmodel/LogReader.cpp
ViewVC logotype

Diff of /yoda/techmodel/LogReader.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2.2 by kusanagi, Thu Dec 9 08:48:41 2004 UTC revision 2.3 by kusanagi, Wed Dec 22 11:38:35 2004 UTC
# Line 1  Line 1 
1  /** @file  /** @file
2   * $Source: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v $   * $Source: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v $
3   * $Id: LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $   * $Id: LogReader.cpp,v 2.2 2004/12/09 08:48:41 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the LogReader class.   * Implementation of the LogReader class.
# Line 41  LogReader::LogReader(void): Line 41  LogReader::LogReader(void):
41   */   */
42  std::string LogReader::GetVersionInfo(void) const {  std::string LogReader::GetVersionInfo(void) const {
43    return    return
44      "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.1 2004/12/03 22:08:00 kusanagi Exp $\n";      "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 2.2 2004/12/09 08:48:41 kusanagi Exp $\n";
45  }  }
46    
47  /**  /**
# Line 68  void LogReader::RunEvent(int EventNumber Line 68  void LogReader::RunEvent(int EventNumber
68      dataLength = length - (long int)2;      dataLength = length - (long int)2;
69    
70      subData = new char[dataLength];      subData = new char[dataLength];
71      InputFile->read(subData, sizeof(unsigned char)*dataLength);      //InputFile->read(subData, sizeof(unsigned char)*dataLength);
72      subCRC = CM_Compute_CRC16(0, (BYTE*)&subData, dataLength);      InputFile->read(subData, dataLength);
73        subCRC = CM_Compute_CRC16(0, (UINT8*)&subData, dataLength);
74    
75      //took the final CRC to compare it with the previous calculated CRC of the data      //took the final CRC to compare it with the previous calculated CRC of the data
76      InputFile->read(eventCRC, sizeof(eventCRC));      InputFile->read(eventCRC, 2);
77      readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF);      readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF);
78    
79        //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet ");
80      Log->COMPILATION_TIMESTAMP = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF);      Log->COMPILATION_TIMESTAMP = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF);
81    
82      long int offset = 4;      long int offset = 4;
# Line 91  void LogReader::RunEvent(int EventNumber Line 94  void LogReader::RunEvent(int EventNumber
94          rec->INFO1          = (((UINT32)subData[offset+8]<<24)&0xFF000000) + (((UINT32)subData[offset+9]<<16)&0x00FF0000) +  (((UINT32)subData[offset+10]<<8)&0x0000FF00) + (((UINT32)subData[offset+11])&0x000000FF);          rec->INFO1          = (((UINT32)subData[offset+8]<<24)&0xFF000000) + (((UINT32)subData[offset+9]<<16)&0x00FF0000) +  (((UINT32)subData[offset+10]<<8)&0x0000FF00) + (((UINT32)subData[offset+11])&0x000000FF);
95          offset = offset + 12;          offset = offset + 12;
96      }      }
97      delete [] subData;      //delete [] subData;
98  }  }
Legend:
Removed from v.2.2  
changed lines
  Added in v.2.3
  ViewVC Help
Powered by ViewVC 1.1.23