diff --git a/.gitignore b/.gitignore index 1de8357..5731a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ FSUDAQ_Qt6 test test_indep programSettings.txt -EventBuilder +EventKenshikushi DataGenerator data diff --git a/.vscode/settings.json b/.vscode/settings.json index 98de37f..a9c8224 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -154,6 +154,7 @@ "qchartview": "cpp", "qthread": "cpp", "qrandomgenerator": "cpp", - "source_location": "cpp" + "source_location": "cpp", + "splitpole.C": "cpp" } } \ No newline at end of file diff --git a/DataGenerator.cpp b/DataGenerator.cpp index 76c8f6b..428f05f 100644 --- a/DataGenerator.cpp +++ b/DataGenerator.cpp @@ -3,7 +3,6 @@ #include "macro.h" #include "ClassDigitizer.h" -#include "OnlineEventBuilder.h" int main(){ @@ -19,7 +18,6 @@ int main(){ std::uniform_int_distribution RanEnergy(1, 1000); std::uniform_int_distribution RanTime(1, 50); - OnlineEventBuilder * eb = new OnlineEventBuilder(digi); unsigned long long time = 0; for( int q = 0; q < 3; q ++ ){ @@ -56,11 +54,8 @@ int main(){ printf("===================================\n"); - eb->BuildEvents(100, true); - } - delete eb; delete digi; } \ No newline at end of file diff --git a/EventKenshikushi b/EventKenshikushi deleted file mode 100755 index f512144..0000000 Binary files a/EventKenshikushi and /dev/null differ diff --git a/Makefile_test b/Makefile_test index e677423..62f0d5a 100644 --- a/Makefile_test +++ b/Makefile_test @@ -12,7 +12,7 @@ CAENLIBS = -lCAENDigitizer ROOTLIBS = `root-config --cflags --glibs` -OBJS = ClassDigitizer.o OnlineEventBuilder.o MultiBuilder.o +OBJS = ClassDigitizer.o MultiBuilder.o ALL = test test_indep DataGenerator EventKenshikushi @@ -23,26 +23,23 @@ all : $(ALL) clean : /bin/rm -f $(OBJS) $(ALL) -OnlineEventBuilder.o : OnlineEventBuilder.cpp OnlineEventBuilder.h - $(CC) $(COPTS) -c OnlineEventBuilder.cpp - MultiBuilder.o : MultiBuilder.cpp MultiBuilder.h $(CC) $(COPTS) -c MultiBuilder.cpp ClassDigitizer.o : ClassDigitizer.cpp ClassDigitizer.h RegisterAddress.h macro.h ClassData.h $(CC) $(COPTS) -c ClassDigitizer.cpp -test : test.cpp ClassDigitizer.o OnlineEventBuilder.o +test : test.cpp ClassDigitizer.o @echo "--------- making test" - $(CC) $(COPTS) -o test test.cpp ClassDigitizer.o OnlineEventBuilder.o $(CAENLIBS) $(ROOTLIBS) + $(CC) $(COPTS) -o test test.cpp ClassDigitizer.o $(CAENLIBS) $(ROOTLIBS) test_indep : test_indep.cpp RegisterAddress.h macro.h @echo "--------- making test_indep" $(CC) $(COPTS) -o test_indep test_indep.cpp $(CAENLIBS) -DataGenerator : DataGenerator.cpp ClassDigitizer.o OnlineEventBuilder.o +DataGenerator : DataGenerator.cpp ClassDigitizer.o @echo "--------- making DataGenerator" - $(CC) $(COPTS) -o DataGenerator DataGenerator.cpp ClassDigitizer.o OnlineEventBuilder.o $(CAENLIBS) + $(CC) $(COPTS) -o DataGenerator DataGenerator.cpp ClassDigitizer.o $(CAENLIBS) EventKenshikushi : EventKenshikushi.cpp ClassData.h MultiBuilder.o @echo "--------- making EventKenshikushi" diff --git a/test.cpp b/test.cpp index 497f8e9..99adc7b 100644 --- a/test.cpp +++ b/test.cpp @@ -2,8 +2,6 @@ #include "ClassData.h" #include "ClassDigitizer.h" -#include "OnlineEventBuilder.h" - #include #include #include @@ -45,8 +43,6 @@ int main(int argc, char* argv[]){ // const float ch2ns = dig[0]->GetCh2ns(); - OnlineEventBuilder * eb = new OnlineEventBuilder( dig[0] ); - Data * data = dig[0]->GetData(); data->ClearData(); @@ -68,7 +64,6 @@ int main(int argc, char* argv[]){ // printf("-------------- %ld \n", data->Waveform1[0][index].size()); //data->PrintAllData(); - eb->BuildEvents(100, false); }