address bugs in ISODISTORT & BCS access

Author: briantoby

GSASII/GSASIIphsGUI.py

@@ -7083,7 +7083,7 @@ def OnRunISODISTORT(event):
             data['ISODISTORT']['SGselect'] =  {'Tric':True,'Mono':True,'Orth':True,'Tetr':True,'Trig':True,'Hexa':True,'Cubi':True}
             data['ISODISTORT']['selection'] = None
             print('ISODISTORT run complete')
-            wx.CallAfter(G2phsG2.UpdateISODISTORT,G2frame.data)
+            wx.CallAfter(G2phsG2.UpdateISODISTORT,G2frame,data)
         elif data['ISODISTORT']['ISOmethod'] != 4 or radio is None:
             G2G.G2MessageBox(G2frame,'ISODISTORT run failed - see page opened in web browser')
         else:

GSASII/ISODISTORT.py

@@ -120,33 +120,40 @@ def GetISODISTORT(Phase):
         print('method  3 TBD')
         return [],[]
     elif ISOdata['ISOmethod'] == 4:
-        childcif = ISOdata['ChildCIF']
-        if 'Use this phase' in childcif:
-            childcif = MakePhaseCif(Phase)
-        print(' Run ISODISTORT with %s as child cif'%childcif)
-        ISOchildcif = UploadCIF(childcif)
-        data['input'] = 'uploadsubgroupcif'
-        data['filename'] = ISOchildcif
-        out24 = requests.post(isoformsite,data=data).text
-        posB = out24.index('OPTION VALUE=')
-        posF = out24[posB:].index('>')+posB
-        value = out24[posB+13:posF]
-        data['input'] = 'distort'
-        data['origintype'] = 'method4'
-        data['inputbasis'] = 'list'
-        data['basisselect'] = value[1:-1]
-        data['chooseorigin'] = False
-        data['trynearest'] = True
-        data['dmax'] = '1'
-        out25 = requests.post(isoformsite,data=data).text
-        cifout = GetISOcif(out25,4)
-        if cifout is None:
-            return None,None
-        cifFile = '%s_%s.cif'%(Phase['General']['Name'],'child')
-        fl = open(cifFile,'wb')
-        fl.write(cifout.encode("utf-8"))
-        fl.close()
-        return [],cifFile
+        try:
+            childcif = ISOdata['ChildCIF']
+            if 'Use this phase' in childcif:
+                childcif = MakePhaseCif(Phase)
+            print(' Run ISODISTORT with %s as child cif'%childcif)
+            ISOchildcif = UploadCIF(childcif)
+            data['input'] = 'uploadsubgroupcif'
+            data['filename'] = ISOchildcif
+            out24 = requests.post(isoformsite,data=data).text
+            posB = out24.index('OPTION VALUE=')
+            posF = out24[posB:].index('>')+posB
+            value = out24[posB+13:posF]
+            data['input'] = 'distort'
+            data['origintype'] = 'method4'
+            data['inputbasis'] = 'list'
+            data['basisselect'] = value[1:-1]
+            data['chooseorigin'] = False
+            data['trynearest'] = True
+            data['dmax'] = '1'
+            out25 = requests.post(isoformsite,data=data).text
+            cifout = GetISOcif(out25,4)
+            if cifout is None:
+                return None,None
+            cifFile = '%s_%s.cif'%(Phase['General']['Name'],'child')
+            fl = open(cifFile,'wb')
+            fl.write(cifout.encode("utf-8"))
+            fl.close()
+            return [],cifFile
+        except:
+            print('Output from ISODISTORT follows')
+            if '<H1>' in out24: out24 = out24.split('<H1>',1)[1]
+            print(out24)
+            print('Scan of output from ISODISTORT failed, see above')
+            return [],[]
 
     #do the distortion search - result is radio button list of choices
 

GSASII/SUBGROUPS.py

@@ -45,8 +45,12 @@ def BCS_init(threadCallback=None):
     if threadCallback == '':
         # setup default threading for BCS Post commands
         def BCS_sleep():
-            wx.GetApp().Yield()
-            wx.MilliSleep(100)
+            try:
+                wx.GetApp().Yield()
+                wx.MilliSleep(100)
+            except:
+                import time
+                time.sleep(0.1)
             #print('BCS_sleep')
         BCS.initAPI(threadSleep=BCS_sleep)
         return
@@ -384,7 +388,7 @@ def GetStdSGset(SGData=None, oprList=[]):
     xform = re.split(r'parclose\.png',re.split(r'paropen\.png',page)[1])[0] # pull out section w/Xform matrix
     mat = re.split(r'</pre>',re.split('<pre>',xform)[1])[0].split('\n')
     offsetV = [eval(m.split()[3]) for m in mat]
-    xformM = np.array([[float(i) for i in m.split()[:3]] for m in mat])
+    xformM = np.array([[float(eval(i)) for i in m.split()[:3]] for m in mat])
     return sgnum, sgnam, xformM.T, offsetV
 
 # minsup = 'nph-minsup' # coded but not used