Merge branch 'master' into peak_fitting_unit_test_HB2B_1060

.travis.yml

@@ -10,10 +10,8 @@ cache:
 
 matrix:
   include:
-  - os: linux
-    env: CONDA=2.7
-  #- os: linux
-  #  env: CONDA=3.6
+  - env: CONDA=2.7
+  - env: CONDA=3.6
 
 before_install:
 - |

data/HB2B_CAL_Si333.json

@@ -1 +1 @@
-{"Status": 3, "error_Rot_z": -1.0, "error_Shift_z": -1.0, "error_Rot_x": -1.0, "error_Rot_y": -1.0, "error_Shift_x": 0.0001, "Shift_z": 0.0, "Shift_x": 7.903208284128856e-05, "Shift_y": 0.0, "error_Lambda": 0.0001, "Rot_z": 0.0, "Rot_y": 0.0, "Rot_x": 0.0, "error_Shift_y": -1.0, "Lambda": 1.456274820626443}
+{"Status": 3, "error_Rot_z": -1.0, "error_Shift_z": -1.0, "error_Rot_x": -1.0, "error_Rot_y": -1.0, "error_Shift_x": 0.0001, "Shift_z": 0.0, "Shift_x": 0.000343639741127, "Shift_y": 0.0, "error_Lambda": 0.0001, "Rot_z": 0.0, "Rot_y": 0.0, "Rot_x": 0.0, "error_Shift_y": -1.0, "Lambda": 1.4499332864}

data/XRay_Definition_1K.txt

@@ -3,5 +3,5 @@
 arm = 0.985
 rows = 1024
 columns = 1024
-pixel_size_x = 0.0003
-pixel_size_y = 0.0003
+pixel_size_x = 0.00029296875
+pixel_size_y = 0.00029296875

pyrs/calibration/peakfit_calibration.py

@@ -1,6 +1,7 @@
 # Migrated from /HFIR/HB2B/shared/Quick_Calibration.py
 # Original can be found at ./Quick_Calibration_v3.py
 # Renamed from  ./prototypes/calibration/Quick_Calibration_Class.py
+from __future__ import (absolute_import, division, print_function)  # python3 compatibility
 import numpy as np
 import time
 import json
@@ -303,7 +304,7 @@ def FitDetector(self, fun, x0, jac='3-point', bounds=[], method='trf', ftol=1e-0
                 s_sq = (residual**2).sum()/(len(residual)-len(x0))
                 pcov = pcov * s_sq
             else:
-                pcov = np.inf
+                pcov = np.diag([np.inf]*len(pfit))
 
             error = [0.0] * len(pfit)
             for i in range(len(pfit)):
@@ -312,7 +313,7 @@ def FitDetector(self, fun, x0, jac='3-point', bounds=[], method='trf', ftol=1e-0
                 except ValueError:
                     error[i] = (0.00)
 
-            print [pfit, np.array(error), success]
+            print([pfit, np.array(error), success])
             return [pfit, np.array(error), success]
 
         else:
@@ -528,7 +529,7 @@ def peak_alignment_single(self, x, roi_vec_set=None, ConstrainPosition=False, Re
         paramVec = np.copy(self._calib)
         paramVec[i_index] = x[0]
 
-        print x
+        print(x)
         residual = self.get_alignment_residual(paramVec, roi_vec_set, ConstrainPosition, False, start, stop)
 
         if ReturnScalar:
@@ -599,7 +600,7 @@ def peaks_alignment_all(self, x, roi_vec_set=None, ConstrainPosition=False,
         :return:
         """
 
-        print x
+        print(x)
         residual = self.get_alignment_residual(x, roi_vec_set, True, False, start, stop)
 
         if ReturnScalar: