Changeset fd5ac0d in sasview for src/sas/dataloader

Timestamp:

Feb 13, 2015 5:26:52 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:

7a04dbb

Parents:

b9a5f0e

Message:

I have completed the removal of all SANS references.
I will build, run, and run all unit tests before pushing.

Location:

src/sas/dataloader/readers

Files:

• associations.py (modified) (2 diffs)
• danse_reader.py (modified) (1 diff)
• defaults.xml (modified) (2 diffs)

src/sas/dataloader/readers/associations.py

@@ -22 +22 @@
 
 ## Format version for the XML settings file
-VERSION = 'sansloader/1.0'
+VERSION = 'sasloader/1.0'
 
 
@@ -54 +54 @@
         
         # Read in the file extension associations
-        entry_list = root.xpath('/ns:SansLoader/ns:FileType',
+        entry_list = root.xpath('/ns:SasLoader/ns:FileType',
                                  namespaces={'ns': VERSION})
 

src/sas/dataloader/readers/danse_reader.py

@@ -35 +35 @@
     type_name = "DANSE"
     ## Wildcards
-    type = ["DANSE files (*.sas)|*.sas"]
+    type = ["DANSE files (*.sans)|*.sans"]
     ## Extension
-    ext  = ['.sas', '.SANS']
+    ext  = ['.sans', '.SANS']
         
     def read(self, filename=None):

src/sas/dataloader/readers/defaults.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
-<SansLoader version="1.0"
-    xmlns="sansloader/1.0"
+<SasLoader version="1.0"
+    xmlns="sasloader/1.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     >
@@ -18 +18 @@
         <FileType extension='.nxs' reader='nexus_reader'/>
     
-</SansLoader>
+</SasLoader>