31.3 xi in #17: added merging function and fit

pymule/__init__.py

@@ -11,7 +11,7 @@ __all__ = [
     'combineplots', 'combineNplots',
     'integratehistogram', 'mergebins',
     'importreg', 'pattern', 'setup', 'sigma',
-    'mergeset', 'mergeseeds', 'mergefks',
+    'mergeset', 'mergeseeds', 'mergefks', 'mergefkswithplot',
     'addsets', 'scaleset',
     'errorband', 'kplot', 'watermark',
     'pi', 'alpha', 'GF', 'conv', 'Mmu', 'Mel', 'Mtau',
@@ -30,6 +30,7 @@ from errortools import mergenumbers, plusnumbers, dividenumbers, timesnumbers,\
 from loader import importreg, pattern, setup, sigma,                          \
                    mergeset, mergeseeds, mergefks,                            \
                    addsets, scaleset
+from xicut import mergefkswithplot
 
 from plot import errorband, kplot, watermark
 from mule import mulify

pymule/xicut.py

+from loader import multiintersect, addsets, mergeset
 from scipy import optimize
 import scipy.stats
 import numpy as np
+from errortools import *
 
 
 def myfit(data, n):
@@ -41,3 +43,33 @@ def get_errorbands(x, coeff, covar, cf=0.9):
         centre = sum(xvec * coeff)
 
         return np.array([x, centre, centre+delta, centre-delta])
+
+
+def addkeyedsets(sets):
+    paras = multiintersect([i.keys() for i in sets])
+    return {
+        para: addsets([i[para] for i in sets])
+        for para in paras
+    }
+
+
+def mergefkswithplot(sets):
+    n = len(sets)
+    psets = [addkeyedsets(i) for i in sets]
+    ans = mergeset(addkeyedsets(psets).values())
+
+    totcoeff = np.zeros(n)
+    totcovar = np.zeros((n,n))
+    pvalues = []
+    for pset, ind in zip(psets, range(1,1+len(psets))):
+        values = np.array([
+            np.insert(pset[xi]['value'], 0, xi[0])
+            for xi in pset.keys()
+        ])
+        pvalues.append(values)
+
+        coeff, covar = myfit(values, n-1)
+        totcoeff += coeff
+        totcovar += covar
+
+    return ans