--- yoda/techmodel/TmtcReader.cpp	2004/09/21 20:24:33	1.4
+++ yoda/techmodel/TmtcReader.cpp	2005/08/29 09:46:13	5.0
@@ -1,6 +1,6 @@
 /** @file
  * $Source: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v $
- * $Id: TmtcReader.cpp,v 1.3 2004/08/24 16:01:57 kusanagi Exp $
+ * $Id: TmtcReader.cpp,v 4.4 2005/05/23 13:53:43 kusanagi Exp $
  * $Author: kusanagi $
  * 
  * Implementation of the TmtcReader class.
@@ -8,9 +8,6 @@
 * Control the CRC for the entire data Packet not just for single records
  */
 
-
-
-
 #include <string>
 #include <log4cxx/logger.h>
 extern "C" {
@@ -43,7 +40,7 @@
  */
 std::string TmtcReader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 1.3 2004/08/24 16:01:57 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/TmtcReader.cpp,v 4.4 2005/05/23 13:53:43 kusanagi Exp $\n";
 }
 
 /**
@@ -58,18 +55,7 @@
 /**
  * Unpack the Tmtc event from an input file.
  */
-void TmtcReader::RunEvent(int EventNumber, long int length) {
-
-/*
-//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
-*/
+void TmtcReader::RunEvent(int EventNumber, long int length) throw (WrongCRCException){
 
     int i, j;
     char subData[TMTC_SUB_LENGTH];
@@ -84,43 +70,31 @@
     
     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();
         InputFile->read(subData, sizeof(subData));
         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->TM_RECORD_OBT = (((UINT32)subData[0]<<24)&0xFF000000) + (((UINT32)subData[1]<<16)&0x00FF0000) +  (((UINT32)subData[2]<<8)&0x0000FF00) + ((UINT32)subData[3])&0x000000FF;
-
-            for(j = 0; j < 16; j++) {
-                rec->TM_DEA_ANA[j]   = (((UINT16)subData[4+j]<<8)&0xFF00) + (((UINT16)subData[5+j])&0x00FF);
-                rec->TM_DEA_ANA_P[j] = (float)(rec->TM_DEA_ANA[j]*0.02);
-
-                rec->TM_TH_ANA[j]    = subData[36+j]; //36 is the size of TM_DEA_ANA + OBT
-                rec->TM_TH_ANA_P[j]  = convert_th(rec->TM_TH_ANA[j]);
+            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(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)
             }
             
-            rec->TM_BIL_DIAG_ACQ =  subData[53];
-            rec->TM_CC_DIAG_ACQ  =  (((UINT32)subData[54]<<24)&0xFF000000) + (((UINT32)subData[55]<<16)&0x00FF0000) +  (((UINT32)subData[56]<<8)&0x0000FF00) + ((UINT32)subData[57])&0x000000FF;
+            for(int j = 0; j < 6; j++) {
+                rec->TM_DEA_ANA[j]   = subData[38+j];
+            }
+
         } else {
             stringstream oss;
-            oss.flush();
+            oss.str("");
             oss << "Wrong CRC on Subpacket int TMTC Packet starting at position"
                 << start;
             logger->warn(oss.str().c_str());
@@ -128,12 +102,10 @@
     }    
     InputFile->read(eventCRC, sizeof(eventCRC));
     readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF);
-    if(!(partialCRC == readCRC)) {
-        logger->warn(_T("The test of calculated CRC with one wrote on file FAILED!!"));
-    }
+    if(partialCRC != readCRC) throw WrongCRCException(" Wrong Global CRC for TMTC Packet ");
 }
 
-
+/*
 float TmtcReader::convert_th(int TH) {
   float a,q,deltax,deltay;
   static int chiama_fun=0;
@@ -174,3 +146,4 @@
     }
   return (grado);
 }
+*/