Changeset 83eff66 in sasview for src/sas/dataloader/readers

Timestamp:

Feb 19, 2015 2:09:00 AM (10 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.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:

66f21cd, 27ab091

Parents:

f53cd30 (diff), 5e326a6 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview/

Location:

src/sas/dataloader/readers

Files:

• associations.py (modified) (1 diff)
• defaults.json (modified) (1 diff)
• sesans_reader.py (added)

src/sas/dataloader/readers/associations.py

@@ -91 +91 @@
     #import tiff_reader
     import nexus_reader
-
+    import sesans_reader
+    registry_function(sesans_reader)
     registry_function(abs_reader)
     registry_function(ascii_reader)

src/sas/dataloader/readers/defaults.json

@@ -5 +5 @@
             "-extension":".xml",
             "-reader":"cansas_reader"
+         },
+         {
+            "-extension":".ses",
+            "-reader":"sesans_reader"
          },
          {