/[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.4 by kusanagi, Thu Mar 3 13:06:39 2005 UTC revision 4.5 by kusanagi, Mon Aug 29 09:29:03 2005 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.3 2004/12/22 11:38:35 kusanagi Exp $   * $Id: LogReader.cpp,v 4.4 2005/05/28 10:44:11 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.3 2004/12/22 11:38:35 kusanagi Exp $\n";      "$Header: /home/cvsmanager/yoda/techmodel/LogReader.cpp,v 4.4 2005/05/28 10:44:11 kusanagi Exp $\n";
45  }  }
46    
47  /**  /**
# Line 58  void LogReader::Init(PamelaRun *run) { Line 58  void LogReader::Init(PamelaRun *run) {
58   * Unpack the Log event from an input file.   * Unpack the Log event from an input file.
59   */   */
60  void LogReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){  void LogReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){
61      char     *subData;  
62      char      eventCRC[2];      char      subData[length];
63      UINT16    subCRC;      //CRC of the data      UINT16    subCRC;      //calculated CRC of the data
64      UINT16    readCRC;     //CRC read from the end of the subpacket      UINT16    readCRC;     //CRC read from the end of the subpacket
65      long int  dataLength;      long int  dataLength = length - 2; //the block of data
66        
67      //the 2 bytes subtracted belong to the final event CRC bytes      InputFile->read(subData, sizeof(subData));
     dataLength = length - (long int)2;  
   
     subData = new char[dataLength];  
     //InputFile->read(subData, sizeof(unsigned char)*dataLength);  
     InputFile->read(subData, length);  
68      subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);      subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);
69    
70      //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
71      readCRC = (((UINT16)(eventCRC[length - 2]<<8))&0xFF00) + (((UINT16)eventCRC[length - 1])&0x00FF);      readCRC = (((UINT16)(subData[length - 2]<<8))&0xFF00) + (((UINT16)subData[length - 1])&0x00FF);
72    
73      //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet ");      if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet ");
74        /*if (subCRC != readCRC) {
75            logger->error("WRONG CRC FOR LOG PACKET. Processed anyway for CPU debugging");
76        }*/
77      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);
78    
79      long int offset = 4;      long int offset = 4;
# Line 93  void LogReader::RunEvent(int EventNumber Line 91  void LogReader::RunEvent(int EventNumber
91          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);
92          offset = offset + 12;          offset = offset + 12;
93      }      }
     //delete [] subData;  
94  }  }
Legend:
Removed from v.2.4  
changed lines
  Added in v.4.5
  ViewVC Help
Powered by ViewVC 1.1.23