Changeset 6c497b7 in sasview for src/sas/sascalc/dataloader/manipulations.py

Timestamp:

Apr 16, 2017 1:01:30 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

f94a935

Parents:

de99a5f0 (diff), e5cbbce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into log_binning

File:

• src/sas/sascalc/dataloader/manipulations.py (modified) (6 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -24 +24 @@
 import numpy as np
 import sys
- 
+
 #from data_info import plottable_2D
 from data_info import Data1D
@@ -226 +226 @@
     # def; dqx_data = dq_r dqy_data = dq_phi
     # Convert dq 2D to 1D here
-    dq_data = np.sqrt(dqx_data**2 + dqx_data**2) 
+    dq_data = np.sqrt(dqx_data**2 + dqx_data**2)
     return dq_data
 
@@ -602 +602 @@
             dq_data = get_dq_data(data2D)
 
-        #q_data_max = np.max(q_data)
-        if len(data2D.q_data) is None:
+        if len(q_data) == 0:
             msg = "Circular averaging: invalid q_data: %g" % data2D.q_data
             raise RuntimeError(msg)
@@ -734 +733 @@
 
         # Set space for 1d outputs
-        phi_bins = np.zeros(self.nbins_phi)
-        phi_counts = np.zeros(self.nbins_phi)
+    phi_bins = np.zeros(self.nbins_phi)
+    phi_counts = np.zeros(self.nbins_phi)
         phi_values = np.zeros(self.nbins_phi)
         phi_err = np.zeros(self.nbins_phi)
@@ -844 +843 @@
         phi_min = flip_phi(self.phi_min)
         phi_max = flip_phi(self.phi_max)
-        
+
         #  binning object
         if run.lower() == 'phi':
@@ -850 +849 @@
         else:
             binning = Binning(self.r_min, self.r_max, self.nbins, self.base)
-        
+
         for n in range(len(data)):