diff --git a/EventKenshikushi.cpp b/EventBuilder.cpp similarity index 100% rename from EventKenshikushi.cpp rename to EventBuilder.cpp diff --git a/FSUDAQ.cpp b/FSUDAQ.cpp index d7d11ad..3068dd3 100644 --- a/FSUDAQ.cpp +++ b/FSUDAQ.cpp @@ -625,15 +625,15 @@ void MainWindow::OpenDigitizers(){ } }else{ - // LogMsg("Found " + fileName + " for digitizer settings."); + LogMsg("Found " + fileName + " for digitizer settings."); - // if( digi[i]->LoadSettingBinaryToMemory(fileName.toStdString().c_str()) == 0 ){ - // LogMsg("Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber())); - // digi[i]->ProgramSettingsToBoard(); + if( digi[i]->LoadSettingBinaryToMemory(fileName.toStdString().c_str()) == 0 ){ + LogMsg("Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber())); + digi[i]->ProgramSettingsToBoard(); - // }else{ - // LogMsg("Fail to Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber())); - // } + }else{ + LogMsg("Fail to Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber())); + } } digi[i]->ReadAllSettingsFromBoard(true); diff --git a/Makefile_test b/Makefile_test index b716548..d82003d 100644 --- a/Makefile_test +++ b/Makefile_test @@ -14,7 +14,7 @@ ROOTLIBS = `root-config --cflags --glibs` OBJS = ClassDigitizer.o MultiBuilder.o -ALL = test test_indep DataGenerator EventKenshikushi DataReaderScript +ALL = test test_indep DataGenerator EventBuilder DataReaderScript ######################################################################### @@ -45,6 +45,6 @@ DataReaderScript : DataReaderScript.cpp ClassData.h MultiBuilder.o @echo "--------- making DataReaderScript" $(CC) $(COPTS) -o DataReaderScript DataReaderScript.cpp ClassData.h MultiBuilder.o $(CAENLIBS) -EventKenshikushi : EventKenshikushi.cpp ClassData.h MultiBuilder.o - @echo "--------- making EventKenshikushi" - $(CC) $(COPTS) -o EventKenshikushi EventKenshikushi.cpp MultiBuilder.o $(CAENLIBS) $(ROOTLIBS) \ No newline at end of file +EventBuilder : EventBuilder.cpp ClassData.h MultiBuilder.o + @echo "--------- making EventBuilder" + $(CC) $(COPTS) -o EventBuilder EventBuilder.cpp MultiBuilder.o $(CAENLIBS) $(ROOTLIBS) \ No newline at end of file