Changeset 92a2ecd in sasview for src/sans/dataloader

Timestamp:

May 8, 2014 12:55:23 PM (11 years ago)

Author:

Jeff Krzywon <jeffery.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.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:

6b20c4e

Parents:

17c62b6

Message:

Save and load project files seems fixed now. I haven't tested individual analysis windows yet.

File:

• src/sans/dataloader/readers/cansas_reader.py (modified) (2 diffs)

src/sans/dataloader/readers/cansas_reader.py

@@ -372 +372 @@
                 tagname = node.tag.replace(base_ns, "")
                 tagname_original = tagname
-                if tagname == "fitting_plug_in":
+                if tagname == "fitting_plug_in" or tagname == "pr_inversion" or\
+                    tagname == "invariant":
                     continue
                 names.append(tagname)
@@ -517 +518 @@
                 else:
                     save_data1d = data1d
-                if tagname_original != "fitting_plug_in":
+                if tagname_original == "fitting_plug_in" or \
+                    tagname_original == "invariant" or \
+                    tagname_original == "pr_inversion":
+                    pass
+                else:
                     data1d = save_data1d
                     # Remove tagname from names to restore original base