Refs #master change wavelength defaults

neutrons · Jun 8, 2018 · 38840da · 38840da
1 parent 6e6b281
commit 38840da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/model/goniometer.py b/model/goniometer.py
@@ -213,7 +213,7 @@ def _get_angles_desc(self):
         return self.get_angles_description()
 
     wavelength_bandwidth = Property(Float, desc="the bandwidth of measurement wavelength, in angstroms. Changing this value changes the allowable range for WL_center.")
-    _wavelength_bandwidth = 3.4
+    _wavelength_bandwidth = 0.6
     def _get_wavelength_bandwidth(self):
         return self._wavelength_bandwidth
     def _set_wavelength_bandwidth(self, value):
@@ -237,7 +237,7 @@ def _set_wavelength_minimum(self, value):
         self._set_wavelength_bandwidth(self._wavelength_bandwidth)
 
     wavelength_maximum = Property(Float, desc="the maximum wavelength that can be reached, in angstroms. Changing this value changes the allowable range for WL_center.")
-    _wavelength_maximum = 6.0
+    _wavelength_maximum = 3.7
     def _get_wavelength_maximum(self):
         return self._wavelength_maximum
     def _set_wavelength_maximum(self, value):
@@ -285,7 +285,8 @@ def __init__(self, wavelength_control=False):
             ]
         #Bandwidth of detection, in angstroms
         self.wavelength_minimum = 0.1
-        self.wavelength_bandwidth = 3.2
+        self.wavelength_maximum = 3.7
+        self.wavelength_bandwidth = 0.6
 
     #========================================================================================================
     def __eq__(self, other):

diff --git a/model/numpy_utils.py b/model/numpy_utils.py
@@ -57,7 +57,6 @@ def rotation_matrix(phi=0, chi=0, omega=0):
 
     #rotated =  M_omega * (M_chi * (M_phi * vector));
     M = np.dot(M_omega, np.dot(M_chi, M_phi))
-    print M
 
     return M;
 
@@ -96,7 +95,6 @@ def kappa_rotation_matrix(phi=0, alpha=0, kappa=0, omega=0):
 
     #rotated =  M_omega * (M_kappa * (M_phi * vector));
     M = np.dot(M_omega, np.dot(M_kappa, M_phi))
-    print M
 
     return M;
 

diff --git a/setup.cfg b/setup.cfg
@@ -2,7 +2,7 @@
 formats = rpm
 
 [bdist_rpm]
-release = 8
+release = 9
 packager = ORNL NDAV
 #doc_files = docs/user_guide.pdf
 requires = numpy,scipy,python-traitsui,python-matplotlib-wx,Mayavi