Merge pull request #143 from neutrons/theta_fix

Fix reported theta

Author: Mat Doucet

RefRed/calculations/lr_data.py

@@ -89,6 +89,7 @@ def __init__(
         self.S1H = mt_run.getProperty('S1VHeight').value[0]
         self.parent.current_ipts = mt_run.getProperty('experiment_identifier').value
         self.total_counts = workspace.getNumberEvents()
+        self.theta_theta_mode = mt_run.getProperty('BL4B:CS:ExpPl:OperatingMode').value[0] == 'Free Liquid'
 
         try:
             self.SiW = mt_run.getProperty('SiHWidth').value[0]
@@ -319,12 +320,16 @@ def calculate_lambda_range(self, tof_range=None):
 
     def calculate_theta(self, with_offset=True):
         """
-        calculate theta
+        Calculate theta
+        If we are in free-liquid mode (theta-theta), return the incident angle.
+        Otherwise, return the sample theta.
         """
-        tthd_value = self.tthd
-        thi_value = self.thi
+        if self.theta_theta_mode:
+            theta = self.thi
+        else:
+            theta = self.ths
 
-        theta = math.fabs(tthd_value - thi_value) / 2.0
+        theta = np.fabs(theta)
         if theta < 0.001:
             logging.debug("thi and tthd are equal: is this a direct beam?")
 

RefRed/calculations/update_reduction_table_metadata.py

@@ -18,7 +18,7 @@ def update(self):
 
         q_range = lrdata.q_range
         lambda_range = lrdata.lambda_range
-        incident_angle = lrdata.incident_angle
+        incident_angle = lrdata.incident_angle / 2.0
         const_q = lrdata.const_q
 
         [qmin, qmax] = q_range

RefRed/initialization/gui.py

@@ -16,7 +16,7 @@ class Gui(object):
         "Plotted",
         "Data Run #",
         "Norm. Run #",
-        "2\u03b8 (\u00B0)",
+        "\u03b8 (\u00B0)",
         "\u03bbmin (\u00c5)",
         "\u03bbmax (\u00c5)",
         "Qmin (1/\u00c5)",