From f0d6496db8016b1f1d8b89a182b976d68acef730 Mon Sep 17 00:00:00 2001
From: Joshua Moss <jmoss@lxplus004.cern.ch>
Date: Thu, 7 Jun 2018 10:00:38 +0200
Subject: [PATCH] ART scripts will now run Root to produce pngs from the output
 histogram file  for display on the webpage. This was previously done after
 downloading from the grid.

Former-commit-id: 0eba0f588b72764e777e257fbd8d3b92f50a9619
---
 .../test/test_InDetPerformanceRTT_Ele100IDPRTT.sh           | 6 ++++--
 .../test/test_InDetPerformanceRTT_Ele1IDPRTT.sh             | 4 ++++
 .../test/test_InDetPerformanceRTT_MinBiasIDPRTT.sh          | 4 ++++
 .../test/test_InDetPerformanceRTT_Mu100IDPRTT.sh            | 5 +++++
 .../test/test_InDetPerformanceRTT_Pi100IDPRTT.sh            | 4 ++++
 .../test/test_InDetPerformanceRTT_Pi1IDPRTT.sh              | 4 ++++
 .../test/test_InDetPerformanceRTT_ZtomumuIDPRTT.sh          | 4 ++++
 .../test/test_InDetPerformanceRTT_ZtomumuPileupIDPRTT.sh    | 4 ++++
 .../test/test_InDetPerformanceRTT_mu1GeV.sh                 | 5 ++++-
 .../test/test_InDetPerformanceRTT_ttbar.sh                  | 4 ++++
 10 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele100IDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele100IDPRTT.sh
index 0ab0015bfe6..8f79c32f6d7 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele100IDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele100IDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml 
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -27,5 +28,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
-
-
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele1IDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele1IDPRTT.sh
index 768c2455faf..53a33fdd7ad 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele1IDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Ele1IDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -26,3 +27,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_MinBiasIDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_MinBiasIDPRTT.sh
index 3c6021bd1a3..d08160d0a7f 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_MinBiasIDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_MinBiasIDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -27,3 +28,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Mu100IDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Mu100IDPRTT.sh
index 9f6d0e350f6..e70619c2b88 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Mu100IDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Mu100IDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -27,3 +28,7 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
+
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi100IDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi100IDPRTT.sh
index c9be97010da..6e9e30f1d89 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi100IDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi100IDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -28,3 +29,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi1IDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi1IDPRTT.sh
index f82b39e2c82..35b7c5d0e6c 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi1IDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_Pi1IDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -28,3 +29,6 @@ bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStanda
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube "Pi1" "InDetStandardPlots-SinglePi1000.root"
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuIDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuIDPRTT.sh
index 54603f81dd8..9dabb109e46 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuIDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuIDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -27,3 +28,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuPileupIDPRTT.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuPileupIDPRTT.sh
index 7c14af3db12..7ade0d78cce 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuPileupIDPRTT.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ZtomumuPileupIDPRTT.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -27,3 +28,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_mu1GeV.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_mu1GeV.sh
index 347327d65cc..d252506cc9f 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_mu1GeV.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_mu1GeV.sh
@@ -8,7 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
-
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -28,3 +28,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ttbar.sh b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ttbar.sh
index aaa35f73a33..993fcae9f74 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ttbar.sh
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/test/test_InDetPerformanceRTT_ttbar.sh
@@ -8,6 +8,7 @@
 # art-output: *.root
 # art-output: *.xml
 # art-output: dcube
+# art-output: *.png
 
 fileList="['${ArtInFile//,/', '}']"
 echo "List of files = ", $fileList
@@ -26,3 +27,6 @@ dcubeRef="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/
 bash /cvmfs/atlas.cern.ch/repo/sw/art/dcube/bin/art-dcube $dcubeName InDetStandardPlots.root $dcubeXml $dcubeRef
 echo  "art-result: $? plot"
 
+plotmacro="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/InDetPerformanceRTT/scripts/makeplots.C"
+root -b -q $plotmacro
+echo "art-result: $? root"
-- 
GitLab