more cleanup; fix buggy code that is likely not used

Author: briantoby

GSASII/GSASIImiscGUI.py

@@ -24,7 +24,7 @@
 import os
 import re
 import copy
-import platform
+#import platform
 import pickle
 import sys
 import random as ran
@@ -709,7 +709,7 @@ def ProjFileSave(G2frame):
                 commit = g2repo.head.commit
                 Controls['LastSavedUsing'] += f" git {commit.hexsha[:8]}"
             else:
-                gv = getSavedVersionInfo()
+                gv = GSASIIpath.getSavedVersionInfo()
                 if gv is not None:
                     Controls['LastSavedUsing'] += f" static {gv.git_version[:8]}"
         except:

GSASII/GSASIIsasd.py

@@ -267,7 +267,7 @@ def CylinderVol(R,args):
 
     :param float R: diameter (A)
     :param array args: [float L]: length (A)
-    :returns float:volume (A^3)
+    :returns float: volume (A^3)
     '''
     L = args[0]
     return np.pi*L*R**2
@@ -278,7 +278,7 @@ def CylinderDVol(L,args):
 
     :param float: L half length (A)
     :param array args: [float D]: diameter (A)
-    :returns float:volume (A^3)
+    :returns float: volume (A^3)
     '''
     D = args[0]
     return CylinderVol(D/2.,[2.*L,])
@@ -289,7 +289,7 @@ def CylinderARVol(R,args):
 
     :param float: R radius (A)
     :param array args: [float AR]: =L/D=L/2R aspect ratio
-    :returns float:volume
+    :returns float: volume
     '''
     AR = args[0]
     return CylinderVol(R,[2.*R*AR,])
@@ -310,7 +310,7 @@ def UniRodVol(R,args):
 
     :param float R: diameter (A)
     :param array args: [float L]: length (A)
-    :returns float:volume (A^3)
+    :returns float: volume (A^3)
     '''
     L = args[0]
     return CylinderVol(R,[L,])
@@ -321,7 +321,7 @@ def UniRodARVol(R,args):
 
     :param float R: diameter (A)
     :param array args: [float AR]: =L/D=L/2R aspect ratio
-    :returns float:volume (A^3)
+    :returns float: volume (A^3)
     '''
     AR = args[0]
     return CylinderARVol(R,[AR,])
@@ -332,7 +332,7 @@ def UniDiskVol(R,args):
 
     :param float R: diameter (A)
     :param array args: [float T]: thickness
-    :returns float:volume (A^3)
+    :returns float: volume (A^3)
     '''
     T = args[0]
     return CylinderVol(R,[T,])
@@ -491,7 +491,7 @@ def HardSpheresSF(Q,args):
     
     :param float Q: Q value array (A-1)
     :param array args: [float R, float VolFrac]: interparticle distance & volume fraction
-    :returns numpy array S(Q)
+    :returns numpy array: S(Q)
     '''
 
     R,VolFr = args
@@ -522,7 +522,7 @@ def SquareWellSF(Q,args):
     :param array args: [float R, float VolFrac, float depth, float width]: 
         interparticle distance, volume fraction (<0.08), well depth (e/kT<1.5kT),
         well width
-    :returns: numpy array S(Q)
+    :returns: numpy array: S(Q)
       well depth > 0 attractive & values outside above limits nonphysical cf. 
       Monte Carlo simulations 
     '''
@@ -557,7 +557,7 @@ def StickyHardSpheresSF(Q,args):
     
     :param float Q: Q value array (A-1)
     :param array args: [float R, float VolFrac]: sphere radius & volume fraction
-    :returns numpy array S(Q)
+    :returns numpy array: S(Q)
     '''
     R,VolFr,epis,sticky = args
     eta = VolFr/(1.0-epis)/(1.0-epis)/(1.0-epis)	
@@ -606,7 +606,7 @@ def InterPrecipitateSF(Q,args):
 
     :param float Q: Q value array (A-1)
     :param array args: [float R, float VolFr]: "radius" & volume fraction
-    :returns numpy array S(Q)
+    :returns numpy array: S(Q)
     '''
     R,VolFr = args
     QV2 = Q**2*VolFr**2

GSASII/GSASIIscriptable.py

@@ -505,7 +505,8 @@ def import_generic(filename, readerlist, fmthint=None, bank=None,
                 else:
                     try:
                         flag = rd.Reader(filename,buffer=rdbuffer, blocknum=block)
-                    except Exception as msg:
+                    #except Exception as msg:
+                    except Exception:
                         flag = False
                 if flag:
                     # Omitting image loading special cases
@@ -593,7 +594,8 @@ def load_pwd_from_reader(reader, instprm, existingnames=[],bank=None):
         try:
             Iparm1, Iparm2 = reader.pwdparms['Instrument Parameters']
             print('Instrument parameters supplied in data file')
-        except KeyError as err:
+        #except KeyError as err:
+        except KeyError:
             Iparm1 = None  # signal error rather than raise exception inside an exception handler
         if Iparm1 is None:
             msg  = "The data file does not have any instrument params associated with it and none were provided."
@@ -1007,9 +1009,9 @@ def save(self, filename=None):
                 commit = g2repo.head.commit
                 controls_data['LastSavedUsing'] += f" git {commit.hexsha[:8]} script"
             else:
-                gv = getSavedVersionInfo()
+                gv = GSASIIpath.getSavedVersionInfo()
                 if gv is not None:
-                    Controls['LastSavedUsing'] += f" static {gv.git_version[:8]}"
+                    controls_data['LastSavedUsing'] += f" static {gv.git_version[:8]}"
         except:
             pass
         #    .gpx name
@@ -5620,7 +5622,6 @@ def setHAPentryValue(self, keylist, newvalue):
     def _getBondRest(self,nam):
         if 'Restraints' not in self.proj.data:
             raise G2ScriptException(f"{nam} error: Restraints entry not in data tree")
-        errmsg = ''
         try:
             return self.proj.data['Restraints']['data'][self.name]['Bond']
         except:
@@ -7200,7 +7201,7 @@ def loadPixelMask(self,mask,tag="loaded in G2sc.loadPixelMask"):
             Image = self.image
         else:
             Image = _getCorrImage(Readers['Image'],self.proj,self)
-        Controls = self.getControls()
+        #Controls = self.getControls()
         if mask.shape != Image.shape:
             raise G2ScriptException(f"loadPixelMask Error: mask shape {mask.shape} must match image {Image.shape}")
         self.getMasks()['SpotMask']['spotMask'] = mask