diff --git a/.travis.yml b/.travis.yml index 59cb323be79d2805fe92fec716a7d456adbc4d06..fb6f8f389f8ed4ff55bd9b451e2d48c2b393b8a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,22 @@ services: before_install: - docker pull rootproject/root-ubuntu16 - docker images + - ./rd make all test + - ./rd ./test + - mkdir public; cp *.pdf public script: #Compile it - docker run -v $PWD:~ --rm -it --user $(id -u) $image /bin/bash -c "cd ~;make all" + - + +deploy: + provider: pages + local-dir : public + skip-cleanup: true + github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable + keep-history: true + on: + branch: master diff --git a/Makefile b/Makefile index 9c0e92172ddf480c965ad7719f4b252894ab1841..638a9e67b6d1acf6f140f4d1b2e4030386be3024 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ clean: # clang++ -O0 -shared -Wl,-soname,libplottingHelperNew.so -o libplottingHelperNew.so plottingHelper.o test: test.C - ${CXX} -Wall ${CFLAGS} $< -Wl,-rpath,. plottingHelper_h.so -o test ${LIBS} + ${CXX} -Wall ${CFLAGS} $< -Wl,-rpath,. plottingHelper_C.so -o test ${LIBS} # testFast: test.C libPlottingHelper.so ${CXX} -Wall ${CFLAGS} $< -Wl,-rpath,. -L. -lPlottingHelper -o testFast ${LIBS} diff --git a/plottingHelper.h b/plottingHelper.h index d938c6bf864b60b6bd52cd17cba2dc41ec948954..392a4a63be15c4be9e46d7a06572515e11728c7a 100644 --- a/plottingHelper.h +++ b/plottingHelper.h @@ -23,7 +23,8 @@ #include <cassert> //#define LibraryPath /home/radek/Dropbox/patrick/undolding/PlottingHelper/libPlottingHelper.so -R__LOAD_LIBRARY(/home/radek/Dropbox/patrick/undolding/PlottingHelper/libPlottingHelper.so) + +//R__LOAD_LIBRARY(/home/radek/Dropbox/patrick/undolding/PlottingHelper/libPlottingHelper.so) diff --git a/rd b/rd new file mode 100755 index 0000000000000000000000000000000000000000..bc48bad3c50b89245a4fabeb552c49da9272afd9 --- /dev/null +++ b/rd @@ -0,0 +1,9 @@ +#/bin/sh +image=rootproject/root-ubuntu16 + +if [ ! -z "$DISPLAY" ] +then + sudo docker run -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix -v $PWD:/excercise --rm -it --user $(id -u) $image /bin/bash -c "cd /excercise/; $*" +else + sudo docker run -v $PWD:/home/builder --rm -it --user $(id -u) $image /bin/bash -c "cd /home/builder; $*" +fi diff --git a/test.C b/test.C new file mode 100644 index 0000000000000000000000000000000000000000..2079320d950df0662dd441cf2a46c48f76c89efc --- /dev/null +++ b/test.C @@ -0,0 +1,39 @@ +#include "TROOT.h" +#include "TCanvas.h" +#include "TStyle.h" + +#include "plottingHelper.h" +R__LOAD_LIBRARY(plottingHelper_C.so) +using namespace PlottingHelper; + + +void test() +{ + gStyle->SetOptStat(0); + TCanvas *can = new TCanvas("can", ""); + DividePad({1,1,1,1,1}, {1,1,1}); + for(int i = 0; i < 5*3; ++i) { + can->cd(i+1); + + + TH1D *h = new TH1D(Form("%d",rand()),";;", 10, -3, 3); + int nEv = 1000 - i*40; + h->FillRandom("gaus", nEv); + h->Draw("hist e"); + SetFTO({12}, {5}, {1.2, 2, 0.3, 4}); + if(i == 5*3-1) GetXaxis()->SetTitle("x"); + if(i == 0) GetYaxis()->SetTitle("y"); + GetYaxis()->SetRangeUser(0, 300); + DrawLatexUp( -1, Form("n_{Ev} = %d", nEv)); + } + + DrawLatexUp(can->GetPad(1), can->GetPad(5), 2, "This is a testing grid"); + can->SaveAs("testGrid.pdf"); + +} + +int main() +{ + test(); + return 0; +}