--- yoda/techmodel/PhysEndRunReader.cpp	2006/02/07 17:11:09	6.0
+++ yoda/techmodel/PhysEndRunReader.cpp	2008/01/10 16:21:38	6.6
@@ -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 5.1 2006/02/04 12:37:45 kusanagi Exp $\n";
+    "$Header: /afs/ba.infn.it/user/pamela/src/CVS/yoda/techmodel/PhysEndRunReader.cpp,v 6.5 2006/09/29 10:19:25 mocchiut Exp $\n";
 }
 
 /**
@@ -60,7 +50,7 @@
 
     //physEndRun->CALO_ENDRUN[];
     //physEndRun->TB_ENDRUN;
-    
+    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);
@@ -79,22 +69,31 @@
         //subData[offset+2--->3] is a fixed word = 0x23
         //If this bit is ? the subsequent CALO_HK are not valid
         if (!(physEndRun->CALO_ENDRUN[j].CALO_BOARD_STATUS_HK & 0x02)) {
+	    UInt_t kk = 0;
             for(int k = 0; k < 11 ; k++){
-                physEndRun->CALO_ENDRUN[j].CALO_HK0[k] = (((UINT16)(subData[offset+3+k]<<8))&0xFF00) + (((UINT16)subData[offset+4+k])&0x00FF);
-                physEndRun->CALO_ENDRUN[j].CALO_HK1[k] = (((UINT16)(subData[offset+14+k]<<8))&0xFF00) + (((UINT16)subData[offset+15+k])&0x00FF);
-            }
+	      //	      physEndRun->CALO_ENDRUN[j].CALO_HK0[k] = (UINT8)(subData[offset+4+kk])+ 255 + (UINT8)(subData[offset+5+kk]);
+	      physEndRun->CALO_ENDRUN[j].CALO_HK0[k] = (((UINT16)(subData[offset+4+kk]<<8))&0xFF00) + (((UINT16)subData[offset+5+kk])&0x00FF);
+	      physEndRun->CALO_ENDRUN[j].CALO_HK1[k] = (((UINT16)(subData[offset+26+kk]<<8))&0xFF00) + (((UINT16)subData[offset+27+kk])&0x00FF);
+	      kk += 2;
+            }	    
             offset = offset + 50; //CALO_BOARD_ID_HK + CALO_BOARD_STATUS_HK + 2*CALO_HKx + CRC (2Bytes)
         } else offset = offset + 4; //CALO_BOARD_ID_HK + CALO_BOARD_STATUS_HK + CRC (2Bytes)
         //subData[offset+(3+k)--->(15+k)] have a CRC(what?) in subData[offset+ 23--->24]
 
-        for(int k = 0; k < 7 ; k++){
-            physEndRun->CALO_ENDRUN[j].CALO_BOARD_ID_REG     = ((UINT8)(subData[offset])&0x1F);
-            physEndRun->CALO_ENDRUN[j].CALO_BOARD_STATUS_REG = (UINT8)(subData[offset+1]);
-            //subData[offset+2--->3] is a fixed word = 0x2
-            physEndRun->CALO_ENDRUN[j].CALO_REG[k] = (((UINT16)(subData[offset+4]<<8))&0xFF00) + (((UINT16)subData[offset+5])&0x00FF);
-            //subData[offset+ 0--->5] have a CRC(what?) in subData[offset+ 6--->7]
-            offset = offset + 8; //CALO_BOARD_ID_REG + CALO_BOARD_STATUS_REG + CALO_REG + CRC(2Byte) 
-        }
+	//        for(int k = 0; k < 7 ; k++){
+	physEndRun->CALO_ENDRUN[j].CALO_BOARD_ID_REG     = ((UINT8)(subData[offset])&0x1F);
+	physEndRun->CALO_ENDRUN[j].CALO_BOARD_STATUS_REG = (UINT8)(subData[offset+1]);
+	//subData[offset+2--->3] is a fixed word = 0x2
+	physEndRun->CALO_ENDRUN[j].CALO_REG[0] = (((UINT16)(subData[offset+4]<<8))&0xFF00) + (((UINT16)subData[offset+5])&0x00FF);
+	physEndRun->CALO_ENDRUN[j].CALO_REG[1] = (((UINT16)(subData[offset+6]<<8))&0xFF00) + (((UINT16)subData[offset+7])&0x00FF);
+	physEndRun->CALO_ENDRUN[j].CALO_REG[2] = 0;
+	physEndRun->CALO_ENDRUN[j].CALO_REG[3] = 0;
+	physEndRun->CALO_ENDRUN[j].CALO_REG[4] = 0;
+	physEndRun->CALO_ENDRUN[j].CALO_REG[5] = 0;
+	physEndRun->CALO_ENDRUN[j].CALO_REG[6] = 0;
+	//subData[offset+ 0--->5] have a CRC(what?) in subData[offset+ 6--->7]
+	offset = offset + 56; //CALO_BOARD_ID_REG + CALO_BOARD_STATUS_REG + CALO_REG + CRC(2Byte) 
+	//        }
         j++;
     }