Changeset fbfc488 in sasview for src/sas/sascalc

Timestamp:

Nov 9, 2017 8:43:55 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

d6b8a1d

Parents:

7969b9c

git-author:

Piotr Rozyczko <rozyczko@…> (11/03/17 10:58:39)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 08:43:55)

Message:

More Qt5 related fixes.

File:

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

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 ex:
+            logger.error(ex)
 
         # 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(detector_pix_nums_x, detector_pix_nums_y)
+        qx_value = qx_value.reshape(int(detector_pix_nums_x), int(detector_pix_nums_y))
         qy_value = qy_value.repeat(detector_pix_nums_x)
-        qy_value = qy_value.reshape(detector_pix_nums_y, detector_pix_nums_x)
+        qy_value = qy_value.reshape(int(detector_pix_nums_y), int(detector_pix_nums_x))
         qy_value = qy_value.transpose()