Changeset 1150

Timestamp:

Nov 24, 2013 9:08:18 PM (9 years ago)

Author:

toby

Message:

Catch phase w/o histogram error

File:

• trunk/GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -1639 +1639 @@
         if 'ISODISTORT' not in data:
             raise Exception,"Should not happen: 'ISODISTORT' not in data"
+        if len(data.get('Histograms',[])) == 0:
+            G2frame.ErrorDialog(
+                'No data',
+                'Sorry, this computation requires that a histogram first be added to the phase'
+                )
+            return
         def _onClose(event):
             dlg.EndModal(wx.ID_CANCEL)
@@ -1652 +1658 @@
             v = Ilbl[Ilbl.rfind('_')+1:]
             pval = ISO['ParentStructure'][albl][['dx','dy','dz'].index(v)]
-            cval = parmDict.get(var)[0]
+            if var in parmDict:
+                cval = parmDict[var][0]
+            else:
+                G2frame.ErrorDialog('Atom not found',"No value found for parameter "+str(var))
+                return
             deltaList.append(cval-pval)
         modeVals = np.inner(ISO['Var2ModeMatrix'],deltaList)