Changeset f72333f in sasview for DataLoader/qsmearing.py

Timestamp:

May 10, 2010 4:50:05 PM (14 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:

4fbc93e

Parents:

2d409fa

Message:

Plugged in 2D smear: traditional over-sampling method

File:

• DataLoader/qsmearing.py (modified) (2 diffs)

DataLoader/qsmearing.py

@@ -13 +13 @@
 import math
 import logging, sys
+from DataLoader.smearing_2d import Smearer2D
 
 def smear_selection(data1D):
@@ -34 +35 @@
     # object, just return None
     if  data1D.__class__.__name__ != 'Data1D':
-        return None
+        if data1D == None:
+            return None
+        elif data1D.dqx_data == None or data1D.dqy_data == None:
+            return None
+        return Smearer2D(data1D)
     
     if  not hasattr(data1D, "dx") and not hasattr(data1D, "dxl") and not hasattr(data1D, "dxw"):