Changeset 59a2dab in sasview for DataLoader

Timestamp:

May 12, 2010 3:20:08 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fd50e2f

Parents:

952afaa

Message:

improve handling dq a bit

File:

• DataLoader/readers/red2d_reader.py (modified) (1 diff)

DataLoader/readers/red2d_reader.py

@@ -282 +282 @@
         detector.distance = distance
         
-        # optional data: if any of dq data == 0, do not pass to output
-        if len(dqx_data) == len(qx_data):
-            output.dqx_data = dqx_data
-        if len(dqy_data) == len(qy_data):
-            output.dqy_data = dqy_data
+        # optional data: if all of dq data == 0, do not pass to output
+        if len(dqx_data) == len(qx_data) and dqx_data.any()!=0: 
+            # if no dqx_data, do not pass dqy_data.(1 axis dq is not supported yet).
+            if len(dqy_data) == len(qy_data) and dqy_data.any()!=0:
+                output.dqx_data = dqx_data
+                output.dqy_data = dqy_data
         
         # Units of axes