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

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Thu Jan 31 19:11:39 2013
New Revision: 4118

Log:
Change make-plots default: The default y-range now spans almost 7 orders of magnitude, instead of only 4.

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

Modified: branches/2012-06-aidarivet/bin/make-plots
==============================================================================
--- branches/2012-06-aidarivet/bin/make-plots	Thu Jan 31 15:04:16 2013	(r4117)
+++ branches/2012-06-aidarivet/bin/make-plots	Thu Jan 31 19:11:39 2013	(r4118)
@@ -287,7 +287,7 @@
                     if len(foo)==0:
                         if self.ymax==0:
                             self.ymax=1
-                        foo.append(2e-4*self.ymax)
+                        foo.append(2e-7*self.ymax)
                     fullrange = opts.FULL_RANGE
                     if inputdata.description.has_key('FullRange'):
                         if inputdata.description['FullRange']=='1':
@@ -297,7 +297,7 @@
                     if fullrange:
                         self.ymin = min(foo)/1.7
                     else:
-                        self.ymin = max(min(foo)/1.7, 2e-4*self.ymax)
+                        self.ymin = max(min(foo)/1.7, 2e-7*self.ymax)
                 if self.ymin==self.ymax:
                     self.ymin-=1
                     self.ymax+=1
@@ -349,7 +349,7 @@
                     if len(foo)==0:
                         if self.zmax==0:
                             self.zmax=1
-                        foo.append(2e-4*self.zmax)
+                        foo.append(2e-7*self.zmax)
                     fullrange = opts.FULL_RANGE
                     if inputdata.description.has_key('FullRange'):
                         if inputdata.description['FullRange']=='1':
@@ -359,7 +359,7 @@
                     if fullrange:
                         self.zmin = min(foo)/1.7
                     else:
-                        self.zmin = max(min(foo)/1.7, 2e-4*self.zmax)
+                        self.zmin = max(min(foo)/1.7, 2e-7*self.zmax)
                 if self.zmin==self.zmax:
                     self.zmin-=1
                     self.zmax+=1

Modified: branches/2012-06-aidarivet/bin/rivet-mkhtml
==============================================================================
--- branches/2012-06-aidarivet/bin/rivet-mkhtml	Thu Jan 31 15:04:16 2013	(r4117)
+++ branches/2012-06-aidarivet/bin/rivet-mkhtml	Thu Jan 31 19:11:39 2013	(r4118)
@@ -331,7 +331,6 @@
     mp_cmd.append("--times")
 elif opts.OUTPUT_FONT == "minion":
     mp_cmd.append("--minion")
-mp_cmd.append("--full-range")
 datfiles = []
 for analysis in analyses:
     anapath = os.path.join(opts.OUTPUTDIR, analysis)

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Thu Jan 31 15:04:16 2013	(r4117)
+++ trunk/bin/make-plots	Thu Jan 31 19:11:39 2013	(r4118)
@@ -287,7 +287,7 @@
                     if len(foo)==0:
                         if self.ymax==0:
                             self.ymax=1
-                        foo.append(2e-4*self.ymax)
+                        foo.append(2e-7*self.ymax)
                     fullrange = opts.FULL_RANGE
                     if inputdata.description.has_key('FullRange'):
                         if inputdata.description['FullRange']=='1':
@@ -297,7 +297,7 @@
                     if fullrange:
                         self.ymin = min(foo)/1.7
                     else:
-                        self.ymin = max(min(foo)/1.7, 2e-4*self.ymax)
+                        self.ymin = max(min(foo)/1.7, 2e-7*self.ymax)
                 if self.ymin==self.ymax:
                     self.ymin-=1
                     self.ymax+=1
@@ -349,7 +349,7 @@
                     if len(foo)==0:
                         if self.zmax==0:
                             self.zmax=1
-                        foo.append(2e-4*self.zmax)
+                        foo.append(2e-7*self.zmax)
                     fullrange = opts.FULL_RANGE
                     if inputdata.description.has_key('FullRange'):
                         if inputdata.description['FullRange']=='1':
@@ -359,7 +359,7 @@
                     if fullrange:
                         self.zmin = min(foo)/1.7
                     else:
-                        self.zmin = max(min(foo)/1.7, 2e-4*self.zmax)
+                        self.zmin = max(min(foo)/1.7, 2e-7*self.zmax)
                 if self.zmin==self.zmax:
                     self.zmin-=1
                     self.zmax+=1

Modified: trunk/bin/rivet-mkhtml
==============================================================================
--- trunk/bin/rivet-mkhtml	Thu Jan 31 15:04:16 2013	(r4117)
+++ trunk/bin/rivet-mkhtml	Thu Jan 31 19:11:39 2013	(r4118)
@@ -295,12 +295,14 @@
         obsname = os.path.basename(datfile).replace(".dat", "")
         pngfile = obsname+".png"
         vecfile = obsname+"."+opts.VECTORFORMAT.lower()
+        srcfile = obsname+".dat"
         if opts.SINGLE:
             pngfile = os.path.join(analysis, pngfile)
             vecfile = os.path.join(analysis, vecfile)
+            srcfile = os.path.join(analysis, srcfile)
 
         anaindex.write('  <div style="float:left; font-size:smaller; font-weight:bold;">\n')
-        anaindex.write('    <a href="#%s-%s">⚓</a> %s:<br>\n' % (analysis, obsname, vecfile) )
+        anaindex.write('    <a href="#%s-%s">⚓</a><a href="%s">&#8984</a> %s:<br>\n' % (analysis, obsname, srcfile, vecfile) )
         anaindex.write('    <a name="%s-%s"><a href="%s">\n' % (analysis, obsname, vecfile) )
         anaindex.write('      <img src="%s">\n' % pngfile )
         anaindex.write('    </a></a>\n')
@@ -329,7 +331,6 @@
     mp_cmd.append("--times")
 elif opts.OUTPUT_FONT == "minion":
     mp_cmd.append("--minion")
-mp_cmd.append("--full-range")
 datfiles = []
 for analysis in analyses:
     anapath = os.path.join(opts.OUTPUTDIR, analysis)