/[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 6.1 by kusanagi, Tue May 30 19:10:02 2006 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 6.0 2006/02/07 17:11:09 kusanagi Exp $
4   * $Author: kusanagi $   * $Author: kusanagi $
5   *   *
6   * Implementation of the LogReader class.   * Implementation of the LogReader class.
# Line 8  Line 8 
8  * Control the CRC for the entire data Packet not just for single records  * Control the CRC for the entire data Packet not just for single records
9   */   */
10    
 #define UINT unsigned int  
 #define BYTE  unsigned char  
 #include <string>  
 #include <log4cxx/logger.h>  
11  extern "C" {  extern "C" {
 #include <sys/time.h>  
12  #include "CRC.h"  #include "CRC.h"
13  }  }
   
 #include <fstream>  
 #include "stdio.h"  
14  #include "ReaderAlgorithms.h"  #include "ReaderAlgorithms.h"
 #include "event/log/LogRecord.h"  
15    
 using namespace pamela;  
16  using namespace pamela::techmodel;  using namespace pamela::techmodel;
17    
18  static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.LogReader"));  static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.LogReader"));
# Line 41  LogReader::LogReader(void): Line 31  LogReader::LogReader(void):
31   */   */
32  std::string LogReader::GetVersionInfo(void) const {  std::string LogReader::GetVersionInfo(void) const {
33    return    return
34      "$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 6.0 2006/02/07 17:11:09 kusanagi Exp $\n";
35  }  }
36    
37  /**  /**
# Line 58  void LogReader::Init(PamelaRun *run) { Line 48  void LogReader::Init(PamelaRun *run) {
48   * Unpack the Log event from an input file.   * Unpack the Log event from an input file.
49   */   */
50  void LogReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){  void LogReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){
51      char     *subData;  
52      char      eventCRC[2];      char      subData[length];
53      UINT16    subCRC;      //CRC of the data      UINT16    subCRC;      //calculated CRC of the data
54      UINT16    readCRC;     //CRC read from the end of the subpacket      UINT16    readCRC;     //CRC read from the end of the subpacket
55      long int  dataLength;      long int  dataLength = length - 2; //the block of data
56        
57      //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);  
58      subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);      subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);
59    
60      //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
61      readCRC = (((UINT16)(eventCRC[length - 2]<<8))&0xFF00) + (((UINT16)eventCRC[length - 1])&0x00FF);      readCRC = (((UINT16)(subData[length - 2]<<8))&0xFF00) + (((UINT16)subData[length - 1])&0x00FF);
62    
63      //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet ");      if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for Log Packet ");
64        /*if (subCRC != readCRC) {
65            logger->error("WRONG CRC FOR LOG PACKET. Processed anyway for CPU debugging");
66        }*/
67      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);
68    
69      long int offset = 4;      long int offset = 4;
# Line 93  void LogReader::RunEvent(int EventNumber Line 81  void LogReader::RunEvent(int EventNumber
81          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);
82          offset = offset + 12;          offset = offset + 12;
83      }      }
     //delete [] subData;  
84  }  }
Legend:
Removed from v.2.4  
changed lines
  Added in v.6.1
  ViewVC Help
Powered by ViewVC 1.1.23