Changeset 6435594 in sasview for src/sas/sascalc

Timestamp:

Apr 7, 2017 12:03:53 AM (8 years ago)

Author:

andyfaff

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:

7b15990

Parents:

f3bf622

Message:

MAINT: improving dict access

File:

• src/sas/sascalc/realspace/VolumeCanvas.py (modified) (9 diffs)

src/sas/sascalc/realspace/VolumeCanvas.py

@@ -379 +379 @@
         # If a shape identifier was given, look the shape up
         # in the dictionary
-        if len(toks)>1:
-            if toks[0] in self.shapes.keys():
+        if len(toks):
+            if toks[0] in self.shapes:
                 # The shape was found, now look for the parameter
                 if toks[1] in self.shapes[toks[0]].params:
@@ -387 +387 @@
                     self._model_changed()
                 else:
-                    raise ValueError, "Could not find parameter %s" % name
+                    raise ValueError("Could not find parameter %s" % name)
             else:
-                raise ValueError, "Could not find shape %s" % toks[0]
+                raise ValueError("Could not find shape %s" % toks[0])
         
         else:
@@ -410 +410 @@
         if len(toks) == 1:
             try:
-                a = self.params[toks[0]]
+                value = self.params[toks[0]]
             except KeyError:
                 raise ValueError("VolumeCanvas.getParam: Could not find"
                                  " %s" % name)
-
-            value = self.params[toks[0]]
             if isinstance(value, ShapeDescriptor):
                 raise ValueError("VolumeCanvas.getParam: Cannot get parameter"
@@ -424 +422 @@
         elif len(toks) == 2:
             try:
-                a = self.shapes[toks[0]]
+                shapeinstance = self.shapes[toks[0]]
             except KeyError:
                 raise ValueError("VolumeCanvas.getParam: Could not find "
                                  "%s" % name)
 
-            shapeinstance = self.shapes[toks[0]]
-
-            try:
-                a = shapeinstance.params[toks[1]]
-            except KeyError:
+            if not toks[1] in shapeinstance.params:
                 raise ValueError("VolumeCanvas.getParam: Could not find "
                                  "%s" % name)
@@ -442 +436 @@
             raise ValueError("VolumeCanvas.getParam: Could not find %s" % name)
             
-    def getParamList(self, shapeid = None):
+    def getParamList(self, shapeid=None):
         """
                return a full list of all available parameters from 
@@ -455 +449 @@
         param_list = []
         if shapeid is None:
-            for key1 in self.params.keys():
+            for key1 in self.params:
                 #value1 = self.params[key1]
                 param_list.append(key1)
-            for key2 in self.shapes.keys():
+            for key2 in self.shapes:
                 value2 = self.shapes[key2]
                 header = key2 + '.'
-                for key3 in value2.params.keys():   
+                for key3 in value2.params:
                     fullname = header + key3                 
                     param_list.append(fullname)
      
         else:
-            try:
-                a = self.shapes[shapeid]
-            except KeyError:
+            if not shapeid in self.shapes:
                 raise ValueError("VolumeCanvas: getParamList: Could not find "
                                  "%s" % shapeid)
@@ -487 +479 @@
             @param shapeDesc: shape description
         """
-        #Create the object model
+        # Create the object model
         shapeDesc.create()
                     
@@ -602 +594 @@
         # type we recognize
         else:
-            raise ValueError, "run(q): bad type for q"
+            raise ValueError("run(q): bad type for q")
     
     def runXY(self, q = 0):
@@ -622 +614 @@
         # type we recognize
         else:
-            raise ValueError, "runXY(q): bad type for q"
+            raise ValueError("runXY(q): bad type for q")
     
     def _create_modelObject(self):