--- chewbacca/PamOffLineSW/techmodel/TmtcReader.cpp	2008/09/23 07:20:28	1.1
+++ chewbacca/PamOffLineSW/techmodel/TmtcReader.cpp	2008/10/01 09:53:45	1.2
@@ -1,7 +1,7 @@
 /** @file
- * $Source: /repository/PamOffLineSW/techmodel/TmtcReader.cpp,v $
- * $Id: TmtcReader.cpp,v 1.7 2008-03-06 18:33:36 messineo Exp $
- * $Author: messineo $
+ * $Source: /afs/ba.infn.it/user/pamela/src/CVS/chewbacca/PamOffLineSW/techmodel/TmtcReader.cpp,v $
+ * $Id: TmtcReader.cpp,v 1.1.1.1 2008/09/23 07:20:28 mocchiut Exp $
+ * $Author: mocchiut $
  * 
  * Implementation of the TmtcReader class.
 * ToBeDone:
@@ -28,7 +28,7 @@
  */
 std::string TmtcReader::GetVersionInfo(void) const {
   return 
-    "$Header: /repository/PamOffLineSW/techmodel/TmtcReader.cpp,v 1.7 2008-03-06 18:33:36 messineo Exp $\n";
+    "$Header: /afs/ba.infn.it/user/pamela/src/CVS/chewbacca/PamOffLineSW/techmodel/TmtcReader.cpp,v 1.1.1.1 2008/09/23 07:20:28 mocchiut Exp $\n";
 }
 
 /**
@@ -70,17 +70,17 @@
     {
     	start=(TMTC_SUB_LENGTH+TMTC_SUBCRC_LENGTH)*i;
 		for(int m=0; m<TMTC_SUB_LENGTH; m++){
-			subData[m]=mysubData[m + (TMTC_SUB_LENGTH+TMTC_SUBCRC_LENGTH)*i ];
+			subData[m]=mysubData[m + start];
 		}
 		
-		CRCbuff[0]=mysubData[TMTC_SUB_LENGTH*i];
+		CRCbuff[0]=mysubData[start + TMTC_SUB_LENGTH];
 
         partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&subData, TMTC_SUB_LENGTH);
         partialCRC = CM_Compute_CRC16(partialCRC, (UINT8*)&CRCbuff, TMTC_SUBCRC_LENGTH);
+	if((UINT8)(CM_Compute_CRC16(0, (UINT8*)&subData, TMTC_SUB_LENGTH)) == (UINT8)CRCbuff[0])
+	  {
 
         //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[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);
@@ -103,6 +103,7 @@
     }    
 //    readCRC = (((UINT16)(eventCRC[0]<<8))&0xFF00) + (((UINT16)eventCRC[1])&0x00FF);
     readCRC = (((UINT16)(mysubData[length - 2]<<8))&0xFF00) + (((UINT16)mysubData[length - 1])&0x00FF);  
+    //    readCRC = (((UINT16)(mysubData[length - 1]<<8))&0xFF00) + (((UINT16)mysubData[length])&0x00FF);  
 	
     
    // if(partialCRC != readCRC) throw WrongCRCException(" Wrong Global CRC for TMTC Packet ");