--- yoda/techmodel/PhysEndRunReader.cpp 2005/03/04 15:54:11 3.0 +++ yoda/techmodel/PhysEndRunReader.cpp 2005/03/15 16:03:01 4.1 @@ -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.0 2005/03/06 04:33:02 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; @@ -112,9 +112,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] }