--- yoda/techmodel/PhysEndRunReader.cpp	2005/03/15 16:03:01	4.1
+++ yoda/techmodel/PhysEndRunReader.cpp	2006/05/30 19:10:03	6.2
@@ -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.0 2005/03/06 04:33:02 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 6.1 2006/05/30 19:10:02 kusanagi 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);
+    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) {
         logger->error(" Wrong CRC for PhysEndRun Packet but I process it anyway");
-    }*/
+    }
     //--------------- CALO SECTION------------------------------------
     long int offset = 0;
     int j = 0;
@@ -104,10 +91,13 @@
     //--------------- TB SECTION------------------------------------
     physEndRun->TB_ENDRUN.TB_ALARM_MASK   = (((UINT16)(subData[offset]<<8))&0xFF00) + (((UINT16)subData[offset + 1])&0x00FF);
     //subData[offset+ 0--->1] have a CRC(what?) in subData[offset+2]
-    //Here are missing the TB_PMT_MASK;
+    physEndRun->TB_ENDRUN.TB_PMT_MASK_S3  = ((((UINT16)(subData[offset+2]))<<4)&0x0FF0) + (((UINT16)subData[offset + 3]>>4)&0x000F);
+    physEndRun->TB_ENDRUN.TB_PMT_MASK_S2  = ((((UINT8)(subData[offset+3]))<<4)&0xF0) + (((UINT8)subData[offset + 4]>>4)&0x0F);
+    physEndRun->TB_ENDRUN.TB_PMT_MASK_S12 = ((((UINT16)(subData[offset+4]))<<8)&0x0F00) + (((UINT16)subData[offset + 5])&0x00FF);
+    physEndRun->TB_ENDRUN.TB_PMT_MASK_S11 = ((((UINT16)(subData[offset+6]))<<8)&0xFF00) + (((UINT16)subData[offset + 7])&0x00FF);
     //subData[offset+ 3--->8] have a CRC(what?) in subData[offset+9]
-    physEndRun->TB_ENDRUN.TB_S4_MASK      = ((UINT8)subData[offset+10])>>5;
-    physEndRun->TB_ENDRUN.TB_CALO_MASK    = (((UINT8)subData[offset+10])>>1)&0x0F;
+    physEndRun->TB_ENDRUN.TB_CALO_MASK    = ((UINT8)subData[offset+10])>>5;
+    physEndRun->TB_ENDRUN.TB_S4_MASK      = (((UINT8)subData[offset+10])>>1)&0x0F;
     //subData[tbInitPos+9] have a CRC(what?) in subData[tbInitPos+11]
     physEndRun->TB_ENDRUN.TB_BUSY_MASK    = (((UINT32)subData[offset+12]<<16)&0x00FF0000) +  (((UINT32)subData[offset+13]<<8)&0x0000FF00) + (((UINT32)subData[offset+14])&0x000000FF);
     //subData[tbInitPos+ 12--->14] have a CRC(what?) in subData[tbInitPos+15]