--- yoda/techmodel/TmtcReader.cpp	2004/12/17 18:02:37	2.4
+++ yoda/techmodel/TmtcReader.cpp	2006/09/29 10:19:27	6.4
@@ -1,6 +1,6 @@
 /** @file
- * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $
- * $Id: TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 kusanagi Exp $
+ * $Source: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/TmtcReader.cpp,v $
+ * $Id: TmtcReader.cpp,v 6.3 2006/05/30 19:10:03 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the TmtcReader class.
@@ -8,20 +8,10 @@
 * Control the CRC for the entire data Packet not just for single records
  */
 
-#include <string>
-#include <log4cxx/logger.h>
 extern "C" {
-#include <sys/time.h>
-#include "CRC.h"
+	#include "CRC.h"
 }
-
-#include <fstream>
-#include "stdio.h"
 #include "ReaderAlgorithms.h"
-
-#include "event/tmtc/TmtcRecord.h"
-
-using namespace pamela;
 using namespace pamela::techmodel;
 
 static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.TmtcReader"));
@@ -40,7 +30,7 @@
  */
 std::string TmtcReader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 2.3 2004/12/17 12:46:20 kusanagi Exp $\n";
+    "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/TmtcReader.cpp,v 6.3 2006/05/30 19:10:03 kusanagi Exp $\n";
 }
 
 /**
@@ -57,18 +47,11 @@
  */
 void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){
 
-/*
-//Just to test crc
-  char tempbuff[length];
-  InputFile->read(tempbuff, sizeof(tempbuff));
-  UINT16 subCRC = 0;
-  for (int jj = 0; jj < length ; jj++){
-    subCRC = CM_Compute_CRC16(subCRC, (BYTE*)(tempbuff+jj), 1);
-  }
-//Just to test crc
-*/
-
-    int i, j;
+    int i, j, k;
+    /* The ' k ' indexs the number of recs. 
+     * It is needed to be indipendent from ' i ' because in case of CRC error the single record is skipped and ' i ' increase by one, but correct records to be stored are still ' i '.
+    */
+    k = 0;
     char subData[TMTC_SUB_LENGTH];
     char CRCbuff[TMTC_SUBCRC_LENGTH];
     char eventCRC[TMTC_CRC_LENGTH];
@@ -81,36 +64,28 @@
     
     UINT16    partialCRC = 0; //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
     UINT16    readCRC = 0;    //partial CRC updated as mcmd packet is read (to compare with the last two bytes of this event)
-    
-/*    char tempData[length-TMTC_CRC_LENGTH];
-    InputFile->read(tempData, sizeof(tempData));
-    partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH));
-*/
-
-    for(i = 0; i < numRecords; i++) {
+    for(int i = 0; i < numRecords; i++) {
         start = InputFile->tellg();
+	memset(subData,  0, sizeof(subData));
         InputFile->read(subData, sizeof(subData));
+	memset(CRCbuff,  0, sizeof(CRCbuff));
         InputFile->read(CRCbuff, sizeof(CRCbuff));
         
-    /*    for (int jj = 0; jj < TMTC_SUB_LENGTH ; jj++){
-            partialCRC = CM_Compute_CRC16(0, (UINT8*)tempData, (length-TMTC_CRC_LENGTH));
-        }
-    */
-  
         partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&subData, TMTC_SUB_LENGTH);
         partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&CRCbuff, TMTC_SUBCRC_LENGTH);
 
         //This == CRCBuff is not really parametric take care if have to change the static lengths
         if((UINT8)(CM_Compute_CRC16(0, (UINT8*)&subData, TMTC_SUB_LENGTH)) == (UINT8)CRCbuff[0]){
-            rec = new(recs[i]) TmtcRecord(); //add a new TmtcRecord
+            rec = new(recs[k++]) TmtcRecord(); //add a new TmtcRecord
             rec->TM_RECORD_OBT            = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + (((UINT32)subData[3])&0x000000FF);
             rec->TM_DIAG_AND_BILEVEL_ACQ  = (((UINT16)subData[4]<<8)&0x0000FF00) + (((UINT16)subData[5])&0x000000FF);
-            for(j = 0; j < 12; j++) {
-                rec->TM_TH_ANA[j]    = ((((UINT16)subData[6+j]<<8)&0xFF00) + (((UINT16)subData[7+j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4)
+            
+            for(int j = 0; j < 16; j++) {
+                rec->TM_TH_ANA[j]    = ((((UINT16)subData[6 + 2*j]<<8)&0xFF00) + (((UINT16)subData[7 + 2*j])&0x00FF)); //20 is the size of TM_DEA_ANA(16) + OBT(4)
             }
             
-            for(j = 0; j < 6; j++) {
-                rec->TM_DEA_ANA[j]   = subData[30+j];
+            for(int j = 0; j < 6; j++) {
+                rec->TM_DEA_ANA[j]   = subData[38+j];
             }
 
         } else {
@@ -121,6 +96,7 @@
             logger->warn(oss.str().c_str());
         }
     }    
+    memset(eventCRC,  0, sizeof(eventCRC));
     InputFile->read(eventCRC, sizeof(eventCRC));
     readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF);
     if(partialCRC != readCRC) throw WrongCRCException(" Wrong Global CRC for TMTC Packet ");