[yoda-svn] r574 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Fri Mar  8 17:25:00 2013
New Revision: 574

Log:
Making the x2y converter scripts write a copy into the *current* directory if only the input is specified.

Modified:
   trunk/ChangeLog
   trunk/bin/aida2flat
   trunk/bin/aida2yoda
   trunk/bin/yoda2aida
   trunk/bin/yoda2flat

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Fri Mar  8 17:18:55 2013	(r573)
+++ trunk/ChangeLog	Fri Mar  8 17:25:00 2013	(r574)
@@ -1,3 +1,8 @@
+2013-03-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Making the x2y converter scripts write a copy into the *current*
+	directory if only the input is specified.
+
 2013-03-05  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Removing Plot entirely from YODA: it was an anomaly only added

Modified: trunk/bin/aida2flat
==============================================================================
--- trunk/bin/aida2flat	Fri Mar  8 17:18:55 2013	(r573)
+++ trunk/bin/aida2flat	Fri Mar  8 17:25:00 2013	(r574)
@@ -6,7 +6,7 @@
 Convert an AIDA data file to a 'flat', human-readable data format.
 """
 
-import yoda, sys, optparse
+import yoda, os, sys, optparse
 
 parser = optparse.OptionParser(usage=__doc__)
 opts, args = parser.parse_args()
@@ -20,6 +20,7 @@
         OUTFILE = INFILE.replace(".aida", ".dat")
     else:
         OUTFILE = INFILE + ".dat"
+    OUTFILE = os.path.basename(OUTFILE)
 elif len(args) == 2:
     INFILE = args[0]
     OUTFILE = args[1]

Modified: trunk/bin/aida2yoda
==============================================================================
--- trunk/bin/aida2yoda	Fri Mar  8 17:18:55 2013	(r573)
+++ trunk/bin/aida2yoda	Fri Mar  8 17:25:00 2013	(r574)
@@ -6,7 +6,7 @@
 Convert an AIDA data file to the YODA data format.
 """
 
-import yoda, sys, optparse
+import yoda, os, sys, optparse
 
 parser = optparse.OptionParser(usage=__doc__)
 opts, args = parser.parse_args()
@@ -20,6 +20,7 @@
         OUTFILE = INFILE.replace(".aida", ".yoda")
     else:
         OUTFILE = INFILE + ".yoda"
+    OUTFILE = os.path.basename(OUTFILE)
 elif len(args) == 2:
     INFILE = args[0]
     OUTFILE = args[1]

Modified: trunk/bin/yoda2aida
==============================================================================
--- trunk/bin/yoda2aida	Fri Mar  8 17:18:55 2013	(r573)
+++ trunk/bin/yoda2aida	Fri Mar  8 17:25:00 2013	(r574)
@@ -6,7 +6,7 @@
 Convert a YODA data file to the old AIDA data format.
 """
 
-import yoda, sys, optparse
+import yoda, os, sys, optparse
 
 parser = optparse.OptionParser(usage=__doc__)
 opts, args = parser.parse_args()
@@ -20,6 +20,7 @@
         OUTFILE = INFILE.replace(".yoda", ".aida")
     else:
         OUTFILE = INFILE + ".aida"
+    OUTFILE = os.path.basename(OUTFILE)
 elif len(args) == 2:
     INFILE = args[0]
     OUTFILE = args[1]

Modified: trunk/bin/yoda2flat
==============================================================================
--- trunk/bin/yoda2flat	Fri Mar  8 17:18:55 2013	(r573)
+++ trunk/bin/yoda2flat	Fri Mar  8 17:25:00 2013	(r574)
@@ -6,7 +6,7 @@
 Convert a YODA data file to a 'flat', more human-readable data format.
 """
 
-import yoda, sys, optparse
+import yoda, os, sys, optparse
 
 parser = optparse.OptionParser(usage=__doc__)
 opts, args = parser.parse_args()
@@ -20,6 +20,7 @@
         OUTFILE = INFILE.replace(".yoda", ".dat")
     else:
         OUTFILE = INFILE + ".dat"
+    OUTFILE = os.path.basename(OUTFILE)
 elif len(args) == 2:
     INFILE = args[0]
     OUTFILE = args[1]