--- yoda/techmodel/PhysEndRunReader.cpp	2005/08/29 09:46:13	5.0
+++ yoda/techmodel/PhysEndRunReader.cpp	2006/09/29 10:19:25	6.5
@@ -1,21 +1,11 @@
-
 // Implementation of the PhysEndRunReader class.
- 
 
-#define UINT unsigned int
-#define BYTE  unsigned char
-#include <string>
-#include <log4cxx/logger.h>
 extern "C" {
-#include <sys/time.h>
 #include "CRC.h"
 }
 
-#include <fstream>
-#include "stdio.h"
 #include "ReaderAlgorithms.h"
 
-using namespace pamela;
 using namespace pamela::techmodel;
 
 static log4cxx::LoggerPtr logger = log4cxx::Logger::getLogger(_T("pamela.techmodel.PhysEndRunReader"));
@@ -34,7 +24,7 @@
  */
 std::string PhysEndRunReader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 4.5 2005/08/29 09:29:03 kusanagi Exp $\n";
+    "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/PhysEndRunReader.cpp,v 6.4 2006/08/23 14:39:44 pam-rm2 Exp $\n";
 }
 
 /**
@@ -55,23 +45,20 @@
     char subData[length];
     UINT16    subCRC;      //CRC of the data
     UINT16    readCRC;     //CRC read from the end of the subpacket
-    long int  dataLength;
-    long int  tbInitPos;
+    long int  dataLength = length - 2;    
+    long int  tbInitPos  = dataLength - 19; // 19 is the length of th TB
 
-    //int numRecords = ((length - 2)/6);
-    dataLength = length - (long int)2;    
-    tbInitPos = dataLength - 19; // 19 is the length of th TB
     //physEndRun->CALO_ENDRUN[];
     //physEndRun->TB_ENDRUN;
-    
-    InputFile->read(subData, sizeof(unsigned char)*length);
+    memset(subData,  0, length*sizeof(char)); 
+    InputFile->read(subData, sizeof(subData));
     subCRC = CM_Compute_CRC16(0, (UINT8*)subData, dataLength);
     readCRC = (((UINT16)(subData[length - 2]<<8))&0xFF00) + (((UINT16)subData[length - 1])&0x00FF);
     
-    if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for PhysEndRun Packet ");
-    /*if (subCRC != readCRC) {
+    //if (subCRC != readCRC) throw WrongCRCException(" Wrong CRC for PhysEndRun Packet ");
+    if (subCRC != readCRC) {
         logger->error(" Wrong CRC for PhysEndRun Packet but I process it anyway");
-    }*/
+    }
     //--------------- CALO SECTION------------------------------------
     long int offset = 0;
     int j = 0;