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

clean repository, update gitignore

Browse Source
This commit is contained in:
splitPoleDAQ 2023-06-14 16:32:49 -04:00
parent 73df2edb80
commit dd9459a47f
6 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,7 +5,7 @@ FSUDAQ_Qt6
test test
test_indep test_indep
programSettings.txt programSettings.txt
EventBuilder EventKenshikushi
DataGenerator DataGenerator
data data

3
.vscode/settings.json vendored
View File

@ -154,6 +154,7 @@
"qchartview": "cpp", "qchartview": "cpp",
"qthread": "cpp", "qthread": "cpp",
"qrandomgenerator": "cpp", "qrandomgenerator": "cpp",
"source_location": "cpp" "source_location": "cpp",
"splitpole.C": "cpp"
} }
} }

5
DataGenerator.cpp
View File

@ -3,7 +3,6 @@
#include "macro.h" #include "macro.h"
#include "ClassDigitizer.h" #include "ClassDigitizer.h"
#include "OnlineEventBuilder.h"
int main(){ int main(){
@ -19,7 +18,6 @@ int main(){
std::uniform_int_distribution<unsigned short> RanEnergy(1, 1000); std::uniform_int_distribution<unsigned short> RanEnergy(1, 1000);
std::uniform_int_distribution<unsigned long long> RanTime(1, 50); std::uniform_int_distribution<unsigned long long> RanTime(1, 50);
OnlineEventBuilder * eb = new OnlineEventBuilder(digi);
unsigned long long time = 0; unsigned long long time = 0;
for( int q = 0; q < 3; q ++ ){ for( int q = 0; q < 3; q ++ ){
@ -56,11 +54,8 @@ int main(){
printf("===================================\n"); printf("===================================\n");
eb->BuildEvents(100, true);
} }
delete eb;
delete digi; delete digi;
} }

BIN
EventKenshikushi
View File

Binary file not shown.

13
Makefile_test
View File

@ -12,7 +12,7 @@ CAENLIBS = -lCAENDigitizer
ROOTLIBS = `root-config --cflags --glibs` ROOTLIBS = `root-config --cflags --glibs`
OBJS = ClassDigitizer.o OnlineEventBuilder.o MultiBuilder.o OBJS = ClassDigitizer.o MultiBuilder.o
ALL = test test_indep DataGenerator EventKenshikushi ALL = test test_indep DataGenerator EventKenshikushi
@ -23,26 +23,23 @@ all : $(ALL)
clean : clean :
/bin/rm -f $(OBJS) $(ALL) /bin/rm -f $(OBJS) $(ALL)
OnlineEventBuilder.o : OnlineEventBuilder.cpp OnlineEventBuilder.h
$(CC) $(COPTS) -c OnlineEventBuilder.cpp
MultiBuilder.o : MultiBuilder.cpp MultiBuilder.h MultiBuilder.o : MultiBuilder.cpp MultiBuilder.h
$(CC) $(COPTS) -c MultiBuilder.cpp $(CC) $(COPTS) -c MultiBuilder.cpp
ClassDigitizer.o : ClassDigitizer.cpp ClassDigitizer.h RegisterAddress.h macro.h ClassData.h ClassDigitizer.o : ClassDigitizer.cpp ClassDigitizer.h RegisterAddress.h macro.h ClassData.h
$(CC) $(COPTS) -c ClassDigitizer.cpp $(CC) $(COPTS) -c ClassDigitizer.cpp
test : test.cpp ClassDigitizer.o OnlineEventBuilder.o test : test.cpp ClassDigitizer.o
@echo "--------- making test" @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 test_indep : test_indep.cpp RegisterAddress.h macro.h
@echo "--------- making test_indep" @echo "--------- making test_indep"
$(CC) $(COPTS) -o test_indep test_indep.cpp $(CAENLIBS) $(CC) $(COPTS) -o test_indep test_indep.cpp $(CAENLIBS)
DataGenerator : DataGenerator.cpp ClassDigitizer.o OnlineEventBuilder.o DataGenerator : DataGenerator.cpp ClassDigitizer.o
@echo "--------- making DataGenerator" @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 EventKenshikushi : EventKenshikushi.cpp ClassData.h MultiBuilder.o
@echo "--------- making EventKenshikushi" @echo "--------- making EventKenshikushi"

5
test.cpp
View File

@ -2,8 +2,6 @@
#include "ClassData.h" #include "ClassData.h"
#include "ClassDigitizer.h" #include "ClassDigitizer.h"
#include "OnlineEventBuilder.h"
#include <TROOT.h> #include <TROOT.h>
#include <TSystem.h> #include <TSystem.h>
#include <TApplication.h> #include <TApplication.h>
@ -45,8 +43,6 @@ int main(int argc, char* argv[]){
// const float ch2ns = dig[0]->GetCh2ns(); // const float ch2ns = dig[0]->GetCh2ns();
OnlineEventBuilder * eb = new OnlineEventBuilder( dig[0] );
Data * data = dig[0]->GetData(); Data * data = dig[0]->GetData();
data->ClearData(); data->ClearData();
@ -68,7 +64,6 @@ int main(int argc, char* argv[]){
// printf("-------------- %ld \n", data->Waveform1[0][index].size()); // printf("-------------- %ld \n", data->Waveform1[0][index].size());
//data->PrintAllData(); //data->PrintAllData();
eb->BuildEvents(100, false);
} }