--- yoda/techmodel/PhysEndRunReader.cpp	2005/03/04 15:54:11	3.0
+++ yoda/techmodel/PhysEndRunReader.cpp	2005/03/15 17:16:18	4.2
@@ -34,7 +34,7 @@
  */
 std::string PhysEndRunReader::GetVersionInfo(void) const {
   return 
-    "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 2.3 2005/03/03 13:06:20 kusanagi Exp $\n";
+    "$Header: /home/cvsmanager/yoda/techmodel/PhysEndRunReader.cpp,v 4.1 2005/03/15 16:03:01 kusanagi Exp $\n";
 }
 
 /**
@@ -69,9 +69,9 @@
     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,6 +104,10 @@
     //--------------- 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]
+    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);
     //Here are missing the TB_PMT_MASK;
     //subData[offset+ 3--->8] have a CRC(what?) in subData[offset+9]
     physEndRun->TB_ENDRUN.TB_S4_MASK      = ((UINT8)subData[offset+10])>>5;
@@ -112,9 +116,9 @@
     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]
     physEndRun->TB_ENDRUN.TB_CALIB_FLAG   = ((UINT8)subData[offset+16])>>7;
-    physEndRun->TB_ENDRUN.TB_S4_TRIG      = ((UINT8)subData[offset+16])>>6; 
-    physEndRun->TB_ENDRUN.TB_CALO_TRIG    = ((UINT8)subData[offset+16])>>5; 
-    physEndRun->TB_ENDRUN.TB_TOF_TRIG     = (UINT8)(subData[offset+16]<<3) + (UINT8)(subData[offset+17]>>5);
+    physEndRun->TB_ENDRUN.TB_CALO_TRIG    = ((UINT8)subData[offset+16])>>6; 
+    physEndRun->TB_ENDRUN.TB_S4_TRIG      = ((UINT8)subData[offset+16])>>5; 
+    physEndRun->TB_ENDRUN.TB_TOF_TRIG     = (UINT8)(subData[offset+16]<<3) + (UINT8)(subData[offset+17]>>6);
     //subData[tbInitPos+ 16--->17] have a CRC(what?) in subData[tbInitPos+18]
 }