diff --git a/Dans_Diffraction/classes_properties.py b/Dans_Diffraction/classes_properties.py index a302968..98a2eab 100644 --- a/Dans_Diffraction/classes_properties.py +++ b/Dans_Diffraction/classes_properties.py @@ -575,7 +575,7 @@ def beamline_info(self, energy_kev=None): out += ' Formula: {}\n'.format(self.molname()) out += 'Magnetic: {}\n'.format(self.xtl.Structure.ismagnetic()) out += ' Weight: %5.2f g/mol\n' % (self.weight()) - out += ' Density: %5.2f g/cm\n' % (self.density()) + out += ' Density: %5.2f g/cm^3\n' % (self.density()) # Symmetry out += '\nSymmetry: %r\n' % self.xtl.Symmetry # Cell info @@ -612,7 +612,7 @@ def info(self): out += '-----------%s-----------\n'%self.xtl.name out += ' Weight: %5.2f g/mol\n' %(self.weight()) out += ' Volume: %5.2f A^3\n' %(self.volume()) - out += 'Density: %5.2f g/cm\n' %(self.density()) + out += 'Density: %5.2f g/cm^3\n' %(self.density()) out += '\nAtoms:\n' types = np.unique(self.xtl.Structure.type) props = fc.atom_properties(types) # returns a numpy structured array diff --git a/Dans_Diffraction/tkgui/crystal.py b/Dans_Diffraction/tkgui/crystal.py index 0210e06..64eaa73 100644 --- a/Dans_Diffraction/tkgui/crystal.py +++ b/Dans_Diffraction/tkgui/crystal.py @@ -75,6 +75,7 @@ def __init__(self, xtl=None): 'Element Info': { 'Element Info': self.menu_info_elements, 'Periodic Table': self.menu_info_table, + 'X-Ray Interactions': self.menu_xray_interactions, }, 'Help': { 'Help': popup_help, @@ -245,6 +246,11 @@ def menu_info_table(self): """Open periodic table""" PeriodTableGui() + def menu_xray_interactions(self): + """Open x-ray interactions gui""" + from .properties import XrayInteractionsGui + XrayInteractionsGui(self.xtl) + def menu_examples(self): """List example files, open in system viewer""" import subprocess, platform, ast