LabTools3 1.1.3.18__tar.gz → 1.1.3.20__tar.gz

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

@@ -368,7 +368,7 @@ class histo:
                 # histogram with weights squared
                 kwargs1 = copy.copy(kwargs)
                 kwargs1['weights'] = w2
-                w2 = np.histogram(y, **kwargs1)[0] # save only the bin content
+                w2 = np.histogram(y, bins = self.res[1], **kwargs1)[0] # save only the bin content
             # add the new bin content to the old one
             self.res = (self.res[0] + res[0], self.res[1])
             if self.calc_w2 and self.has_weights:
@@ -928,6 +928,7 @@ class histo:
         ============   =====================================================
         xmin           lower fit limit
         xmax           upper fit limit
+        ============   =====================================================
 
         """
         # is there a range given, or is a window set

{labtools3-1.1.3.18 → labtools3-1.1.3.20}/LT/datafile.py

@@ -88,7 +88,7 @@ except:
     numpy_ok = False
 
 # function to create a dictionary from 2 lists: key, values
-format_dict = {'i':'{:d}', 'f':'{:f}', 's':'{:s}'}
+format_dict = {'i':'{:d}', 'f':'{:f}', 's':'{:s}', 'g':'{:.12g}'}
 # create a dictionary from  an array of keys and values
 #----------------------------------------------------------------------
 def find_duplicates(array):
@@ -466,6 +466,27 @@ class dfile:
         """
         return self.adata[:self.headindex+1]
 
+    def show_header(self, show_all = True):
+        """
+        Show the header information of the data file
+
+        Parameters
+        ----------
+        show_all : Bool, optional
+            Show all comments in the header otherwise only the headerline. The default is True.
+
+        Returns
+        -------
+        None.
+
+        """
+        if show_all:
+            for ll in self.get_full_header():
+                print(ll)
+        else:
+            print(self.get_header())
+        
+
     def show_data(self,keylist):
         """
 
@@ -917,9 +938,16 @@ class dfile:
             fmt += format_dict[self.formats[k]] + ', '
         return fmt.strip()[:-1]
 
-    def make_csv(self):
+    def make_csv(self, full_prec = False):
         keys = self.keys[:-1]
         csv = [ ''.join([k + ',' for k in keys]) ]
+        if full_prec:
+            for fk in self.formats.keys():
+                fmt = self.formats[fk]
+                if (fmt == 'i') or (fmt == 's'):
+                    pass
+                else:
+                    self.formats[fk] = 'g'    # set the general float format key    
         for l in self.data:
             fmt = self.make_fmt()
             data = [l[k] for k in keys]
@@ -927,16 +955,26 @@ class dfile:
             csv.append(ll)
         return csv
 
-    def write_csv(self, f):
+    def write_csv(self, f, full_precision = True):
         """
-        
+                
         save the current file as a csv file
         
-        f : file name  to be used
-        
+
+        Parameters
+        ----------
+        f : string
+            file name to be used.
+        full_precision : Bool, optional
+            use full precision g format for writing floats. The default is True.
+
+        Returns
+        -------
+        None.
+
         """
         o = open(f,'w')
-        csv = self.make_csv()
+        csv = self.make_csv(full_prec = full_precision)
         for l in csv:
             o.write(l + '\n')
         o.close()

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: LabTools3
-Version: 1.1.3.18
+Version: 1.1.3.20
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -11,6 +11,17 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # LabTools3
 Set of Python analysis tools for physics labs. It contains the "package" directory which is the Python package with a setup.py script for installation and
@@ -58,3 +69,7 @@ Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relati
 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. 
+
+Version 1.1.3.19: Fixed but when using using the fill function in 1d histograms with weights multiple times.
+
+Version 1.1.3.20: Added show_header to datafile and teh full_precision key word to write_csv.

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: LabTools3
-Version: 1.1.3.18
+Version: 1.1.3.20
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -11,6 +11,17 @@ Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # LabTools3
 Set of Python analysis tools for physics labs. It contains the "package" directory which is the Python package with a setup.py script for installation and
@@ -58,3 +69,7 @@ Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relati
 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. 
+
+Version 1.1.3.19: Fixed but when using using the fill function in 1d histograms with weights multiple times.
+
+Version 1.1.3.20: Added show_header to datafile and teh full_precision key word to write_csv.

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

@@ -43,4 +43,8 @@ Version 1.1.3.16: Corrected bug in histo.rebin. gen_fit allows control of relati
 
 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. 
+Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot fit functions with guessed parameters. 
+
+Version 1.1.3.19: Fixed but when using using the fill function in 1d histograms with weights multiple times.
+
+Version 1.1.3.20: Added show_header to datafile and teh full_precision key word to write_csv.

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

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