LabTools3 1.1.3.20__tar.gz → 1.1.3.22__tar.gz

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

@@ -1571,6 +1571,7 @@ class histo2d:
 
         """
         nz = self.bin_content>0.
+        # nz = self.bin_content!=0.
         self.logz = logz
         self.zmin = self.bin_content[nz].min()
         colormap_l = copy.copy(colormap)
@@ -1957,6 +1958,7 @@ class histo2d:
             return (np.searchsorted(bins, x) - 1 )
 
     def __add__(self, v):
+        #print('__add__', v)
         # add 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
@@ -1979,6 +1981,7 @@ class histo2d:
             return None
 
     def __sub__(self, v):
+        #print('__sub__', v)
         # subtract 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
@@ -2001,12 +2004,13 @@ class histo2d:
             return None
 
     def __mul__(self, v):
+        #print('__mul__', v)
         # histogram multiply from left
         if np.isscalar(v):
-            res0 = v*self.res[0]
+            res0 = v*self.bin_content
             err = v*self.bin_error
             res1 = np.copy(self.res[1])
-            res2 = np.copy(self.res[1])
+            res2 = np.copy(self.res[2])
             res = ([res0, res1, res2 ])
             return histo2d(histogram = res, bin_error = err)
         elif np.array_equal(self.bin_content.shape, v.bin_content.shape):
@@ -2024,13 +2028,14 @@ class histo2d:
             return None
 
     def __truediv__(self, v):
+        #print('__truediv__', v)
         # divide 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
-            res0 = self.res[0]/v
+            res0 = self.bin_content/v
             err = self.bin_error/v
             res1 = np.copy(self.res[1])
-            res2 = np.copy(self.res[1])
+            res2 = np.copy(self.res[2])
             res = ([res0, res1, res2 ])
             return histo2d(histogram = res, bin_error = err)
         elif np.array_equal(self.bin_content.shape, v.bin_content.shape):
@@ -2050,6 +2055,7 @@ class histo2d:
 
 
     def __radd__(self, v):
+        #print('__radd__', v)
         # add 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
@@ -2072,10 +2078,11 @@ class histo2d:
             return None
 
     def __rsub__(self, v):
+        #print('__rsub__', v)
         # subtract 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
-            res0 = self.bin_content - v
+            res0 = v - self.bin_content
             err = self.bin_error
             res1 = np.copy(self.res[1])
             res2 = np.copy(self.res[2])
@@ -2083,7 +2090,7 @@ class histo2d:
             return histo2d(histogram = res, bin_error = err)
         elif np.array_equal(self.bin_content.shape, v.bin_content.shape):
             # this is the content
-            res0 = self.bin_content - v.bin_content
+            res0 = v.bin_content - self.bin_content 
             err = np.sqrt( self.bin_error**2 + v.bin_error**2)
             res1 = np.copy(v.res[1])
             res2 = np.copy(v.res[2])
@@ -2094,12 +2101,13 @@ class histo2d:
             return None
 
     def __rmul__(self, v):
+        #print('__rmul__', v)
         # histogram multiply from left
         if np.isscalar(v):
-            res0 = v*self.res[0]
+            res0 = v*self.bin_content
             err = v*self.bin_error
             res1 = np.copy(self.res[1])
-            res2 = np.copy(self.res[1])
+            res2 = np.copy(self.res[2])
             res = ([res0, res1, res2 ])
             return histo2d(histogram = res, bin_error = err)
         elif np.array_equal(self.bin_content.shape, v.bin_content.shape):
@@ -2118,13 +2126,14 @@ class histo2d:
 
 
     def __rtruediv__(self, v):
+        #print('_rtuediv__', v)
         # divide 2 histograms and take care of the errors
         # check the shapes
         if np.isscalar(v):
-            res0 = v/self.res[0]
-            err = v/self.res[0]**2*self.bin_error
+            res0 = v/self.bin_content
+            err = v/self.bin_content**2*self.bin_error
             res1 = np.copy(self.res[1])
-            res2 = np.copy(self.res[1])
+            res2 = np.copy(self.res[2])
             res = ([res0, res1, res2 ])
             return histo2d(histogram = res, bin_error = err)
         elif np.array_equal(self.bin_content.shape, v.bin_content.shape):

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

@@ -333,11 +333,11 @@ class dfile:
             # now try to convert according to the format
             try:
                 if fc == 'f':
-                    f.append(float(k)) # create a float
+                    f.append(float(eval(k))) # create a float
                 if fc == 'i':
-                    f.append(int(k))   # create an integer
+                    f.append(int(eval(k)))   # create an integer
                 if fc == 's':
-                    f.append(k)        # leave as string
+                    f.append(eval(k))        # leave as string
             except:
                 f.append(k) # if not possible leave it,
                 # but make a comment

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabTools3
-Version: 1.1.3.20
+Version: 1.1.3.22
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -72,4 +72,8 @@ Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot
 
 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.
+Version 1.1.3.20: Added show_header to datafile and the full_precision key word to write_csv.
+
+Version 1.1.3.21: Fixed bug in histo2d operations
+
+Version 1.1.3.22: Updated datafile to be able to read new nunmpy output of numbers with types

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LabTools3
-Version: 1.1.3.20
+Version: 1.1.3.22
 Summary: Python 3 Package of modules for typical analysis tasks analyzing physics data
 Home-page: http://wanda.fiu.edu/LabTools3
 Author: Werner Boeglin
@@ -72,4 +72,8 @@ Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot
 
 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.
+Version 1.1.3.20: Added show_header to datafile and the full_precision key word to write_csv.
+
+Version 1.1.3.21: Fixed bug in histo2d operations
+
+Version 1.1.3.22: Updated datafile to be able to read new nunmpy output of numbers with types

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

@@ -47,4 +47,8 @@ Version 1.1.3.18: Added plot_guess function to histo. This makes it easy to plot
 
 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.
+Version 1.1.3.20: Added show_header to datafile and the full_precision key word to write_csv.
+
+Version 1.1.3.21: Fixed bug in histo2d operations
+
+Version 1.1.3.22: Updated datafile to be able to read new nunmpy output of numbers with types

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

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