Changeset e090ba90 in sasview for src/sas/sascalc/calculator

Timestamp:

Oct 11, 2018 11:59:57 AM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1249

Children:

88d2e70

Parents:

67ed543

Message:

remove errors and warnings from py37 tests of sascalc

Location:

src/sas/sascalc/calculator

Files:

• instrument.py (modified) (1 diff)
• resolution_calculator.py (modified) (2 diffs)

src/sas/sascalc/calculator/instrument.py

@@ -128 +128 @@
             self.size = 0
         else:
-            self.size = size
+            # TODO: Make sure detector size is number of pixels
+            # Could be detector dimensions in e.g., mm, but
+            # the resolution calculator assumes it is pixels.
+            # Being pixels, it has to be integers rather than float
+            self.size = [int(s) for s in size]
             validate(size[0])
 

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1007 +1007 @@
         try:
             detector_offset = self.sample2detector_distance[1]
-        except:
-            logger.error(sys.exc_value)
+        except Exception as exc:
+            logger.error(exc)
 
         # detector size in [no of pix_x,no of pix_y]
@@ -1094 +1094 @@
             output.qx_data = qx_value
             output.qy_data = qy_value
-        except:
-            logger.error(sys.exc_value)
+        except Exception as exc:
+            logger.error(exc)
 
         return output