Changeset 19637b1 in sasview for calculator

Timestamp:

Jan 20, 2011 9:34:56 AM (14 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

943cacb

Parents:

c91c29e

Message:

fixed a small bug and removed unnecessary raise

Location:

calculator

Files:

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

calculator/instrument.py

@@ -305 +305 @@
     try:
         val = float(value)
-        if val > 0:
+        if val >= 0:
             val = True
         else:
@@ -311 +311 @@
     except:
         val = False
-    if not val:
-        raise ValueError, "Got improper value..."
+    #if not val:
+    #    raise ValueError, "Got improper value..."

calculator/resolution_calculator.py

@@ -387 +387 @@
         if switch.lower() == 'off':
             return 0
+        if self.mass == 0.0:
+            return 0
         # check the singular point
         if d_distance == 0 or comp == 'x':
@@ -851 +853 @@
         :return delta y: the beam center drop in cm
         """
+        # Check if mass == 0 (X-ray). 
+        if self.mass == 0:
+            return 0
         # Covert unit from A to cm
         unit_cm = 1e-08