minor changes to #17

pymule/__init__.py

@@ -18,7 +18,8 @@ __all__ = [
     'addsets', 'scaleset',
     'errorband', 'kplot', 'watermark',
     'pi', 'alpha', 'GF', 'conv', 'Mmu', 'Mel', 'Mtau',
-    'importvegas', 'exportvegas', 'mulify', 'colours'
+    'importvegas', 'exportvegas', 'mulify', 'colours', 'printnumber',
+    'chisq'
 ]
 
 
@@ -29,7 +30,7 @@ from vegas import importvegas, exportvegas
 from errortools import mergenumbers, plusnumbers, dividenumbers, timesnumbers,\
                        mergeplots, addplots, divideplots, scaleplot,          \
                        combineplots, combineNplots,                           \
-                       integratehistogram, mergebins
+                       integratehistogram, mergebins, printnumber, chisq
 from loader import importreg, pattern, setup, sigma,                          \
                    mergeset, mergeseeds, mergefks,                            \
                    addsets, scaleset

pymule/errortools.py

 import numpy as np
 
 
+def chisq(values):
+    if type(values) == list:
+        values = np.array(values)
+    weight = sum(1 / values[:,1]**2)
+    value = sum(values[:,0] / values[:,1]**2 / weight)
+    chi = 1./len(values) * sum(
+        ((values[:,0]-value) / values[:,1])**2
+    )
+    return chi
+
+
 def mergenumbers(values, quiet=False):
     if type(values) == list:
         values = np.array(values)

pymule/plot.py

@@ -17,6 +17,7 @@ rc('text.latex', preamble="\n".join([
     '\\newcommand{\\D}{\\mathrm{d}}'
 ]))
 
+
 def setup_pgf():
     plt.rcParams.update({
         "pgf.texsystem": "pdflatex",