Changeset ac5b69d in sasview for src/sans/dataloader/readers/cansas_constants.py

Timestamp:

May 5, 2014 3:41:43 PM (10 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:

c81aa18

Parents:

0089be3

Message:

Ticket #249 fix: Saving and loading projects and analysis is now working.

File:

• src/sans/dataloader/readers/cansas_constants.py (modified) (9 diffs)

src/sans/dataloader/readers/cansas_constants.py

@@ -3 +3 @@
 the cansas_reader.py file to read in any version of the cansas format.
 """
-class cansasConstants:
-    
-    ns = ''
+class CansasConstants:
+    """
+    The base class to define where all of the data is to be saved by
+    cansas_reader.py.
+    """
+    
+    names = ''
     format = ''
     
     
     def __init__(self):
-        self.ns = self.CANSAS_NS
+        self.names = self.CANSAS_NS
         self.format = self.CANSAS_FORMAT
     
     
-    def _iterate_namespace(self, namespace):
+    def iterate_namespace(self, namespace):
         """
         Method to iterate through a cansas constants tree based on a list of
@@ -23 +27 @@
         """
         # The current level to look through in cansas_constants.
-        return_me = currentLevel()
+        return_me = CurrentLevel()
         return_me.current_level = self.CANSAS_FORMAT.get("SASentry")
         # Defaults for variable and datatype
@@ -30 +34 @@
         return_me.ns_optional = True
         for name in namespace:
-            if name != "SASentry":
-                return_me.current_level = \
-                        return_me.current_level.get("children").get(name, "")
-                if return_me.current_level == "":
+            try:
+                if name != "SASentry":
                     return_me.current_level = \
-                            return_me.current_level.get("<any>", "")
-                cl_variable = return_me.current_level.get("variable", "")
-                cl_datatype = return_me.current_level.get("storeas", "")
-                cl_units_optional = \
-                            return_me.current_level.get("units_required", "")
-                # Where are how to store the variable for the given namespace
-                # CANSAS_CONSTANTS tree is hierarchical, so is no value, inherit
-                return_me.ns_variable = cl_variable if cl_variable != "" else \
-                                    return_me.ns_variable
-                return_me.ns_datatype = cl_datatype if cl_datatype != "" else \
-                                    return_me.ns_datatype
-                return_me.ns_optional = cl_units_optional if \
-                                    cl_units_optional != return_me.ns_optional \
-                                    else return_me.ns_optional
+                            return_me.current_level.get("children").get(name, "")
+                    if return_me.current_level == "":
+                        return_me.current_level = \
+                                return_me.current_level.get("<any>", "")
+                    cl_variable = return_me.current_level.get("variable", "")
+                    cl_datatype = return_me.current_level.get("storeas", "")
+                    cl_units_optional = \
+                                return_me.current_level.get("units_required", "")
+                    # Where are how to store the variable for the given namespace
+                    # CANSAS_CONSTANTS tree is hierarchical, so is no value, inherit
+                    return_me.ns_variable = cl_variable if cl_variable != "" else \
+                                        return_me.ns_variable
+                    return_me.ns_datatype = cl_datatype if cl_datatype != "" else \
+                                        return_me.ns_datatype
+                    return_me.ns_optional = cl_units_optional if \
+                                        cl_units_optional != return_me.ns_optional \
+                                        else return_me.ns_optional
+            except AttributeError:
+                return_me.ns_variable = "{0}.meta_data[\"{2}\"] = \"{1}\""
+                return_me.ns_datatype = "content"
+                return_me.ns_optional = True
         return return_me    
     
@@ -454 +463 @@
                            }
     SASINSTR_SRC = {
-                    "attributes" : {"name" : {"variable" : "{0}.source.name = \"{1}\""}},
+                    "attributes" : {"name" : {"variable" : \
+                                              "{0}.source.name = \"{1}\""}},
                     "variable" : None,
                     "children" : {
-                                  "radiation" : {"variable" : "{0}.source.radiation = \"{1}\""},
+                                  "radiation" : {"variable" : \
+                                            "{0}.source.radiation = \"{1}\""},
                                   "beam_size" : SASINSTR_SRC_BEAMSIZE,
                                   "beam_shape" : {"variable" : \
@@ -647 +658 @@
                         "unit" : "pixel_size_unit",
                         "attributes" : {
-                                        "unit" : "{0}.pixel_size_unit = \"{1}\"",
+                                        "unit" : \
+                                            "{0}.pixel_size_unit = \"{1}\"",
                                         "storeas" : "content"
                                         }
@@ -655 +667 @@
                         "unit" : "pixel_size_unit",
                         "attributes" : {
-                                        "unit" : "{0}.pixel_size_unit = \"{1}\"",
+                                        "unit" : \
+                                            "{0}.pixel_size_unit = \"{1}\"",
                                         "storeas" : "content"
                                         }
@@ -663 +676 @@
                         "unit" : "pixel_size_unit",
                         "attributes" : {
-                                        "unit" : "{0}.pixel_size_unit = \"{1}\"",
+                                        "unit" : \
+                                            "{0}.pixel_size_unit = \"{1}\"",
                                         "storeas" : "content"
                                         }
@@ -740 +754 @@
                      }
    
-class currentLevel:
+class CurrentLevel:
+    """
+    A helper class to hold information on where you are in the constants tree
+    """
      
     current_level = ''
@@ -748 +765 @@
      
     def __init__(self):
-        self.current_level = ''
+        self.current_level = {}
         self.ns_variable = ''
         self.ns_datatype = "content"