Changeset b8080e1 in sasview for src/sas/sascalc/calculator/resolution_calculator.py

Timestamp:

Aug 29, 2018 10:01:23 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

9463ca2

Parents:

ce30949

git-author:

Piotr Rozyczko <rozyczko@…> (08/29/18 09:59:56)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/29/18 10:01:23)

Message:

cherry picking sascalc changes from master SASVIEW-996
minor unit test fixes

File:

• src/sas/sascalc/calculator/resolution_calculator.py (modified) (3 diffs)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1007 +1007 @@
         try:
             detector_offset = self.sample2detector_distance[1]
-        except Exception as ex:
-            logger.error(ex)
+        except:
+            logger.error(sys.exc_value)
 
         # detector size in [no of pix_x,no of pix_y]
@@ -1057 +1057 @@
         # qx_value and qy_value values in array
         qx_value = qx_value.repeat(detector_pix_nums_y)
-        qx_value = qx_value.reshape(int(detector_pix_nums_x), int(detector_pix_nums_y))
+        qx_value = qx_value.reshape(detector_pix_nums_x, detector_pix_nums_y)
         qy_value = qy_value.repeat(detector_pix_nums_x)
-        qy_value = qy_value.reshape(int(detector_pix_nums_y), int(detector_pix_nums_x))
+        qy_value = qy_value.reshape(detector_pix_nums_y, detector_pix_nums_x)
         qy_value = qy_value.transpose()
 
@@ -1094 +1094 @@
             output.qx_data = qx_value
             output.qy_data = qy_value
-        except Exception as ex:
-            logger.error(ex)
+        except:
+            logger.error(sys.exc_value)
 
         return output