LabTools3 1.1.3.17__tar.gz → 1.1.3.18__tar.gz

{labtools3-1.1.3.17 → labtools3-1.1.3.18}/LT/box.py

@@ -915,7 +915,60 @@ class histo:
         print('Chi sq./DoF = ', self.F.chi2_red)
         print('----------------------------------------------------------------------')
         self.calc_fit_plot()
+        
+        
+    def plot_guess(self, xmin = None, xmax = None):
+        """
+        Plot the fit function with the guessed parameters 
 
+        Keyword arguments are:
+
+        ============   =====================================================
+        Keyword        Meaning
+        ============   =====================================================
+        xmin           lower fit limit
+        xmax           upper fit limit
+
+        """
+        # is there a range given, or is a window set
+        sel_all = np.ones_like(self.bin_center, dtype = 'bool')
+        if (xmin is None) and (xmax is None):
+            # check if a window is set
+            if self.window_set:
+                # if so use the set window limits
+                sel = (self.win_min <= self.bin_center) & (self.bin_center <= self.win_max)
+                self.fit_indx, = np.where ( sel )
+            else:
+                # if not use all data
+                self.fit_indx, = np.where(sel_all)
+        elif (xmin is None):
+            sel = (self.bin_center <= xmax)
+            if self.window_set:
+                # if so check which is smaller
+                sel_w = (self.bin_center <= self.win_max) & sel
+                self.fit_indx, = np.where(sel_w)
+            else:
+                self.fit_indx, = np.where(sel)
+        elif (xmax is None):
+            sel = (xmin <= self.bin_center)
+            if self.window_set:
+                # if so check which is larger
+                sel_w = (self.win_min <= self.bin_center) & sel
+                self.fit_indx, = np.where(sel_w)
+            else:
+                self.fit_indx, = np.where(sel)
+        else:
+            sel = (xmin <= self.bin_center) & ( self.bin_center <= xmax)
+            if self.window_set:
+                # if so check the set window limits
+                sel_w = (self.win_min <= self.bin_center) & ( self.bin_center <= self.win_max) & sel
+                # use the tighter limits
+                self.fit_indx, = np.where(sel_w)
+            else:
+                self.fit_indx, = np.where(sel)        
+        self.calc_fit_plot()
+        self.plot_fit()
+        
     def fit_view(self, init = True):
         """
 

{labtools3-1.1.3.17 → labtools3-1.1.3.18/LabTools3.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LabTools3
-Version: 1.1.3.17
+Version: 1.1.3.18
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -56,3 +56,5 @@ Version 1.1.3.15: contination lines enabled in parameter file by endine line wit
 Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relative step size using the diff_step keyword. It is also possible to supply a list of functions to calculate the parameter derivatives. This helps with numerical accuracy in the minimization process (see gen_fit documentation) 
 
 Version 1.1.3.17: Histogram window settings are now also saved to data file. Replace equal sign with colon in histogram title in get_spectrum. 
+
+Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot fit functions with guessed parameters. 

{labtools3-1.1.3.17/LabTools3.egg-info → labtools3-1.1.3.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: LabTools3
-Version: 1.1.3.17
+Version: 1.1.3.18
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -56,3 +56,5 @@ Version 1.1.3.15: contination lines enabled in parameter file by endine line wit
 Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relative step size using the diff_step keyword. It is also possible to supply a list of functions to calculate the parameter derivatives. This helps with numerical accuracy in the minimization process (see gen_fit documentation) 
 
 Version 1.1.3.17: Histogram window settings are now also saved to data file. Replace equal sign with colon in histogram title in get_spectrum. 
+
+Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot fit functions with guessed parameters. 

{labtools3-1.1.3.17 → labtools3-1.1.3.18}/README.md

@@ -41,4 +41,6 @@ Version 1.1.3.15: contination lines enabled in parameter file by endine line wit
 
 Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relative step size using the diff_step keyword. It is also possible to supply a list of functions to calculate the parameter derivatives. This helps with numerical accuracy in the minimization process (see gen_fit documentation) 
 
-Version 1.1.3.17: Histogram window settings are now also saved to data file. Replace equal sign with colon in histogram title in get_spectrum. 
+Version 1.1.3.17: Histogram window settings are now also saved to data file. Replace equal sign with colon in histogram title in get_spectrum. 
+
+Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot fit functions with guessed parameters. 

{labtools3-1.1.3.17 → labtools3-1.1.3.18}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name = "LabTools3",
-    version = "1.1.3.17",
+    version = "1.1.3.18",
     packages = find_packages(),
     # add additional files
     package_data = {'':['*.bat','*.command']},