[Rivet-svn] r2100 - trunk/bin

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Thu Nov 26 12:23:32 GMT 2009


Author: fsiegert
Date: Thu Nov 26 12:23:32 2009
New Revision: 2100

Log:
Fix make-html such that it uses compare-histos --hier-out in first place, instead of moving the .dat files around later on.

Modified:
   trunk/bin/make-html

Modified: trunk/bin/make-html
==============================================================================
--- trunk/bin/make-html	Wed Nov 25 23:30:40 2009	(r2099)
+++ trunk/bin/make-html	Thu Nov 26 12:23:32 2009	(r2100)
@@ -69,6 +69,7 @@
 ## run compare-histos to get plain .dat files from .aida
 ch_cmd = ["compare-histos"]
 ch_cmd.append("--mc-errs")
+ch_cmd.append("--hier-out")
 ch_cmd.append("--plot-info-dir=../")
 if len(aidafiles)+len(reffiles)<2:
     ch_cmd.append("--show-ref-only")
@@ -82,13 +83,11 @@
 index.write('<html><head><title>%s</title></head><body>' % opts.OUTPUTDIR)
 for analysis in sorted(analyses):
     anapath = os.path.join(opts.OUTPUTDIR, analysis)
-    os.mkdir(anapath)
     anaindex = open(os.path.join(anapath, "index.html"), 'w')
     anaindex.write("<html><head><title>%s - %s</title></head><body>\n" % (opts.OUTPUTDIR, analysis))
     
-    datfiles = glob.glob("%s/%s_*.dat" % (opts.OUTPUTDIR, analysis))
+    datfiles = glob.glob("%s/*.dat" % anapath)
     for fulldatfile in sorted(datfiles):
-        shutil.move(fulldatfile, anapath)
         datfile = os.path.basename(fulldatfile)
 
         ## make-plots run for each .dat file


More information about the Rivet-svn mailing list