--- PamelaDigitizer/DigitizeRunHeader.cxx 2008/10/15 14:03:17 1.2 +++ PamelaDigitizer/DigitizeRunHeader.cxx 2009/02/20 10:22:18 1.3 @@ -1,14 +1,15 @@ #include "Digitizer.h" void Digitizer::DigitizeRunHeader(){ - const Int_t lenRH = fRunHeaderbuffer*2; + const Int_t lenRH = fRunHeaderbuffer; // 37 not 54 UChar_t buffRH[lenRH]; UShort_t buffPSCU[8]; UChar_t *p; p=buffRH; // header: 16 bytes - DigitizePSCU(fRunHeaderbuffer*2,0x20,buffPSCU); + // DigitizePSCU(fRunHeaderbuffer*2,0x20,buffPSCU); + DigitizePSCU(0x25,0x20,buffPSCU); memcpy(p,buffPSCU,16*sizeof(UChar_t)); p+=16; @@ -79,21 +80,22 @@ *(p++) = 0; // crc (uint16) - UShort_t crcRH = (UShort_t)CM_Compute_CRC16((UINT16)0, (BYTE*)&buffRH, (UINT32)(fRunHeaderbuffer*2-2)); + UShort_t crcRH = (UShort_t)CM_Compute_CRC16((UINT16)0, (BYTE*)&buffRH, (UINT32)(fRunHeaderbuffer-1)); *(p++) = (UChar_t)(crcRH << 8); *p = (UChar_t)crcRH; - memcpy(fDataRunHeader,buffRH,fRunHeaderbuffer*sizeof(UShort_t)); + memcpy(fDataRunHeader,buffRH,fRunHeaderbuffer*sizeof(UChar_t)); }; void Digitizer::DigitizeRunTrailer(){ - UChar_t buffRT[fRunTrailerbuffer*2]; + UChar_t buffRT[fRunTrailerbuffer]; UShort_t buffPSCU[8]; UChar_t *p; p=buffRT; // header: 16 bytes - DigitizePSCU(fRunHeaderbuffer*2,0x21,buffPSCU); + // DigitizePSCU(fRunHeaderbuffer*2,0x21,buffPSCU); + DigitizePSCU(0x19,0x21,buffPSCU); memcpy(p,buffPSCU,16*sizeof(UChar_t)); p+=16; @@ -132,11 +134,11 @@ *(p++) = 0; // crc (uint16) - UShort_t crcRT = (UShort_t)CM_Compute_CRC16((UINT16)0, (BYTE*)(buffRT), (UINT32)(fRunTrailerbuffer*2-2)); + UShort_t crcRT = (UShort_t)CM_Compute_CRC16((UINT16)0, (BYTE*)(buffRT), (UINT32)(fRunTrailerbuffer-1)); *(p++) = (UChar_t)(crcRT << 8); *p = (UChar_t)crcRT; - memcpy(fDataRunTrailer,buffRT,fRunTrailerbuffer*sizeof(UShort_t)); + memcpy(fDataRunTrailer,buffRT,fRunTrailerbuffer*sizeof(UChar_t)); }; void Digitizer::AddPadding(){