Changeset 50f1477 in sasview for src/sas/sascalc/data_util

Timestamp:

Dec 19, 2016 7:25:08 AM (8 years ago)

Author:

GitHub <noreply@…>

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

Children:

09fdc89, b61bd57

Parents:

f2724b6 (diff), 345e7e4 (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.

git-author:

jhbakker <j.h.bakker@…> (12/19/16 07:25:08)

git-committer:

GitHub <noreply@…> (12/19/16 07:25:08)

Message:

Merge pull request #27 from SasView?/revert-26-Jurtest2

Revert "Jurtest2"

File:

• src/sas/sascalc/data_util/qsmearing.py (modified) (7 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -5 +5 @@
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation.
+#project funded by the US National Science Foundation. 
 #See the license text in license.txt
 #copyright 2008, University of Tennessee
@@ -13 +13 @@
 import logging
 import sys
-from sasmodels import sesans
-import numpy as np  # type: ignore
-from numpy import pi, exp  # type: ignore
 
 from sasmodels.resolution import Slit1D, Pinhole1D
-from sasmodels.sesans import SESANS1D
 from sasmodels.resolution2d import Pinhole2D
-from src.sas.sascalc.data_util.nxsunit import Converter
-
 
 def smear_selection(data, model = None):
@@ -42 +36 @@
     # Sanity check. If we are not dealing with a SAS Data1D
     # object, just return None
-
-    # This checks for 2D data (does not throw exception because fail is common)
     if  data.__class__.__name__ not in ['Data1D', 'Theory1D']:
         if data == None:
@@ -50 +42 @@
             return None
         return Pinhole2D(data)
-    # This checks for 1D data with smearing info in the data itself (again, fail is likely; no exceptions)
+
     if  not hasattr(data, "dx") and not hasattr(data, "dxl")\
          and not hasattr(data, "dxw"):
@@ -56 +48 @@
 
     # Look for resolution smearing data
-    # This is the code that checks for SESANS data; it looks for the file loader
-    # TODO: change other sanity checks to check for file loader instead of data structure?
-    _found_sesans = False
-    #if data.dx is not None and data.meta_data['loader']=='SESANS':
-    if data.dx is not None and data.isSesans:
-        #if data.dx[0] > 0.0:
-        if numpy.size(data.dx[data.dx <= 0]) == 0:
-            _found_sesans = True
-        #if data.dx[0] <= 0.0:
-        if numpy.size(data.dx[data.dx <= 0]) > 0:
-            raise ValueError('one or more of your dx values are negative, please check the data file!')
-    if _found_sesans == True:
-        #Pre-compute the Hankel matrix (H)
-        qmax, qunits = data.sample.zacceptance
-        hankel=sesans.SesansTransform()
-        sesans.SesansTransform.set_transform(hankel,
-        SE = Converter(data._xunit)(data.x, "A"),
-        zaccept = Converter(qunits)(qmax, "1/A"),
-        Rmax = 10000000)
-        # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model)
-
     _found_resolution = False
     if data.dx is not None and len(data.dx) == len(data.x):
@@ -122 +92 @@
         self.model = model
         self.resolution = resolution
-        if hasattr(self.resolution, 'data'):
-            if self.resolution.data.meta_data['loader'] == 'SESANS': # Always True if file extension is '.ses'!
-                self.offset = 0
-            # This is default behaviour, for future resolution/transform functions this needs to be revisited.
-            else:
-                self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
-        else:
-            self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
-
-        #self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
+        self.offset = numpy.searchsorted(self.resolution.q_calc, self.resolution.q[0])
 
     def apply(self, iq_in, first_bin=0, last_bin=None):
@@ -165 +126 @@
         q[first:last+1].
         """
-
         q = self.resolution.q
         first = numpy.searchsorted(q, q_min)