rtang/SOLARIS_QT6_DAQ
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

bug fix for ClassDigitizer2Gen::ReadData() for PHA data format

Browse Source
This commit is contained in:
Ryan Tang 2023-11-14 16:50:55 -05:00
parent 937bed699a
commit 3f01b3cf95
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClassDigitizer2Gen.cpp
View File

@ -462,7 +462,7 @@ void Digitizer2Gen::SetDataFormat(unsigned short dataFormat){
]"); ]");
} }
if( dataFormat == DataFormat::MiniWithFineTime ){ if( dataFormat == DataFormat::Minimum ){
ret = CAEN_FELib_SetReadDataFormat(ep_handle, ret = CAEN_FELib_SetReadDataFormat(ep_handle,
"[ \ "[ \
{ \"name\" : \"CHANNEL\", \"type\" : \"U8\" }, \ { \"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, ret = CAEN_FELib_SetReadDataFormat(ep_handle,
"[ \ "[ \
{ \"name\" : \"CHANNEL\", \"type\" : \"U8\" }, \ { \"name\" : \"CHANNEL\", \"type\" : \"U8\" }, \

2
Hit.h
View File

@ -37,7 +37,7 @@ class Hit {
uint16_t energy; // 16 bit uint16_t energy; // 16 bit
uint16_t energy_short; // 16 bit, only for PSD uint16_t energy_short; // 16 bit, only for PSD
uint64_t timestamp; // 48 bit 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_low_priority; // 12 bit
uint16_t flags_high_priority; // 8 bit uint16_t flags_high_priority; // 8 bit
size_t traceLenght; // 64 bit size_t traceLenght; // 64 bit