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

rename EventKenshikushi to EventBuilder, added back loading setting when open digitizer

Browse Source
This commit is contained in:
carina@hades 2023-08-16 14:16:02 -04:00
parent a7bd71e896
commit dbf096b8ff
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
EventKenshikushi.cpp → EventBuilder.cpp
View File

14
FSUDAQ.cpp
View File

@ -625,15 +625,15 @@ void MainWindow::OpenDigitizers(){
} }
}else{ }else{
// LogMsg("Found <b>" + fileName + "</b> for digitizer settings."); LogMsg("Found <b>" + fileName + "</b> for digitizer settings.");
// if( digi[i]->LoadSettingBinaryToMemory(fileName.toStdString().c_str()) == 0 ){ if( digi[i]->LoadSettingBinaryToMemory(fileName.toStdString().c_str()) == 0 ){
// LogMsg("Loaded settings file <b>" + fileName + "</b> for Digi-" + QString::number(digi[i]->GetSerialNumber())); LogMsg("Loaded settings file <b>" + fileName + "</b> for Digi-" + QString::number(digi[i]->GetSerialNumber()));
// digi[i]->ProgramSettingsToBoard(); digi[i]->ProgramSettingsToBoard();
// }else{ }else{
// LogMsg("Fail to Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber())); LogMsg("Fail to Loaded settings file " + fileName + " for Digi-" + QString::number(digi[i]->GetSerialNumber()));
// } }
} }
digi[i]->ReadAllSettingsFromBoard(true); digi[i]->ReadAllSettingsFromBoard(true);

8
Makefile_test
View File

@ -14,7 +14,7 @@ ROOTLIBS = `root-config --cflags --glibs`
OBJS = ClassDigitizer.o MultiBuilder.o 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" @echo "--------- making DataReaderScript"
$(CC) $(COPTS) -o DataReaderScript DataReaderScript.cpp ClassData.h MultiBuilder.o $(CAENLIBS) $(CC) $(COPTS) -o DataReaderScript DataReaderScript.cpp ClassData.h MultiBuilder.o $(CAENLIBS)
EventKenshikushi : EventKenshikushi.cpp ClassData.h MultiBuilder.o EventBuilder : EventBuilder.cpp ClassData.h MultiBuilder.o
@echo "--------- making EventKenshikushi" @echo "--------- making EventBuilder"
$(CC) $(COPTS) -o EventKenshikushi EventKenshikushi.cpp MultiBuilder.o $(CAENLIBS) $(ROOTLIBS) $(CC) $(COPTS) -o EventBuilder EventBuilder.cpp MultiBuilder.o $(CAENLIBS) $(ROOTLIBS)