HIT-PAT/HITDAQ
HIT-PAT/HITDAQ
4
1
Fork 0
Code Issues Pull Requests repo.project_board Releases Wiki Activity

pushing last changes

Browse Source
This commit is contained in:
Blake Leverington 2023-09-25 18:42:16 +02:00
parent 4de5d3ff6d
commit 20d5246003
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hit2023v2/eventbuilder.cpp
View File

@ -29,7 +29,7 @@ EventBuilder::~EventBuilder()
//************************* Data processing framework ******************** //************************* Data processing framework ********************
//main processing slot //main processing slot
void EventBuilder::onNewData(DataReceiver* receiver) void EventBuilder::onNewData(DataReceiver* receiver)
{ {
@ -65,7 +65,7 @@ void EventBuilder::onNewData(DataReceiver* receiver)
//1. Background subtraction. //1. Background subtraction.
frame_counter++; frame_counter++;
/* /*
while (frame_counter<10000){ while (frame_counter<10000){
for (unsigned int dev_nr = 0; dev_nr < nrReceivers; dev_nr++){ for (unsigned int dev_nr = 0; dev_nr < nrReceivers; dev_nr++){
for (unsigned int ch = 0; ch < channelCounts[dev_nr]; ch++) for (unsigned int ch = 0; ch < channelCounts[dev_nr]; ch++)
@ -93,7 +93,7 @@ void EventBuilder::onNewData(DataReceiver* receiver)
newDataSemaphore.release(1); newDataSemaphore.release(1);
lastFrame = currentFrame; lastFrame = currentFrame;
lastFrameMutex.unlock(); lastFrameMutex.unlock();
/* /*
//histogram stuff //histogram stuff
if (histogramSamplesToTake) if (histogramSamplesToTake)
{ {
@ -111,10 +111,13 @@ void EventBuilder::onNewData(DataReceiver* receiver)
if (loggingData) logDataToFile(); if (loggingData) logDataToFile();
HIT_ANALYSE_V2 hit_analyse_v2;//create the object HIT_ANALYSE_V2 hit_analyse_v2;//create the object
QString dataString; QString dataString;
// for (unsigned int dev_nrsim = 0; dev_nrsim < 3; dev_nrsim++){
//simulate 6 planes instead of just 2
for (unsigned int dev_nr = 0; dev_nr < nrReceivers; dev_nr++){ for (unsigned int dev_nr = 0; dev_nr < nrReceivers; dev_nr++){
dataString += hit_analyse_v2.analyseBeamData(currentFrame); dataString += hit_analyse_v2.analyseBeamData(currentFrame);
dataString +=','; dataString +=',';
} }
// }
QTime currentTime = QTime::currentTime(); QTime currentTime = QTime::currentTime();
//Calculate the time since midnight in milliseconds //Calculate the time since midnight in milliseconds
int millisecondsSinceMidnight = currentTime.msecsSinceStartOfDay(); int millisecondsSinceMidnight = currentTime.msecsSinceStartOfDay();

2
hit2023v2/hit2023v2.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
QT += core gui network serialport QT += core gui network serialport
#CONFIG += static
unix { unix {
QMAKE_CXXFLAGS += -W -std=c++17 QMAKE_CXXFLAGS += -W -std=c++17
} }

BIN
hit2023v2/release/hit2023v2.exe
View File

Binary file not shown.