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

Diff of /yoda/techmodel/EventReader.cpp

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

revision 2.1 by kusanagi, Wed Sep 22 13:14:03 2004 UTC revision 2.5 by kusanagi, Thu Dec 9 08:48:41 2004 UTC
# Line 1  Line 1 
1  /** @file  /** @file
2   * $Author: kusanagi $   * $Author: kusanagi $
3   * $Date: 2004/09/21 20:50:54 $   * $Date: 2004/12/03 22:08:00 $
4   * $Revision: 2.0 $   * $Revision: 2.4 $
5   *   *
6   * Implementation of the functions of a sample Algorithm class.   * Implementation of the functions of a sample Algorithm class.
7   * This file can be used as a templace to develop your own algorithm.   * This file can be used as a templace to develop your own algorithm.
# Line 9  Line 9 
9    
10  #include <log4cxx/logger.h>  #include <log4cxx/logger.h>
11  #include <fstream>  #include <fstream>
 #include "TechmodelAlgorithm.h"  
12  #include "EventReader.h"  #include "EventReader.h"
13  #include "ReaderAlgorithms.h"  #include "ReaderAlgorithms.h"
14  #include "Exception.h"  
15  #include "stdio.h"  
16  extern "C" {  extern "C" {
17  #include "CRC.h"      #include "CRC.h"
18  }  }
19    
 #define BYTE unsigned char  
   
20  using namespace pamela;  using namespace pamela;
21  using namespace pamela::techmodel;  using namespace pamela::techmodel;
22    
# Line 35  unsigned int EventReader::prevPckOBT     Line 32  unsigned int EventReader::prevPckOBT    
32   */   */
33  EventReader::EventReader(int packetsLimit = -1):  EventReader::EventReader(int packetsLimit = -1):
34    TechmodelAlgorithm(0, "TechmodelEventReader"){    TechmodelAlgorithm(0, "TechmodelEventReader"){
 //EventReader::EventReader(void):  
 //  TechmodelAlgorithm(0, "TechmodelEventReader") {  
35    EventReader::maxPackets = packetsLimit;    EventReader::maxPackets = packetsLimit;
36    logger->debug(_T("Constructor"));    logger->debug(_T("Constructor"));
37    Header = new EventHeader();    Header = new EventHeader();
38    
39    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::PhysEndRun,      new PhysEndRunReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::PhysEndRun,      new PhysEndRunReader));
40    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPulse1,  new CalibCalPulse1Reader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPulse1,  new CalibCalPulse1Reader));
41    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPulse2,  new CalibCalPulse2Reader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPulse2,  new CalibCalPulse2Reader));
42    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Physics,         new PhysicsReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Physics,         new PhysicsReader));
43    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrkBoth,    new CalibTrkBothReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrkBoth,    new CalibTrkBothReader));
44    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrk1,       new CalibTrk1Reader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrk1,       new CalibTrk1Reader));
45    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrk2,       new CalibTrk2Reader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrk2,       new CalibTrk2Reader));
46    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrd,        new CalibTrdReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrd,        new CalibTrdReader));
47    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTof,        new CalibTofReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTof,        new CalibTofReader));
48    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibS4,         new CalibS4Reader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibS4,         new CalibS4Reader));
49    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPed,     new CalibCalPedReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibCalPed,     new CalibCalPedReader));
50    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibAc,         new CalibAcReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibAc,         new CalibAcReader));
51    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::RunHeader,       new RunHeaderReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::RunHeader,       new RunHeaderReader));
52    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::RunTrailer,      new RunTrailerReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::RunTrailer,      new RunTrailerReader));
53    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibHeader,     new CalibHeaderReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibHeader,     new CalibHeaderReader));
54    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrailer,    new CalibTrailerReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalibTrailer,    new CalibTrailerReader));
55    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::InitHeader,      new InitHeaderReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::InitHeader,      new InitHeaderReader));
56    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::InitTrailer,     new InitTrailerReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::InitTrailer,     new InitTrailerReader));
57    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::EventTrk,        new EventTrkReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::EventTrk,        new EventTrkReader));
58    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TestTrk,         new TestTrkReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TestTrk,         new TestTrkReader));
59    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TestTof,         new TestTofReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TestTof,         new TestTofReader));
60    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Log,             new LogReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Log,             new LogReader));
61    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::VarDump,         new VarDumpReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::VarDump,         new VarDumpReader));
62    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::ArrDump,         new ArrDumpReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::ArrDump,         new ArrDumpReader));
63    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TabDump,         new TabDumpReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TabDump,         new TabDumpReader));
64    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Tmtc,            new TmtcReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Tmtc,            new TmtcReader));
65    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Mcmd,            new McmdReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::Mcmd,            new McmdReader));
66    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::ForcedFECmd,     new ForcedFECmdReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::ForcedFECmd,     new ForcedFECmdReader));
67    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::AcInit,          new AcInitReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::AcInit,          new AcInitReader));
68    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalInit,         new CalInitReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalInit,         new CalInitReader));
69    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrkInit,         new TrkInitReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrkInit,         new TrkInitReader));
70    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TofInit,         new TofInitReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TofInit,         new TofInitReader));
71    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrgInit,         new TrgInitReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrgInit,         new TrgInitReader));
72    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalAlarm,        new CalAlarmReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::NdInit,          new NdInitReader));
73    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::AcAlarm,         new AcAlarmReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::S4Init,          new S4InitReader));
74    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrkAlarm,        new TrkAlarmReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::CalAlarm,        new CalAlarmReader));
75    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrgAlarm,        new TrgAlarmReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::AcAlarm,         new AcAlarmReader));
76    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TofAlarm,        new TofAlarmReader()));    TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrkAlarm,        new TrkAlarmReader));
77      TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TrgAlarm,        new TrgAlarmReader));
78      TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::TofAlarm,        new TofAlarmReader));
79      TechmodelAlgorithmMap.insert(AlgorithmMap::value_type(PacketType::S4Alarm,         new S4AlarmReader));
80  }  }
81    
82  /**  /**
# Line 86  EventReader::EventReader(int packetsLimi Line 84  EventReader::EventReader(int packetsLimi
84   */   */
85  std::string EventReader::GetVersionInfo(void) const {  std::string EventReader::GetVersionInfo(void) const {
86    return    return
87      "$Header: /home/cvsmanager/yoda/techmodel/EventReader.cpp,v 2.0 2004/09/21 20:50:54 kusanagi Exp $\n";      "$Header: /home/cvsmanager/yoda/techmodel/EventReader.cpp,v 2.4 2004/12/03 22:08:00 kusanagi Exp $\n";
88  }  }
89    
90  /**  /**
# Line 94  std::string EventReader::GetVersionInfo( Line 92  std::string EventReader::GetVersionInfo(
92   * event reader routines for all packet types.   * event reader routines for all packet types.
93   */   */
94  void EventReader::Init(PamelaRun *run) {  void EventReader::Init(PamelaRun *run) {
     std::stringstream oss;  
     logger->debug(_T("Initialize"));  
95      SetInputStream(run);      SetInputStream(run);
96            
97      //Create the structure of directories and create xxx.Header.root files      //Create the structure of directories and create xxx.Header.root files
# Line 104  void EventReader::Init(PamelaRun *run) { Line 100  void EventReader::Init(PamelaRun *run) {
100      //Create the xxx.root in it's specific directory      //Create the xxx.root in it's specific directory
101      for (AlgorithmMap::iterator i = TechmodelAlgorithmMap.begin();      for (AlgorithmMap::iterator i = TechmodelAlgorithmMap.begin();
102         i != TechmodelAlgorithmMap.end(); i++) {         i != TechmodelAlgorithmMap.end(); i++) {
103         oss.flush();         oss.str("");
104         oss << "Initializing algo " << i->second->GetAlgorithmName();         oss << "Initializing algo " << i->second->GetAlgorithmName();
        //cout << "Initializing algo " << i->second->GetAlgorithmName();  
105         logger->debug(oss.str().c_str());         logger->debug(oss.str().c_str());
106         i->second->Init(run);         i->second->Init(run);
107      }      }
# Line 122  static void SkipToNextHeader(ifstream *) Line 117  static void SkipToNextHeader(ifstream *)
117    
118  // 15 June 2004 ---note------------------  // 15 June 2004 ---note------------------
119  // A nice refacoring would require to not read again the packet data (which is  // A nice refacoring would require to not read again the packet data (which is
120  // read in the UnpackPscuHeader() and put directly in the  // read in the UnpackPscuHeader() and put directly in  the
121  // EventAlgorithm->RunEvent(....) directly the data inside the packet.... will see later....  // EventAlgorithm->RunEvent(....) directly the data inside the packet.... will see later....
122  // 15 June 2004 ---note------------------  // 15 June 2004 ---note------------------
123  void EventReader::RunEvent(int EventNumber) {  void EventReader::RunEvent(int EventNumber) {
# Line 130  void EventReader::RunEvent(int EventNumb Line 125  void EventReader::RunEvent(int EventNumb
125    //to insert a GetPacketStart()    //to insert a GetPacketStart()
126    stringstream oss;    stringstream oss;
127    int step = 0;    int step = 0;
128      const PacketType* type;
129    while (!InputFile->eof() && ((step++ < maxPackets) || (maxPackets == 0))){    while (!InputFile->eof() && ((step++ < maxPackets) || (maxPackets == 0))){
130      try {      try {
131        if (FindStart()) {        if (FindStart()) {
132          if(UnpackPscuHeader()){              UnpackPscuHeader();
133              const PacketType* type = Header->GetPscuHeader()->GetPacketType();              type = Header->GetPscuHeader()->GetPacketType();
134              AlgorithmMap::iterator i = TechmodelAlgorithmMap.find(type);              AlgorithmMap::iterator i = TechmodelAlgorithmMap.find(type);
135              if (i != TechmodelAlgorithmMap.end()) {              if (i != TechmodelAlgorithmMap.end()) {
136                  TechmodelAlgorithm *EventAlgorithm = i->second;                  TechmodelAlgorithm *EventAlgorithm(i->second);
137                  EventAlgorithm->RunEvent(EventNumber, Header->GetPscuHeader()->GetPacketLenght());                  EventAlgorithm->RunEvent(EventNumber, Header->GetPscuHeader()->GetPacketLenght());
138                  Run->FillTrees(type);                  Run->FillTrees(type);
139                  Header->GetCounter()->Increment(type);                  Header->GetCounter()->Increment(type);
140                    logger->info(Header->GetPscuHeader()->Print());
141              } else {              } else {
142                  oss.flush();                  throw NotExistingAlgorithmException(type->GetName().c_str()); //to exctract to an higher level and delete the logger!
143                  oss << "No way to read events of type" << type->GetName();              }
144                  logger->info(oss.str().c_str());        }
145              throw Exception("No way to read events of type " + type->GetName());      // In case of exception have to save the packet in a specific root file??
146          }      } catch (NotExistingAlgorithmException exc) {
147        } //else {        oss.str("");
148          //**TO BE DONE**   <<WRONG CRC l --- LOST PACKET>>//        oss << exc.print() << " " << Header->GetPscuHeader()->Print();
149          //Have to be defined a "WrongCRC" packet::Type?        logger->error(oss.str().c_str());
150          //}      } catch (WrongCRCHeaderException exc) {
151       }        oss.str("");
152          oss << exc.print() << " " << Header->GetPscuHeader()->Print();
153          logger->error(oss.str().c_str());
154        } catch (WrongCRCException exc) {
155          oss.str("");
156          oss << exc.print() << " " << Header->GetPscuHeader()->Print();
157          logger->error(oss.str().c_str());
158        } catch (UnidentifiedPacketException exc) {
159          oss.str("");
160          oss << exc.print() << " " << Header->GetPscuHeader()->Print();
161          logger->error(oss.str().c_str());
162        } catch (NotExistingCounterException exc) {
163          oss.str("");
164          oss << exc.print() << " " << Header->GetPscuHeader()->Print();
165          logger->error(oss.str().c_str());
166        } catch (LengthException exc) {
167          oss.str("");
168          oss << exc.print() << " " << Header->GetPscuHeader()->Print();
169          logger->error(oss.str().c_str());
170      } catch (...) {      } catch (...) {
171        //This have to be more detailed. More exceptions type are needed.        logger->error("Couldn't read the event. Skipping to the next header. \n");
       logger->error("Couldn't read the event. Skipping to the next header.");  
172      }      }
173      if ((step%1000) == 0) std::cout << step/1000 << "K \n";      if ((step%1000) == 0) std::cout << step/1000 << "K \n";
174    }    }
# Line 170  static void SkipToNextHeader(ifstream* T Line 184  static void SkipToNextHeader(ifstream* T
184  /**  /**
185   * Unpack the PSCU header from a file into the structure.   * Unpack the PSCU header from a file into the structure.
186   */   */
187  int EventReader::UnpackPscuHeader(void) throw (std::exception) {  void EventReader::UnpackPscuHeader(void) throw (WrongCRCException, LengthException) {
188    stringstream oss;    stringstream oss;
189    int response;    int response = false;
190    char buff[16];    char buff[16];
191    InputFile->read(buff, sizeof(buff));    InputFile->read(buff, sizeof(buff));
192        
# Line 186  int EventReader::UnpackPscuHeader(void) Line 200  int EventReader::UnpackPscuHeader(void)
200    unsigned char FileOffset   = buff[15];    unsigned char FileOffset   = buff[15];
201    
202    if (Counter < prevPckCounter){    if (Counter < prevPckCounter){
203      oss.flush();      oss.str("");
204      oss << "Packet counter is less than before of " << (prevPckCounter - Counter);      oss << "Packet counter is less than before of " << (prevPckCounter - Counter);
205      logger->info(oss.str().c_str());      logger->warn(oss.str().c_str());
206    }    }
207    
208    if (OrbitalTime < prevPckOBT){    if (OrbitalTime < prevPckOBT){
209      oss.flush();      oss.str("");
210      oss << " Orbital Time is less than before of " << (prevPckOBT - OrbitalTime);      oss << " Onboard Time is less than before of " << (prevPckOBT - OrbitalTime);
211      logger->info(oss.str().c_str());      logger->warn(oss.str().c_str());
212    }    }
213    
   
214    if (((BYTE)CM_Compute_CRC16(0, (BYTE*)&buff, 15) == (BYTE)buff[15]) && (PacketId1 == PacketId2)){    if (((BYTE)CM_Compute_CRC16(0, (BYTE*)&buff, 15) == (BYTE)buff[15]) && (PacketId1 == PacketId2)){
215      prevPckCounter = Counter;      prevPckCounter = Counter;
216      prevPckOBT     = OrbitalTime;      prevPckOBT     = OrbitalTime;
# Line 220  int EventReader::UnpackPscuHeader(void) Line 233  int EventReader::UnpackPscuHeader(void)
233              logger->debug(_T("Correct packet length"));              logger->debug(_T("Correct packet length"));
234              }              }
235          if (finalPos > 0 && finalPos < 64) {          if (finalPos > 0 && finalPos < 64) {
236              oss.flush();              oss.str("");
237              oss << " Correct packet length: Padded of " << finalPos << " bytes";              oss << " Correct packet length: Padded of " << finalPos << " bytes";
238              logger->warn(oss.str().c_str());              logger->debug(oss.str().c_str());
239          }          }
240          if (finalPos > 64){          if (finalPos > 64){
241              logger->warn(_T(" Wrong packet length? (because of wrong padding?)"));              oss.str("");
242                oss << "The begin of the next packet is far more than 64 byte from the end of the previous."
243                    << Header->GetPscuHeader()->Print();
244                logger->error(oss.str().c_str());
245                //throw LengthException("The begin of the next packet is far more than 64 byte from the end of the previous.");
246          }          }
247          InputFile->seekg(initPos, std::ios::beg);          InputFile->seekg(initPos, std::ios::beg);
         response =  true;  
248    } else {    } else {
     logger->warn(_T(" WRONG CRC FOR HEADER "));  
249      InputFile->seekg(-(13), std::ios::cur);      InputFile->seekg(-(13), std::ios::cur);
250      response =  false;      throw WrongCRCHeaderException();
251    }    }
252      char tmpId1[4];  
253    /*    char tmpId1[4];
254      char tmpId2[4];      char tmpId2[4];
255      char tmpLength[12];      char tmpLength[12];
256      char tmpStart[100];      char tmpStart[100];
# Line 252  int EventReader::UnpackPscuHeader(void) Line 268  int EventReader::UnpackPscuHeader(void)
268          <<  "\n CRC                      : "  <<  tmpCRC          <<  "\n CRC                      : "  <<  tmpCRC
269          <<  "\n Header Start Position    : "  <<  tmpStart;          <<  "\n Header Start Position    : "  <<  tmpStart;
270      logger->info(oss.str().c_str());      logger->info(oss.str().c_str());
271    return response;  */
272  }  }
273    
274  /**  /**
# Line 273  int EventReader::FindStart(void) throw ( Line 289  int EventReader::FindStart(void) throw (
289  // return true if founds a match (else false)  // return true if founds a match (else false)
290  // subF point rigth after the match, if found. Else EOF.  // subF point rigth after the match, if found. Else EOF.
291  //Maurizio 15/11/2002-----------------------  //Maurizio 15/11/2002-----------------------
292    const unsigned char subSign[3]={0xFA, 0xFE, 0xDE};    const int subSignDim = 3;
293    int subSignDim = 3;    const unsigned char subSign[subSignDim]={0xFA, 0xFE, 0xDE};
294  //------------------------------------------  //------------------------------------------
295    int subIndex = 0;    int subIndex = 0;
296    char dataByte;    char dataByte;
297    
298    int  buffSize = 100;    int  buffSize = 100;
299    int  index = 0;    int  index = 0;
300    int  loop = 0;    int  loop = -1;
301    char buffer[buffSize];    char buffer[buffSize];
302    
   /* original version  
   while (!InputFile->eof()) {  
     InputFile->get(dataByte);  
     if (dataByte == (char)(*(subSign+subIndex))){  
       if (subIndex++ == (subSignDim-1)) {  
          InputFile->seekg(-(subIndex), std::ios::cur);  
         return 1;  
        }  
     } else {  
       if (InputFile->eof()) {  
         throw Exception("Extra bytes over the last packets");  
       } else {  
         subIndex = 0;  
       }  
     }  
   } */  
303    while (!InputFile->eof()) {    while (!InputFile->eof()) {
304      InputFile->read(buffer, sizeof(buffer));      InputFile->read(buffer, sizeof(buffer));
305      index = 0;      index = 0;
306      ++loop;      loop++;
307      while (index < buffSize){      while (index < buffSize){
308          dataByte = buffer[index++];          dataByte = buffer[index++];
309          if (dataByte == (char)(*(subSign+subIndex))){          if (dataByte == (char)(*(subSign+subIndex))){
310              if (subIndex++ == (subSignDim-1)) {              if (subIndex++ == (subSignDim-1)) {
311                  InputFile->seekg( (index - subIndex - (buffSize*loop)), std::ios::cur);                  InputFile->seekg( (index - (subIndex + buffSize)), std::ios::cur);
312              return 1;                  return 1;
313              }              }
314          } else {          } else {
315                index = index - (subIndex);
316              subIndex = 0;              subIndex = 0;
317          }          }
318      }      }
319        //Needs to guarantee the overap of the buffer(s) in several loop
320        InputFile->seekg( (-1)*(subSignDim + 1) , std::ios::cur);
321    }    }
322    return 0;    return 0;
323  }  }
Legend:
Removed from v.2.1  
changed lines
  Added in v.2.5
  ViewVC Help
Powered by ViewVC 1.1.23