improve dysnomia installation in response to #290

Author: briantoby

GSASII/GSASIIctrlGUI.py

@@ -5160,7 +5160,7 @@ def RightClickClear():
             self.parmWin.Controls['LoggedVars'].remove(var)
         else:
             self.parmWin.Controls['LoggedVars'].append(var)
-        if GSASIIpath.GetConfigValue('debug'): print(self.parmWin.Controls['LoggedVars'])
+        #if GSASIIpath.GetConfigValue('debug'): print(self.parmWin.Controls['LoggedVars'])
         self.parmWin.SendSizeEvent()  # redraws the window
         wx.CallAfter(RightClickClear)
 

GSASII/GSASIIdataGUI.py

@@ -7321,9 +7321,9 @@ def _makemenu():     # routine to create menu when first used
             self.MEMMenu.Append(menu=wx.Menu(title=''),title='Select tab')
             self.MEMDataEdit = wx.Menu(title='')
             self.MEMMenu.Append(menu=self.MEMDataEdit, title='Operations')
-            self.MEMDataEdit.Append(G2G.wxID_LOADDYSNOMIA,'Load from Dysnomia file','Load MEM info from Dysnomia file')
-            self.MEMDataEdit.Append(G2G.wxID_SAVEDYSNOMIA,'Save Dysnomia file','Save MEM info in Dysnomia file')
-            self.MEMDataEdit.Append(G2G.wxID_RUNDYSNOMIA,'Run Dysonmia','Run Dysnomia to make new Fobs map')
+            #self.MEMDataEdit.Append(G2G.wxID_LOADDYSNOMIA,'Load from Dysnomia file','Load MEM info from Dysnomia file')
+            #self.MEMDataEdit.Append(G2G.wxID_SAVEDYSNOMIA,'Save Dysnomia file','Save MEM info in Dysnomia file')
+            self.MEMDataEdit.Append(G2G.wxID_RUNDYSNOMIA,'Run Dysnomia','Run Dysnomia to make new Fobs map')
             self.PostfillDataMenu()
 
             #Phase / fullrmc & RMCprofile (Reverse Monte Carlo method) tab

GSASII/GSASIIphsGUI.py

@@ -2392,8 +2392,8 @@ def OnDysnomia(event):
                         # G2frame.Bind(wx.EVT_MENU, lambda event:G2phsG2.OnLoadDysnomia(event,G2frame,data), id=G2G.wxID_LOADDYSNOMIA)
                         # G2frame.Bind(wx.EVT_MENU, lambda event:G2phsG2.OnSaveDysnomia(event,G2frame,data), id=G2G.wxID_SAVEDYSNOMIA)
                         # G2frame.Bind(wx.EVT_MENU, lambda event:G2phsG2.OnRunDysnomia(event,G2frame,data), id=G2G.wxID_RUNDYSNOMIA)
-                        G2frame.Bind(wx.EVT_MENU, OnLoadDysnomia, id=G2G.wxID_LOADDYSNOMIA)
-                        G2frame.Bind(wx.EVT_MENU, OnSaveDysnomia, id=G2G.wxID_SAVEDYSNOMIA)
+                        # G2frame.Bind(wx.EVT_MENU, OnLoadDysnomia, id=G2G.wxID_LOADDYSNOMIA)
+                        # G2frame.Bind(wx.EVT_MENU, OnSaveDysnomia, id=G2G.wxID_SAVEDYSNOMIA)
                         G2frame.Bind(wx.EVT_MENU, OnRunDysnomia, id=G2G.wxID_RUNDYSNOMIA)
                         G2frame.phaseDisplay.InsertPage(7,G2frame.MEMData,'Dysnomia')
                         Id = wx.NewId()
@@ -5854,25 +5854,45 @@ def OnReImport(event):
 
 #### Dysnomia (MEM) Data page ##############################################################################
 
-    def OnLoadDysnomia(event):
-        print('Load MEM - might not be implemented')
+    # def OnLoadDysnomia(event):
+    #     print('Load MEM - might not be implemented')
 
-    def OnSaveDysnomia(event):
-        print('Save MEM - might not be implemented')
+    # def OnSaveDysnomia(event):
+    #     print('Save MEM - might not be implemented')
 
     def OnRunDysnomia(event):
 
-        path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
-        DYSNOMIA = os.path.join(path2GSAS2,'Dysnomia','Dysnomia64.exe')
-        DysData = data['Dysnomia']
+        if sys.platform == "win32":
+            binimage = 'Dysnomia64.exe'
+        else:
+            binimage = 'Dysnomia'
+        is_exe = lambda fpath: os.path.isfile(fpath) and os.access(fpath, os.X_OK)
 
-        if not os.path.exists(DYSNOMIA):
-            wx.MessageBox(''' Dysnomia is not installed. Please download it from
-    https://jp-minerals.org/dysnomia/en/
-    and install it at.'''+DYSNOMIA,
-                caption='Dysnomia not installed',style=wx.ICON_ERROR)
+        path2GSAS2 = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
+        pathlist = (GSASIIpath.path2GSAS2,
+                    os.path.expanduser('~'),
+                    os.path.expanduser(os.path.join('~','.GSASII')))
+        locations = []
+        for path in pathlist:
+            DYSNOMIA = os.path.join(path,'Dysnomia',binimage)
+            locations.append(DYSNOMIA)
+            if not os.path.exists(DYSNOMIA): continue
+            if is_exe(DYSNOMIA):
+                break
+        else:
+            print(f"File {binimage!r} not found."
+                  f"\nThe following locations were checked:\n\t{'\n\t'.join(locations)}")
+            msg = f'''Dysnomia is not installed. Please download it from
+https://jp-minerals.org/dysnomia/en/ and install the 
+downloaded directory (which includes file {binimage!r})
+at one of the following locations:
+\t{'\n\t'.join(pathlist)}'''
+            G2G.ShowWebPage("https://jp-minerals.org/dysnomia/en/",G2frame)
+            G2G.ShowScrolledInfo(G2frame,msg,header='Install Dysnomia',
+                                     width=350,height=150)
             return
 
+        DysData = data['Dysnomia']
         generalData = data['General']
         Map = generalData['Map']
         UseList = Map['RefList']
@@ -13145,8 +13165,8 @@ def FillMenus():
         # Dysnomia (MEM)
         if data['General']['doDysnomia']:
             FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.MEMMenu)
-            G2frame.Bind(wx.EVT_MENU,OnLoadDysnomia,id=G2G.wxID_LOADDYSNOMIA)
-            G2frame.Bind(wx.EVT_MENU,OnSaveDysnomia,id=G2G.wxID_SAVEDYSNOMIA)
+            #G2frame.Bind(wx.EVT_MENU,OnLoadDysnomia,id=G2G.wxID_LOADDYSNOMIA)
+            #G2frame.Bind(wx.EVT_MENU,OnSaveDysnomia,id=G2G.wxID_SAVEDYSNOMIA)
             G2frame.Bind(wx.EVT_MENU,OnRunDysnomia,id=G2G.wxID_RUNDYSNOMIA)
         # Stacking faults
         FillSelectPageMenu(TabSelectionIdDict, G2frame.dataWindow.LayerData)

docs/source/packages.rst

@@ -502,7 +502,22 @@ as part of the GSAS-II distribution and must be installed separately:
 
   **Dysnomia**
     Computes enhanced Fourier maps with Maximum Entropy estimated
-    extension of the reflection sphere. See https://jp-minerals.org/dysnomia/en/.
+    extension of the reflection sphere. See
+    https://jp-minerals.org/dysnomia/en/.
+    The appropriate zip/dmg/tar file must be downloaded from that web
+    site and the directory Dysnomia from that download must be placed
+    in one of the following locations:
+    
+      * the user's home directory (``~/.``),
+      * the directory ``~/.GSASII`` or
+      * the ``GSASII`` directory where GSAS-II has been installed
+        (this will be where the GSAS-II Python files are found).
+        
+    For Windows the home directory, ``~``, is usually
+    taken from the USERPROFILE setting or a combination of HOMEPATH
+    and HOMEDRIVE, so these directories will usually have form 
+    ``C:\\Users\\YourUsername`` or
+    ``C:\\Users\\YourUsername\\.GSASII``. 
 
   **RMCProfile**
     Provides large-box PDF & S(Q) fitting. The GSAS-II interface was originally