diff --git a/convertDRS4/README.txt b/convertDRS4/README.txt index c6b143c13e5262e84689d64a4b18faeeb8578516..d10cfb685bb0ca7841c3abb6e54951e211d0a972 100644 --- a/convertDRS4/README.txt +++ b/convertDRS4/README.txt @@ -2,7 +2,7 @@ Application for convertation of binary files acquired by DRS4 to ROOT file. 1. g++ -o read_binary read_binary.cpp -lm `root-config --cflags --libs` This compiles read_binary.cpp file and makes object file read_binary. -2. ./read_binary ./data/rawDataDSR4/file_name.dat +2. ./read_binary_DRS4 ./data/rawDataDSR4/file_name.dat With the help of the object file it is possible to convert binary file .dat to file .root (which we call raw /home/dariak/NeuRad_tests/data/rawDataDSR4) 3. read_root.C This script reads raw file and make another file .root with simple analysis /home/dariak/NeuRad_tests/data/dataDSR4 diff --git a/convertDRS4/read_binary b/convertDRS4/read_binary deleted file mode 100755 index 08c2bf85158446538a502c57962e2ccfa521ec3c..0000000000000000000000000000000000000000 Binary files a/convertDRS4/read_binary and /dev/null differ diff --git a/convertDRS4/read_binary.cpp b/convertDRS4/read_binary.cpp index 9edec3d01ab45a25a9d58432134f4a60939c456a..466aa5b1e481b37a21d8fe2b851005e776829ca6 100644 --- a/convertDRS4/read_binary.cpp +++ b/convertDRS4/read_binary.cpp @@ -93,7 +93,7 @@ int main(int argc, const char * argv[]) //for ROOT - TFile* rfile = new TFile("/home/dariak/NeuRad_tests/data/rawDataDSR4/NeuRad_test_08_2.root", "RECREATE"); + TFile* rfile = new TFile("../data/rawDataDSR4/NeuRad_test_07_1.root", "RECREATE"); TTree* rtree = new TTree("rtree", "tree for drs4 analysis"); //rtree->Branch("t1", &t1, "t1/D"); //br for time of threshold crossing signal in 1 ch // rtree->Branch("t2", &t2, "t2/D"); //br for time of threshold crossing signal in 2 ch diff --git a/data/rawDataDSR4/NeuRad_test_07_1.root b/data/rawDataDSR4/NeuRad_test_07_1.root index 7bd82a1afe26dec229f4170f10b2a1fd7abd1aba..4db35226a0dab300ab36bd3d7a62f73ec3c7f304 100644 Binary files a/data/rawDataDSR4/NeuRad_test_07_1.root and b/data/rawDataDSR4/NeuRad_test_07_1.root differ diff --git a/makefile b/makefile index a05ed764f7ebfacfd545ae6471aeedc58f990b8a..1c9e420904e5e0b9c8f526c01098a9c163592582 100755 --- a/makefile +++ b/makefile @@ -23,10 +23,12 @@ ROOTCFLAGS = $(shell root-config --cflags) PWD = $(shell pwd) DATA = $(PWD)/dataClasses +CONVERTDRS4 = $(PWD)/convertDRS4 -include $(DATA)/Data.mk all: libData.so \ + read_binary_DRS4 #ROOT html documentation, it will be done as a program which will be alsa compiled by this makefile, program will be as a last condition after all of the libraries @@ -40,6 +42,8 @@ clean: -@echo ' ' -$(RM) htmldoc -@echo ' ' + -$(RM) $(CONVERTDRS4)/read_binary_DRS4 + -@echo ' ' # Those *Cint* files below need special treating: $(DATA)/DataCint.cpp: @@ -55,6 +59,13 @@ libData.so: $(DATAOBJS) @echo 'Finished building target: $@' @echo ' ' +read_binary_DRS4: $(CONVERTDRS4)/read_binary.cpp + @echo 'Building target: $@' + @echo 'Invoking: GCC C++ Linker' +# $(CC) -L $(ROOTLIBS) -shared -o"libData.so" $(DATAOBJS) $(DATALIBS) + $(CC) -o $(CONVERTDRS4)/read_binary_DRS4 $(CONVERTDRS4)/read_binary.cpp -lm `root-config --cflags --libs` + @echo 'Finished building target: $@' + @echo ' ' .PHONY: all clean