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

bug fix when open digitizer to set no trace

Browse Source
This commit is contained in:
Calem@RAISOR 2024-09-14 17:41:50 -05:00
parent f68d26de65
commit be62125e77
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,6 +2,7 @@
*.fsu *.fsu
*.root *.root
*.bin *.bin
*.log
core.* core.*
@ -30,6 +31,7 @@ Bin2Root
data data
Data Data
raw_binary raw_binary
log
*.d *.d
*.pcm *.pcm

2
ClassDigitizer.cpp
View File

@ -1331,7 +1331,7 @@ void Digitizer::SetBits(Reg address, unsigned int bitValue, unsigned int bitLeng
DebugPrint("%s", "Digitizer"); DebugPrint("%s", "Digitizer");
if( softwareDisable ) return; if( softwareDisable ) return;
if( AcqRun ) return; if( AcqRun ) return;
///printf("address : 0x%X, value : 0x%X, len : %d, pos : %d, ch : %d \n", address, bitValue, bitLength, bitSmallestPos, ch); // printf("address : 0x%X, value : 0x%X, len : %d, pos : %d, ch : %d \n", address, bitValue, bitLength, bitSmallestPos, ch);
uint32_t bit ; uint32_t bit ;
uint32_t bitmask = (uint(pow(2, bitLength)-1) << bitSmallestPos); uint32_t bitmask = (uint(pow(2, bitLength)-1) << bitSmallestPos);
int tempCh = ch; int tempCh = ch;

2
ClassDigitizer.h
View File

@ -207,7 +207,7 @@ class Digitizer{
} }
void SetTrace(bool onOff){ void SetTrace(bool onOff){
SetBits(DPP::BoardConfiguration, DPP::Bit_BoardConfig::RecordTrace, onOff, -1); SetBits(DPP::BoardConfiguration, DPP::Bit_BoardConfig::RecordTrace, (short) onOff, -1);
} }
}; };

6
FSUDAQ
View File

@ -2,6 +2,10 @@
timestamp=$(date +%Y%m%d_%H%M%S) timestamp=$(date +%Y%m%d_%H%M%S)
outFile=program_${timestamp}.log outFile=log/program_${timestamp}.log
mkdir -p "$(dirname "$outFile")"
echo "FSUDAQ, save stdout to $outFile"
stdbuf -oL ./FSUDAQ_Qt6 | tee $outFile stdbuf -oL ./FSUDAQ_Qt6 | tee $outFile

7
FSUDAQ.cpp
View File

@ -693,9 +693,6 @@ void FSUDAQ::OpenDigitizers(){
digi[i] = new Digitizer(portList[i].first, portList[i].second); digi[i] = new Digitizer(portList[i].first, portList[i].second);
//digi[i]->Reset(); //digi[i]->Reset();
//===== set no trace, even when FSQDAQ segfault at scope, the digitizer will save no trace
digi[i]->SetTrace(false);
if( cbOpenMethod->currentData().toInt() == 2 ) { if( cbOpenMethod->currentData().toInt() == 2 ) {
digi[i]->ProgramBoard(); digi[i]->ProgramBoard();
} }
@ -740,6 +737,10 @@ void FSUDAQ::OpenDigitizers(){
} }
digi[i]->ReadAllSettingsFromBoard(true); digi[i]->ReadAllSettingsFromBoard(true);
//===== set no trace, even when FSQDAQ segfault at scope, the digitizer will save no trace
digi[i]->SetTrace(false);
// if( digi[i]->GetDPPType() == V1730_DPP_PHA_CODE) digi[i]->WriteRegister(DPP::BoardConfiguration, 0xE8915);
readDataThread[i] = new ReadDataThread(digi[i], i); readDataThread[i] = new ReadDataThread(digi[i], i);
connect(readDataThread[i], &ReadDataThread::sendMsg, this, &FSUDAQ::LogMsg); connect(readDataThread[i], &ReadDataThread::sendMsg, this, &FSUDAQ::LogMsg);