From 68d86c361807c2490360183a8eeceec977a36b87 Mon Sep 17 00:00:00 2001 From: "Ryan@WorkStation" Date: Tue, 14 Nov 2023 16:50:55 -0500 Subject: [PATCH] bug fix for ClassDigitizer2Gen::ReadData() for PHA data format --- ClassDigitizer2Gen.cpp | 4 ++-- Hit.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ClassDigitizer2Gen.cpp b/ClassDigitizer2Gen.cpp index 1825c1b..f8e9ac3 100644 --- a/ClassDigitizer2Gen.cpp +++ b/ClassDigitizer2Gen.cpp @@ -462,7 +462,7 @@ void Digitizer2Gen::SetDataFormat(unsigned short dataFormat){ ]"); } - if( dataFormat == DataFormat::MiniWithFineTime ){ + if( dataFormat == DataFormat::Minimum ){ ret = CAEN_FELib_SetReadDataFormat(ep_handle, "[ \ { \"name\" : \"CHANNEL\", \"type\" : \"U8\" }, \ @@ -471,7 +471,7 @@ void Digitizer2Gen::SetDataFormat(unsigned short dataFormat){ ]"); } - if( dataFormat == DataFormat::Minimum ){ + if( dataFormat == DataFormat::MiniWithFineTime ){ ret = CAEN_FELib_SetReadDataFormat(ep_handle, "[ \ { \"name\" : \"CHANNEL\", \"type\" : \"U8\" }, \ diff --git a/Hit.h b/Hit.h index 27ff1f2..1a945b1 100644 --- a/Hit.h +++ b/Hit.h @@ -37,7 +37,7 @@ class Hit { uint16_t energy; // 16 bit uint16_t energy_short; // 16 bit, only for PSD uint64_t timestamp; // 48 bit - uint16_t fine_timestamp; // 16 bit + uint16_t fine_timestamp; // 10 bit uint16_t flags_low_priority; // 12 bit uint16_t flags_high_priority; // 8 bit size_t traceLenght; // 64 bit