Changeset 1cad8a4 in sasview for src/sas

Timestamp:

Dec 6, 2016 9:06:16 AM (8 years ago)

Author:

jhbakker

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:

f668101

Parents:

632e2e8

Message:

cosmetic change to qsmearing.py

File:

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

src/sas/sascalc/data_util/qsmearing.py

@@ -61 +61 @@
     #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 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)
@@ -120 +123 @@
         self.resolution = resolution
         if hasattr(self.resolution, 'data'):
-            if self.resolution.data.meta_data['loader'] == 'SESANS':
+            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.