Merge pull request #227 from JeffersonLab/bugfix-write-pdfs-in-travis

Save pdf files instead of png to get past #226
JeffersonLab · Mar 18, 2019 · cd89ad7 · cd89ad7
2 parents 1648aef + efa6b75
commit cd89ad7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ script:
     docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.log.tar.gz" . ;
     docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.root.tar.gz" . ;
     docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.log.tar.gz" . ;
-    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.png.tar.gz" . ;
+    docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.pdf.tar.gz" . ;
     docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.root.tar.gz" . ;
     docker stop $(docker ps -l -q) ;
   done
@@ -43,7 +43,7 @@ deploy:
   - remolltest.release.log.tar.gz
   - remolltest.release.root.tar.gz
   - remolltest.release.analysis.log.tar.gz
-  - remolltest.release.analysis.png.tar.gz
+  - remolltest.release.analysis.pdf.tar.gz
   - remolltest.release.analysis.root.tar.gz
   skip_cleanup: true
   on:

diff --git a/analysis/tests/test_general.C b/analysis/tests/test_general.C
@@ -18,25 +18,25 @@ void test_general (const TString& inputdir, const TString& inputname)
 
   TCanvas c1;
   T.Draw("hit.pid >> h_hit_pid(5000,-2500,+2500)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_pid.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_pid.pdf");
   T.Draw("hit.det >> h_hit_det(4500,0,4500)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_det.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_det.pdf");
   T.Draw("hit.r/m >> h_hit_r(150,0.0,1.5)","hit.det==28",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_r.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_hit_r.pdf");
   T.Draw("part.vx/m >> h_vx(200,-0.010,+0.010)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vx.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vx.pdf");
   T.Draw("part.vy/m >> h_vy(200,-0.010,+0.010)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vy.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vy.pdf");
   T.Draw("part.vz/m >> h_vz(200,-1.00,+1.00)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vz.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_vz.pdf");
   T.Draw("ev.beamp/GeV >> h_beamp(110,0.0,+11.0)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_beamp.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_beamp.pdf");
   T.Draw("ev.beamp/GeV:part.vz/m >> h_beamp_vz(20,-1.0,+1.0)","",hopt+",PROF");
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_beamp_vz.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_beamp_vz.pdf");
   T.Draw("ev.thcom/deg >> h_thcom(180,0.0,+180.0)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_thcom.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_thcom.pdf");
   T.Draw("log(rate) >> h_lograte(200,-25.0,+25.0)","",hopt);
-  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_lograte.png");
+  c1.SaveAs(outputdir + "/" + inputname + "_" + "h_lograte.pdf");
 
   // Save and close
   file.Write();

diff --git a/scripts/tests/targz_macros.sh b/scripts/tests/targz_macros.sh
@@ -15,5 +15,5 @@ tar -czvf remolltest.${suite}.log.tar.gz            --transform 's|logfiles/test
 tar -czvf remolltest.${suite}.analysis.log.tar.gz   --transform 's|logfiles/tests/||g'      logfiles/tests/${suite}/analysis/*.log
 # Pack analysis products
 tar -czvf remolltest.${suite}.root.tar.gz           --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/*.root
-tar -czvf remolltest.${suite}.analysis.png.tar.gz   --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/analysis/*.png
+tar -czvf remolltest.${suite}.analysis.pdf.tar.gz   --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/analysis/*.pdf
 tar -czvf remolltest.${suite}.analysis.root.tar.gz  --transform 's|rootfiles/tests/||g'     rootfiles/tests/${suite}/analysis/*.root