Changeset beba407 in sasview for src/sas/sascalc

Timestamp:

Apr 11, 2017 12:05:55 PM (8 years ago)

Author:

krzywon

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:

b09095a

Parents:

278ddee

git-author:

Jeff Krzywon <krzywon@…> (04/11/17 12:05:55)

git-committer:

krzywon <krzywon@…> (04/11/17 12:05:55)

Message:

Start of a base file loading class and a couple unit tests for it.

Location:

src/sas/sascalc/dataloader

Files:

• data_info.py (modified) (1 diff)
• file_reader_base_class.py (added)

src/sas/sascalc/dataloader/data_info.py

@@ -1180 +1180 @@
         return return_string
 
-    final_dataset.xmax = data.xmax
-    final_dataset.ymax = data.ymax
-    final_dataset.xmin = data.xmin
-    final_dataset.ymin = data.ymin
+    if hasattr(data, "xmax"):
+        final_dataset.xmax = data.xmax
+    if hasattr(data, "ymax"):
+        final_dataset.ymax = data.ymax
+    if hasattr(data, "xmin"):
+        final_dataset.xmin = data.xmin
+    if hasattr(data, "ymin"):
+        final_dataset.ymin = data.ymin
     final_dataset.isSesans = datainfo.isSesans
     final_dataset.title = datainfo.title