[Rivet-svn] r2558 - trunk/bin

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Mon Jul  5 19:06:29 2010
New Revision: 2558

Log:
Write output histograms to the proper directory,
and find Rivet reference data by default (even though
it's dead slow).

Modified:
   trunk/bin/rivet-rescale

Modified: trunk/bin/rivet-rescale
==============================================================================
--- trunk/bin/rivet-rescale	Mon Jul  5 16:58:55 2010	(r2557)
+++ trunk/bin/rivet-rescale	Mon Jul  5 19:06:29 2010	(r2558)
@@ -197,8 +197,6 @@
                       help="Specify a histogram and bin range that is to be kept. The format is `AIDAPATH:start:stop'.")
     parser.add_option("-r", "--refdir", dest="REFDIR", default=None,
                       help="File of folder with reference histos")
-    parser.add_option("-R", "--rivet-refs", dest="RIVET_REFS", action="store_true", default=False,
-                      help="Use Rivet ref path to search for reference histos")
     parser.add_option("-a", dest="AIDA", default=True, action="store_true",
                       help="Produce AIDA output rather than FLAT")
     parser.add_option("-f", dest="AIDA", default=True, action="store_false",
@@ -225,7 +223,7 @@
     refdirs = []
     if opts.REFDIR:
         refdirs.append(opts.REFDIR)
-    if opts.RIVET_REFS:
+    else:
         import rivet
         refdirs += rivet.getAnalysisRefPaths()
     refhistos = getRefHistos(refdirs)
@@ -250,7 +248,7 @@
         obslist = histos.keys()
 
     ## Create output filename
-    base = args[0].split("/")[-1].split(".aida")[0]
+    base = args[0].split(".aida")[0]
     if len(args) > 1:
         outfile = args[1]
     else: