diff --git a/Aux/test.cpp b/Aux/test.cpp index 7282f69..ae5dbae 100644 --- a/Aux/test.cpp +++ b/Aux/test.cpp @@ -324,13 +324,15 @@ int TestDigitizerRaw(){ //^====================================== int main(int argc, char* argv[]){ - TestDigitizerRaw(); + //TestDigitizerRaw(); // CheckBufferSize(5, 4); //GetOneAgg(); + Digitizer * digi = new Digitizer(0, 49093, 0, true); + delete digi; // digi->WriteRegister(DPP::QDC::PreTrigger, 60, -1); diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp index 5dd9619..076a902 100644 --- a/FSUDAQ.cpp +++ b/FSUDAQ.cpp @@ -589,6 +589,7 @@ void MainWindow::OpenDigitizers(){ if( !file.open(QIODevice::Text | QIODevice::ReadOnly) ) { LogMsg("" + a4818Path + " not found."); LogMsg("Please create such file and put the a4818 PIDs inseperate lines."); + cbOpenDigitizers->setCurrentIndex(0); return; }else{ QTextStream in(&file); @@ -606,8 +607,8 @@ void MainWindow::OpenDigitizers(){ return; }else{ - if( a4818PIDs.size() > 4){ - LogMsg("There are more than 4 a4818, please edit the MaxNPorts in macro.h and recompile."); + if( a4818PIDs.size() > MaxNPorts){ + LogMsg("There are more than "+ QString::number(MaxNPorts) + " a4818, please edit the MaxNPorts in macro.h and recompile."); } }