before merge

dominikmuller · Jun 6, 2014 · 9e5d490 · 9e5d490
1 parent 5a91fff
commit 9e5d490
Show file tree

Hide file tree

Showing 8 changed files with 19,610 additions and 12,241 deletions.
diff --git a/probfit/_libstat.c b/probfit/_libstat.c
diff --git a/probfit/costfunc.c b/probfit/costfunc.c
diff --git a/probfit/costfunc.pyx b/probfit/costfunc.pyx
@@ -216,7 +216,7 @@ cdef class UnbinnedLH:
 
     def draw(self, minuit=None, bins=100, ax=None, bound=None,
              parmloc=(0.05,0.95), nfbins=200, print_par=True, args=None,
-             errors=None, parts=False, show_errbars='normal'):
+             errors=None, parts=False, show_errbars='normal', no_plot=False):
         """
         Draw comparison between histogram of data and pdf.
 
@@ -257,6 +257,8 @@ cdef class UnbinnedLH:
                 * 'normal' : error = sqrt( sum of weight )
                 * 'sumw2'  : error = sqrt( sum of weight**2 )
                 * None : no errorbars (shown as a step histogram)
+
+            - **no_plot** Set this to True if you only want the return value
         
         **Returns**
         
@@ -265,7 +267,8 @@ cdef class UnbinnedLH:
         """
         return plotting.draw_ulh(self, minuit=minuit, bins=bins, ax=ax,
             bound=bound, parmloc=parmloc, nfbins=nfbins, print_par=print_par,
-            args=args, errors=errors, parts=parts, show_errbars=show_errbars)
+            args=args, errors=errors, parts=parts, show_errbars=show_errbars,
+            no_plot=no_plot)
 
     def draw_residual(self, minuit=None, bins=100, ax=None, bound=None,
                       parmloc=(0.05,0.95), print_par=False, args=None, errors=None,
@@ -505,7 +508,7 @@ cdef class BinnedLH:
 
     def draw(self, minuit=None, ax = None,
             parmloc=(0.05,0.95), nfbins=200, print_par=True,
-            args=None, errors=None, parts=False):
+            args=None, errors=None, parts=False, no_plot=False):
         """
         Draw comparison between histogram of data and pdf.
 
@@ -528,14 +531,16 @@ cdef class BinnedLH:
             - **print_par** print parameters and error on the plot.
               Default True.
 
+            - **no_plot** Set this to True if you only want the return value
+
         **Returns**
         
         ((data_edges, data_y), (errorp,errorm), (total_pdf_x, total_pdf_y), parts)
 
         """
         return plotting.draw_blh(self, minuit=minuit,
             ax=ax, parmloc=parmloc, nfbins=nfbins, print_par=print_par,
-            args=args, errors=errors, parts=parts)
+            args=args, errors=errors, parts=parts, no_plot=no_plot)
 
     def draw_residual(self, minuit=None, ax = None, parmloc=(0.05,0.95), 
                       print_par=False, args=None, errors=None, norm=False):
@@ -646,7 +651,7 @@ cdef class Chi2Regression:
 
 
     def draw(self, minuit=None, ax=None, parmloc=(0.05,0.95), print_par=True,
-             args=None, errors=None, parts=False):
+             args=None, errors=None, parts=False, no_plot=False):
         """
         Draw comparison between points (**x**,**y**) and the function **f**.
 
@@ -669,12 +674,15 @@ cdef class Chi2Regression:
 
             - **parts** draw components of PDF. Default False.
 
+            - **no_plot** Set this to true if you only want the return value
+
         **Returns**
         
         ((data_x, data_y), (errorp,errorm), (total_pdf_x, total_pdf_y), parts)
         """
         return plotting.draw_x2(self, minuit=minuit, ax=ax, parmloc=parmloc,
-                print_par=print_par, args=args, errors=errors, parts=parts)
+                print_par=print_par, args=args, errors=errors, parts=parts,
+                no_plot=no_plot)
 
 
     def show(self,*arg, **kwd):
@@ -794,7 +802,7 @@ cdef class BinnedChi2:
 
 
     def draw(self, minuit=None, ax = None, parmloc=(0.05,0.95), nfbins=200,
-             print_par=True, args=None, errors=None, parts=False):
+             print_par=True, args=None, errors=None, parts=False, no_plot=False):
         """
         Draw comparison histogram of data and the function **f**.
 
@@ -817,13 +825,15 @@ cdef class BinnedChi2:
             - **print_par** print parameters and error on the plot.
               Default True.
 
+            - **no_plot** Set this to true if you only want the return value
+
         **Returns**
         
         ((data_edges, data_y), (errorp,errorm), (total_pdf_x, total_pdf_y), parts)
         """
         return plotting.draw_bx2(self, minuit=minuit, ax=ax,
             parmloc=parmloc, nfbins=nfbins, print_par=print_par,
-            args=args, errors=errors, parts=parts)
+            args=args, errors=errors, parts=parts, no_plot=no_plot)
 
 
     def default_errordef(self):