[Rivet-svn] r4044 - branches/2012-06-aidarivet branches/2012-06-aidarivet/bin trunk trunk/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Nov 27 11:18:43 2012
New Revision: 4044

Log:
Fix make-plots png generation on SL5

Modified:
   branches/2012-06-aidarivet/ChangeLog
   branches/2012-06-aidarivet/bin/make-plots
   trunk/ChangeLog
   trunk/bin/make-plots

Modified: branches/2012-06-aidarivet/ChangeLog
==============================================================================
--- branches/2012-06-aidarivet/ChangeLog	Sat Nov 24 19:42:24 2012	(r4043)
+++ branches/2012-06-aidarivet/ChangeLog	Tue Nov 27 11:18:43 2012	(r4044)
@@ -1,3 +1,7 @@
+2012-11-27  Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+	* Fix make-plots png creation for SL5
+
 2012-11-17  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Adding MC_PHOTONS by Steve Lloyd and AB, for testing general

Modified: branches/2012-06-aidarivet/bin/make-plots
==============================================================================
--- branches/2012-06-aidarivet/bin/make-plots	Sat Nov 24 19:42:24 2012	(r4043)
+++ branches/2012-06-aidarivet/bin/make-plots	Tue Nov 27 11:18:43 2012	(r4044)
@@ -2115,7 +2115,7 @@
             dvcmd.append("-f")
             logging.debug(" ".join(dvcmd))
             dvproc = subprocess.Popen(dvcmd, stdout=subprocess.PIPE, cwd=tempdir)
-            pngcmd = ["convert", "-density", "200", "-flatten", "-", "%s.png" % filename]
+            pngcmd = ["convert", "-density", "200", "-", "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdin=dvproc.stdout, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()
@@ -2129,7 +2129,7 @@
             if testconvert.wait() != 0:
                 convertavailable = False
             if convertavailable:
-                pngcmd = ["convert", "-density", "85", "-flatten", "%s.ps" % filename, "%s.png" % filename]
+                pngcmd = ["convert", "-density", "85", "%s.ps" % filename, "%s.png" % filename]
                 logging.debug(" ".join(pngcmd))
                 pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
                 pngproc.wait()
@@ -2147,7 +2147,7 @@
             f.write(cnvproc.communicate()[0])
             f.close()
             logging.debug(os.listdir(tempdir))
-            pngcmd = ["convert", "-density", "85", "-flatten", "%s.pdf" % filename, "%s.png" % filename]
+            pngcmd = ["convert", "-density", "85", "%s.pdf" % filename, "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()
@@ -2159,7 +2159,7 @@
             f = open(os.path.join(tempdir, "%s.eps" % filename), "w")
             f.write(cnvproc.communicate()[0])
             f.close()
-            pngcmd = ["convert", "-density", "85", "-flatten", "%s.eps" % filename, "%s.png" % filename]
+            pngcmd = ["convert", "-density", "85", "%s.eps" % filename, "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Sat Nov 24 19:42:24 2012	(r4043)
+++ trunk/ChangeLog	Tue Nov 27 11:18:43 2012	(r4044)
@@ -1,3 +1,7 @@
+2012-11-27  Hendrik Hoeth <hendrik.hoeth at cern.ch>
+
+	* Fix make-plots png creation for SL5
+
 2012-11-17  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Adding MC_PHOTONS by Steve Lloyd and AB, for testing general
@@ -18,8 +22,6 @@
 	* Converting the argument order of logspace, clarifying the
 	arguments, updating affected code, and removing Analysis::logBinEdges.
 
-	* Merging updates from the AIDA maintenance branch up to r3974
-
 	* Merging updates from the AIDA maintenance branch up to r4002
 	 (latest revision for next merges is r4009).
 

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Sat Nov 24 19:42:24 2012	(r4043)
+++ trunk/bin/make-plots	Tue Nov 27 11:18:43 2012	(r4044)
@@ -2115,7 +2115,7 @@
             dvcmd.append("-f")
             logging.debug(" ".join(dvcmd))
             dvproc = subprocess.Popen(dvcmd, stdout=subprocess.PIPE, cwd=tempdir)
-            pngcmd = ["convert", "-density", "200", "-flatten", "-", "%s.png" % filename]
+            pngcmd = ["convert", "-density", "200", "-", "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdin=dvproc.stdout, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()
@@ -2129,7 +2129,7 @@
             if testconvert.wait() != 0:
                 convertavailable = False
             if convertavailable:
-                pngcmd = ["convert", "-density", "85", "-flatten", "%s.ps" % filename, "%s.png" % filename]
+                pngcmd = ["convert", "-density", "85", "%s.ps" % filename, "%s.png" % filename]
                 logging.debug(" ".join(pngcmd))
                 pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
                 pngproc.wait()
@@ -2147,7 +2147,7 @@
             f.write(cnvproc.communicate()[0])
             f.close()
             logging.debug(os.listdir(tempdir))
-            pngcmd = ["convert", "-density", "85", "-flatten", "%s.pdf" % filename, "%s.png" % filename]
+            pngcmd = ["convert", "-density", "85", "%s.pdf" % filename, "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()
@@ -2159,7 +2159,7 @@
             f = open(os.path.join(tempdir, "%s.eps" % filename), "w")
             f.write(cnvproc.communicate()[0])
             f.close()
-            pngcmd = ["convert", "-density", "85", "-flatten", "%s.eps" % filename, "%s.png" % filename]
+            pngcmd = ["convert", "-density", "85", "%s.eps" % filename, "%s.png" % filename]
             logging.debug(" ".join(pngcmd))
             pngproc = subprocess.Popen(pngcmd, stdout=subprocess.PIPE, cwd=tempdir)
             pngproc.wait()