Skip to content

Commit

Permalink
Version 2.2.3
Browse files Browse the repository at this point in the history
Updated docs and added binder link
  • Loading branch information
DanPorter committed Mar 12, 2023
1 parent 6be78ef commit 9b0d562
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 29 deletions.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Dans_Diffaction
Reads crystallographic cif files and simulates diffraction, among other things.
Reads crystallographic cif files, calculates crystal properties and simulates diffraction.

**Version 2.2**

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3859501.svg)](https://doi.org/10.5281/zenodo.3859501)
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/DanPorter/Dans_Diffraction/6be78ef800167276d61d3e73da3b74a8367dbbe7?urlpath=lab%2Ftree%2FDans_Diffraction.ipynb)
[![](https://img.shields.io/github/forks/DanPorter/Dans_Diffraction?label=GitHub%20Repo&style=social)](https://github.com/DanPorter/Dans_Diffraction)


By Dan Porter, Diamond Light Source
2022
2023

#### TL;DR:
```text
Expand All @@ -31,6 +34,8 @@ xtl.start_gui()

Full code documentation available [here](https://danporter.github.io/Dans_Diffraction/).

Try it out on [mybinder!](https://mybinder.org/v2/gh/DanPorter/Dans_Diffraction/6be78ef800167276d61d3e73da3b74a8367dbbe7?urlpath=lab%2Ftree%2FDans_Diffraction.ipynb)

For comments, queries or bugs - email [dan.porter@diamond.ac.uk](mailto:dan.porter@diamond.ac.uk)

**Citation:** If you use this code (great!), please cite the published DOI: [10.5281/zenodo.3859501](https://doi.org/10.5281/zenodo.3859501)
Expand Down
7 changes: 4 additions & 3 deletions docs/Dans_Diffraction.classes_scattering.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom>&nbsp;<br>
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.classes_scattering</strong></big></big> (version 2.1.0)</font></td
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.classes_scattering</strong></big></big> (version 2.1.1)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:c%3A%5Cusers%5Cdgpor%5Conedrive%20-%20diamond%20light%20source%20ltd%5Cpythonprojects%5Cdans_diffraction%5Cdans_diffraction%5Cclasses_scattering.py">c:\users\dgpor\onedrive - diamond light source ltd\pythonprojects\dans_diffraction\dans_diffraction\classes_scattering.py</a></font></td></tr></table>
<p><tt><a href="#Scattering">Scattering</a>&nbsp;Class&nbsp;"classes_scattering.py"<br>
Expand All @@ -16,8 +16,8 @@
Diamond<br>
2017<br>
&nbsp;<br>
Version&nbsp;2.1.0<br>
Last&nbsp;updated:&nbsp;14/03/22<br>
Version&nbsp;2.1.1<br>
Last&nbsp;updated:&nbsp;14/01/23<br>
&nbsp;<br>
Version&nbsp;History:<br>
10/09/17&nbsp;0.1&nbsp;&nbsp;&nbsp;&nbsp;Program&nbsp;created<br>
Expand All @@ -39,6 +39,7 @@
28/09/21&nbsp;2.0.1&nbsp;&nbsp;Added&nbsp;__repr__<br>
08/02/22&nbsp;2.0.3&nbsp;&nbsp;Corrected&nbsp;error&nbsp;in&nbsp;powder&nbsp;of&nbsp;wrong&nbsp;tth&nbsp;values.&nbsp;Thanks&nbsp;Mirko!<br>
14/03/22&nbsp;2.1.0&nbsp;&nbsp;&nbsp;powder()&nbsp;updated&nbsp;for&nbsp;new&nbsp;inputs&nbsp;and&nbsp;outputs&nbsp;for&nbsp;pVoight&nbsp;and&nbsp;custom&nbsp;peak&nbsp;shapes.&nbsp;Thanks&nbsp;yevgenyr!<br>
14/01/23&nbsp;2.1.1&nbsp;&nbsp;Corrected&nbsp;background&nbsp;error&nbsp;in&nbsp;xtl.Scatter.powder<br>
&nbsp;<br>
@author:&nbsp;DGPorter</tt></p>
<p>
Expand Down
7 changes: 4 additions & 3 deletions docs/Dans_Diffraction.functions_crystallography.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom>&nbsp;<br>
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.functions_crystallography</strong></big></big> (version 3.7.1)</font></td
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.functions_crystallography</strong></big></big> (version 3.7.2)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:c%3A%5Cusers%5Cdgpor%5Conedrive%20-%20diamond%20light%20source%20ltd%5Cpythonprojects%5Cdans_diffraction%5Cdans_diffraction%5Cfunctions_crystallography.py">c:\users\dgpor\onedrive - diamond light source ltd\pythonprojects\dans_diffraction\dans_diffraction\functions_crystallography.py</a></font></td></tr></table>
<p><tt>Module:&nbsp;functions_crystallography.py<br>
Expand All @@ -20,8 +20,8 @@
&nbsp;&nbsp;&nbsp;&nbsp;OR<br>
&nbsp;&nbsp;&nbsp;&nbsp;-&nbsp;from&nbsp;Dans_Diffraction&nbsp;import&nbsp;functions_crystallography&nbsp;as&nbsp;fc<br>
&nbsp;<br>
Version&nbsp;3.7.1<br>
Last&nbsp;updated:&nbsp;12/01/22<br>
Version&nbsp;3.7.2<br>
Last&nbsp;updated:&nbsp;23/04/22<br>
&nbsp;<br>
Version&nbsp;History:<br>
09/07/15&nbsp;0.1&nbsp;&nbsp;&nbsp;&nbsp;Version&nbsp;History&nbsp;started.<br>
Expand All @@ -48,6 +48,7 @@
10/06/21&nbsp;3.6&nbsp;&nbsp;&nbsp;&nbsp;Corrected&nbsp;mistake&nbsp;in&nbsp;DebyeWaller&nbsp;function.&nbsp;Added&nbsp;x-ray&nbsp;scattering&nbsp;factors&nbsp;from&nbsp;Waasmaier&nbsp;and&nbsp;Kirfel<br>
15/11/21&nbsp;3.7&nbsp;&nbsp;&nbsp;&nbsp;Added&nbsp;diffractometer&nbsp;orientation&nbsp;commands&nbsp;from&nbsp;Busing&nbsp;&amp;&nbsp;Levy,&nbsp;H.&nbsp;You<br>
12/01/22&nbsp;3.7.1&nbsp;&nbsp;Added&nbsp;gen_sym_axial_vector<br>
23/04/22&nbsp;3.7.2&nbsp;&nbsp;Corrected&nbsp;magnitude&nbsp;of&nbsp;Q&nbsp;in&nbsp;magnetic_structure_factors<br>
&nbsp;<br>
Acknoledgements:<br>
&nbsp;&nbsp;&nbsp;&nbsp;April&nbsp;2020&nbsp;&nbsp;Thanks&nbsp;to&nbsp;ChunHai&nbsp;Wang&nbsp;for&nbsp;helpful&nbsp;suggestions&nbsp;in&nbsp;readcif!<br>
Expand Down
1 change: 0 additions & 1 deletion docs/Dans_Diffraction.functions_general.html
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,6 @@
<strong>Cu</strong> = 8.048<br>
<strong>Mo</strong> = 17.4808<br>
<strong>Na</strong> = 6.022e+23<br>
<strong>__warningregistry__</strong> = {'version': 4}<br>
<strong>c</strong> = 299792458<br>
<strong>directory</strong> = r'C:\Users\dgpor\OneDrive - Diamond Light Source Ltd\PythonProjects\Dans_Diffraction\Dans_Diffraction'<br>
<strong>e</strong> = 1.6021733e-19<br>
Expand Down
23 changes: 18 additions & 5 deletions docs/Dans_Diffraction.functions_plotting.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom>&nbsp;<br>
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.functions_plotting</strong></big></big> (version 1.9)</font></td
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong><a href="Dans_Diffraction.html"><font color="#ffffff">Dans_Diffraction</font></a>.functions_plotting</strong></big></big> (version 2.1)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:c%3A%5Cusers%5Cdgpor%5Conedrive%20-%20diamond%20light%20source%20ltd%5Cpythonprojects%5Cdans_diffraction%5Cdans_diffraction%5Cfunctions_plotting.py">c:\users\dgpor\onedrive - diamond light source ltd\pythonprojects\dans_diffraction\dans_diffraction\functions_plotting.py</a></font></td></tr></table>
<p><tt>Module:&nbsp;Handy&nbsp;plotting&nbsp;functions&nbsp;"functions_plotting.py"<br>
Expand All @@ -25,8 +25,8 @@
All&nbsp;plots&nbsp;generated&nbsp;require&nbsp;plt.show()&nbsp;call,&nbsp;unless&nbsp;using&nbsp;interactive&nbsp;mode<br>
&nbsp;<br>
&nbsp;<br>
Version&nbsp;2.0<br>
Last&nbsp;updated:&nbsp;27/09/21<br>
Version&nbsp;2.1<br>
Last&nbsp;updated:&nbsp;10/08/22<br>
&nbsp;<br>
Version&nbsp;History:<br>
06/01/18&nbsp;1.0&nbsp;&nbsp;&nbsp;&nbsp;Program&nbsp;created&nbsp;from&nbsp;DansGeneralProgs.py&nbsp;V2.3<br>
Expand All @@ -41,6 +41,7 @@
22/11/20&nbsp;1.9&nbsp;&nbsp;&nbsp;&nbsp;Update&nbsp;to&nbsp;labels&nbsp;to&nbsp;fix&nbsp;3D&nbsp;plotting<br>
15/02/21&nbsp;1.9.1&nbsp;&nbsp;Update&nbsp;to&nbsp;vecplot&nbsp;for&nbsp;plotting&nbsp;on&nbsp;axis<br>
27/09/21&nbsp;2.0&nbsp;&nbsp;&nbsp;&nbsp;Added&nbsp;plot3darray,&nbsp;plot_diffractometer_reciprocal_space<br>
10/08/22&nbsp;2.1&nbsp;&nbsp;&nbsp;&nbsp;Added&nbsp;plot_lattice_points3D,&nbsp;set_plot_defaults,&nbsp;changed&nbsp;default&nbsp;fig&nbsp;size<br>
&nbsp;<br>
@author:&nbsp;DGPorter</tt></p>
<p>
Expand Down Expand Up @@ -1152,6 +1153,12 @@
:param&nbsp;color:&nbsp;default&nbsp;'b'<br>
:param&nbsp;marker:&nbsp;default&nbsp;'o'<br>
:return:&nbsp;None</tt></dd></dl>
<dl><dt><a name="-plot_lattice_points3D"><strong>plot_lattice_points3D</strong></a>(Q, point_size=None, color=None, cmap=None)</dt><dd><tt>Plot&nbsp;lattice&nbsp;points&nbsp;is&nbsp;3D&nbsp;reciprocal&nbsp;space<br>
:param&nbsp;Q:&nbsp;[nx3]&nbsp;array&nbsp;of&nbsp;wavevector&nbsp;transfer&nbsp;positions&nbsp;in&nbsp;reciprocal&nbsp;space,&nbsp;units&nbsp;A^-1<br>
:param&nbsp;point_size:&nbsp;scalar&nbsp;or&nbsp;array&nbsp;of&nbsp;length&nbsp;n,&nbsp;determines&nbsp;each&nbsp;point&nbsp;size&nbsp;(for&nbsp;intensity),&nbsp;in&nbsp;pixels<br>
:param&nbsp;color:&nbsp;colour&nbsp;specifier,&nbsp;can&nbsp;be&nbsp;a&nbsp;list&nbsp;of&nbsp;values&nbsp;length&nbsp;n<br>
:param&nbsp;cmap:&nbsp;str&nbsp;name&nbsp;of&nbsp;colormap&nbsp;to&nbsp;use&nbsp;if&nbsp;color&nbsp;is&nbsp;a&nbsp;list&nbsp;of&nbsp;values<br>
:return:</tt></dd></dl>
<dl><dt><a name="-plot_magnetic_form_factor"><strong>plot_magnetic_form_factor</strong></a>(elements, maxq=10)</dt><dd><tt>Plot&nbsp;magnetic&nbsp;form&nbsp;factor&nbsp;for&nbsp;1&nbsp;or&nbsp;more&nbsp;elements<br>
:param&nbsp;elements:<br>
:return:&nbsp;None</tt></dd></dl>
Expand Down Expand Up @@ -1206,6 +1213,11 @@
<a href="#-saveplot">saveplot</a>('test')<br>
E.G.<br>
<a href="#-saveplot">saveplot</a>('c:\somedirpicture.jpg',&nbsp;dpi=600,&nbsp;figure=3)</tt></dd></dl>
<dl><dt><a name="-set_plot_defaults"><strong>set_plot_defaults</strong></a>(rcdefaults=False)</dt><dd><tt>Set&nbsp;custom&nbsp;matplotlib&nbsp;rcparams,&nbsp;or&nbsp;revert&nbsp;to&nbsp;matplotlib&nbsp;defaults<br>
These&nbsp;handle&nbsp;the&nbsp;default&nbsp;look&nbsp;of&nbsp;matplotlib&nbsp;plots<br>
See:&nbsp;https://matplotlib.org/stable/tutorials/introductory/customizing.html#the-default-matplotlibrc-file<br>
:param&nbsp;rcdefaults:&nbsp;False*/&nbsp;True,&nbsp;if&nbsp;True,&nbsp;revert&nbsp;to&nbsp;matplotlib&nbsp;defaults<br>
:return:&nbsp;None</tt></dd></dl>
<dl><dt><a name="-sliderplot"><strong>sliderplot</strong></a>(YY, X=None, slidervals=None, *args, **kwargs)</dt><dd><tt>Shortcut&nbsp;to&nbsp;creating&nbsp;a&nbsp;simple&nbsp;2D&nbsp;plot&nbsp;with&nbsp;a&nbsp;slider&nbsp;to&nbsp;go&nbsp;through&nbsp;a&nbsp;third&nbsp;dimension<br>
YY&nbsp;=&nbsp;[nxm]:&nbsp;y&nbsp;axis&nbsp;data&nbsp;(initially&nbsp;plots&nbsp;Y[0,:])<br>
&nbsp;X&nbsp;=&nbsp;[n]&nbsp;or&nbsp;[nxm]:&nbsp;&nbsp;x&nbsp;axis&nbsp;data&nbsp;(can&nbsp;be&nbsp;1D&nbsp;or&nbsp;2D,&nbsp;either&nbsp;same&nbsp;length&nbsp;or&nbsp;shape&nbsp;as&nbsp;Y)<br>
Expand Down Expand Up @@ -1237,6 +1249,7 @@

<tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
<td width="100%"><strong>DEFAULT_FONT</strong> = 'Times New Roman'<br>
<strong>FIGURE_DPI</strong> = 60<br>
<strong>FIGURE_SIZE</strong> = [12, 10]</td></tr></table>
<strong>DEFAULT_FONTSIZE</strong> = 14<br>
<strong>FIGURE_DPI</strong> = 80<br>
<strong>FIGURE_SIZE</strong> = [12, 8]</td></tr></table>
</body></html>
13 changes: 8 additions & 5 deletions docs/Dans_Diffraction.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom>&nbsp;<br>
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>Dans_Diffraction</strong></big></big> (version 2.2.0, 14/03/22)</font></td
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>Dans_Diffraction</strong></big></big> (version 2.2.3, 14/01/23)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:c%3A%5Cusers%5Cdgpor%5Conedrive%20-%20diamond%20light%20source%20ltd%5Cpythonprojects%5Cdans_diffraction%5Cdans_diffraction%5C__init__.py">c:\users\dgpor\onedrive - diamond light source ltd\pythonprojects\dans_diffraction\dans_diffraction\__init__.py</a></font></td></tr></table>
<p><tt>Dans_Diffraction<br>
Expand Down Expand Up @@ -41,8 +41,8 @@
Diamond<br>
2017<br>
&nbsp;<br>
Version&nbsp;2.2.0<br>
Last&nbsp;updated:&nbsp;14/03/21<br>
Version&nbsp;2.2.3<br>
Last&nbsp;updated:&nbsp;14/01/23<br>
&nbsp;<br>
Version&nbsp;History:<br>
02/03/18&nbsp;1.0&nbsp;&nbsp;&nbsp;&nbsp;Version&nbsp;History&nbsp;started.<br>
Expand Down Expand Up @@ -72,10 +72,13 @@
27/09/21&nbsp;2.1.0&nbsp;&nbsp;Added&nbsp;classes_orientation&nbsp;and&nbsp;diffractometer&nbsp;orientation&nbsp;functions<br>
15/11/21&nbsp;2.1.1&nbsp;&nbsp;Updated&nbsp;Plot.plot_crystal,&nbsp;added&nbsp;additional&nbsp;orientation&nbsp;functions<br>
07/02/22&nbsp;2.1.2&nbsp;&nbsp;Corrected&nbsp;error&nbsp;in&nbsp;classes_scattering.powder()&nbsp;of&nbsp;wrong&nbsp;tth&nbsp;values.&nbsp;Thanks&nbsp;Mirko!<br>
14/03/22&nbsp;2.2.0&nbsp;&nbsp;Sactter.powder()&nbsp;updated&nbsp;for&nbsp;new&nbsp;inputs&nbsp;and&nbsp;outputs&nbsp;for&nbsp;pVoight&nbsp;and&nbsp;custom&nbsp;peak&nbsp;shapes.&nbsp;Thanks&nbsp;yevgenyr!<br>
14/03/22&nbsp;2.2.0&nbsp;&nbsp;Scatter.powder()&nbsp;updated&nbsp;for&nbsp;new&nbsp;inputs&nbsp;and&nbsp;outputs&nbsp;for&nbsp;pVoight&nbsp;and&nbsp;custom&nbsp;peak&nbsp;shapes.&nbsp;Thanks&nbsp;yevgenyr!<br>
23/07/22&nbsp;2.2.1&nbsp;&nbsp;Fixed&nbsp;error&nbsp;in&nbsp;MultiCrystal.Scatter<br>
06/01/23&nbsp;2.2.2&nbsp;&nbsp;Removed&nbsp;redundent&nbsp;references&nbsp;to&nbsp;np.float<br>
14/01/23&nbsp;2.2.3&nbsp;&nbsp;Corrected&nbsp;background&nbsp;error&nbsp;in&nbsp;xtl.Scatter.powder<br>
&nbsp;<br>
-----------------------------------------------------------------------------<br>
&nbsp;&nbsp;&nbsp;Copyright&nbsp;2022&nbsp;Diamond&nbsp;Light&nbsp;Source&nbsp;Ltd.<br>
&nbsp;&nbsp;&nbsp;Copyright&nbsp;2023&nbsp;Diamond&nbsp;Light&nbsp;Source&nbsp;Ltd.<br>
&nbsp;<br>
&nbsp;&nbsp;&nbsp;Licensed&nbsp;under&nbsp;the&nbsp;Apache&nbsp;License,&nbsp;Version&nbsp;2.0&nbsp;(the&nbsp;"License");<br>
&nbsp;&nbsp;&nbsp;you&nbsp;may&nbsp;not&nbsp;use&nbsp;this&nbsp;file&nbsp;except&nbsp;in&nbsp;compliance&nbsp;with&nbsp;the&nbsp;License.<br>
Expand Down
16 changes: 11 additions & 5 deletions docs/Dans_Diffraction.tkgui.basic_widgets.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,25 @@
<font color="#000000" face="helvetica, arial"><a name="SelectionBox">class <strong>SelectionBox</strong></a>(<a href="builtins.html#object">builtins.object</a>)</font></td></tr>

<tr bgcolor="#ffc8d8"><td rowspan=2><tt>&nbsp;&nbsp;&nbsp;</tt></td>
<td colspan=2><tt><a href="#SelectionBox">SelectionBox</a>(parent,&nbsp;data_fields,&nbsp;current_selection=[],&nbsp;title='Make&nbsp;a&nbsp;selection',&nbsp;multiselect=True)<br>
<td colspan=2><tt><a href="#SelectionBox">SelectionBox</a>(parent,&nbsp;data_fields,&nbsp;current_selection=(),&nbsp;title='Make&nbsp;a&nbsp;selection',&nbsp;multiselect=True)<br>
&nbsp;<br>
Displays&nbsp;all&nbsp;data&nbsp;fields&nbsp;and&nbsp;returns&nbsp;a&nbsp;selection<br>
Making&nbsp;a&nbsp;selection&nbsp;returns&nbsp;a&nbsp;list&nbsp;of&nbsp;field&nbsp;strings<br>
&nbsp;<br>
out&nbsp;=&nbsp;<a href="#SelectionBox">SelectionBox</a>(['field1','field2','field3'],&nbsp;current_selection=['field2'],&nbsp;title='',&nbsp;multiselect=False)<br>
out&nbsp;=&nbsp;<a href="#SelectionBox">SelectionBox</a>(['field1','field2','field3'],&nbsp;current_selection=['field2'],&nbsp;title='',&nbsp;multiselect=False).<a href="#SelectionBox-show">show</a>()<br>
#&nbsp;Make&nbsp;selection&nbsp;and&nbsp;press&nbsp;"Select"&nbsp;&gt;&nbsp;box&nbsp;disappears<br>
out.output&nbsp;=&nbsp;['list','of','strings']<br>&nbsp;</tt></td></tr>
out&nbsp;=&nbsp;['list','of','strings']<br>&nbsp;</tt></td></tr>
<tr><td>&nbsp;</td>
<td width="100%">Methods defined here:<br>
<dl><dt><a name="SelectionBox-__init__"><strong>__init__</strong></a>(self, parent, data_fields, current_selection=[], title='Make a selection', multiselect=True)</dt><dd><tt>Initialize&nbsp;self.&nbsp;&nbsp;See&nbsp;help(type(self))&nbsp;for&nbsp;accurate&nbsp;signature.</tt></dd></dl>
<dl><dt><a name="SelectionBox-__init__"><strong>__init__</strong></a>(self, parent, data_fields, current_selection=(), title='Make a selection', multiselect=True)</dt><dd><tt>Initialize&nbsp;self.&nbsp;&nbsp;See&nbsp;help(type(self))&nbsp;for&nbsp;accurate&nbsp;signature.</tt></dd></dl>

<dl><dt><a name="SelectionBox-f_exit"><strong>f_exit</strong></a>(self)</dt><dd><tt>Closes&nbsp;the&nbsp;current&nbsp;data&nbsp;window</tt></dd></dl>
<dl><dt><a name="SelectionBox-f_exit"><strong>f_exit</strong></a>(self, event=None)</dt><dd><tt>Closes&nbsp;the&nbsp;current&nbsp;data&nbsp;window</tt></dd></dl>

<dl><dt><a name="SelectionBox-fun_exitbutton"><strong>fun_exitbutton</strong></a>(self, event=None)</dt><dd><tt>Closes&nbsp;the&nbsp;current&nbsp;data&nbsp;window&nbsp;and&nbsp;generates&nbsp;output</tt></dd></dl>

<dl><dt><a name="SelectionBox-fun_listboxselect"><strong>fun_listboxselect</strong></a>(self, event=None)</dt><dd><tt>Update&nbsp;label&nbsp;on&nbsp;listbox&nbsp;selection</tt></dd></dl>

<dl><dt><a name="SelectionBox-fun_search"><strong>fun_search</strong></a>(self, event=None)</dt><dd><tt>Search&nbsp;the&nbsp;selection&nbsp;for&nbsp;string</tt></dd></dl>

<dl><dt><a name="SelectionBox-show"><strong>show</strong></a>(self)</dt><dd><tt>Run&nbsp;the&nbsp;selection&nbsp;box,&nbsp;wait&nbsp;for&nbsp;response</tt></dd></dl>

Expand Down
13 changes: 8 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
<tr bgcolor="#7799ee">
<td valign=bottom>&nbsp;<br>
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>Dans_Diffraction</strong></big></big> (version 2.2.0, 14/03/22)</font></td
<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>Dans_Diffraction</strong></big></big> (version 2.2.3, 14/01/23)</font></td
><td align=right valign=bottom
><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="file:c%3A%5Cusers%5Cdgpor%5Conedrive%20-%20diamond%20light%20source%20ltd%5Cpythonprojects%5Cdans_diffraction%5Cdans_diffraction%5C__init__.py">c:\users\dgpor\onedrive - diamond light source ltd\pythonprojects\dans_diffraction\dans_diffraction\__init__.py</a></font></td></tr></table>
<p><tt>Dans_Diffraction<br>
Expand Down Expand Up @@ -41,8 +41,8 @@
Diamond<br>
2017<br>
&nbsp;<br>
Version&nbsp;2.2.0<br>
Last&nbsp;updated:&nbsp;14/03/21<br>
Version&nbsp;2.2.3<br>
Last&nbsp;updated:&nbsp;14/01/23<br>
&nbsp;<br>
Version&nbsp;History:<br>
02/03/18&nbsp;1.0&nbsp;&nbsp;&nbsp;&nbsp;Version&nbsp;History&nbsp;started.<br>
Expand Down Expand Up @@ -72,10 +72,13 @@
27/09/21&nbsp;2.1.0&nbsp;&nbsp;Added&nbsp;classes_orientation&nbsp;and&nbsp;diffractometer&nbsp;orientation&nbsp;functions<br>
15/11/21&nbsp;2.1.1&nbsp;&nbsp;Updated&nbsp;Plot.plot_crystal,&nbsp;added&nbsp;additional&nbsp;orientation&nbsp;functions<br>
07/02/22&nbsp;2.1.2&nbsp;&nbsp;Corrected&nbsp;error&nbsp;in&nbsp;classes_scattering.powder()&nbsp;of&nbsp;wrong&nbsp;tth&nbsp;values.&nbsp;Thanks&nbsp;Mirko!<br>
14/03/22&nbsp;2.2.0&nbsp;&nbsp;Sactter.powder()&nbsp;updated&nbsp;for&nbsp;new&nbsp;inputs&nbsp;and&nbsp;outputs&nbsp;for&nbsp;pVoight&nbsp;and&nbsp;custom&nbsp;peak&nbsp;shapes.&nbsp;Thanks&nbsp;yevgenyr!<br>
14/03/22&nbsp;2.2.0&nbsp;&nbsp;Scatter.powder()&nbsp;updated&nbsp;for&nbsp;new&nbsp;inputs&nbsp;and&nbsp;outputs&nbsp;for&nbsp;pVoight&nbsp;and&nbsp;custom&nbsp;peak&nbsp;shapes.&nbsp;Thanks&nbsp;yevgenyr!<br>
23/07/22&nbsp;2.2.1&nbsp;&nbsp;Fixed&nbsp;error&nbsp;in&nbsp;MultiCrystal.Scatter<br>
06/01/23&nbsp;2.2.2&nbsp;&nbsp;Removed&nbsp;redundent&nbsp;references&nbsp;to&nbsp;np.float<br>
14/01/23&nbsp;2.2.3&nbsp;&nbsp;Corrected&nbsp;background&nbsp;error&nbsp;in&nbsp;xtl.Scatter.powder<br>
&nbsp;<br>
-----------------------------------------------------------------------------<br>
&nbsp;&nbsp;&nbsp;Copyright&nbsp;2022&nbsp;Diamond&nbsp;Light&nbsp;Source&nbsp;Ltd.<br>
&nbsp;&nbsp;&nbsp;Copyright&nbsp;2023&nbsp;Diamond&nbsp;Light&nbsp;Source&nbsp;Ltd.<br>
&nbsp;<br>
&nbsp;&nbsp;&nbsp;Licensed&nbsp;under&nbsp;the&nbsp;Apache&nbsp;License,&nbsp;Version&nbsp;2.0&nbsp;(the&nbsp;"License");<br>
&nbsp;&nbsp;&nbsp;you&nbsp;may&nbsp;not&nbsp;use&nbsp;this&nbsp;file&nbsp;except&nbsp;in&nbsp;compliance&nbsp;with&nbsp;the&nbsp;License.<br>
Expand Down

0 comments on commit 9b0d562

Please sign in to comment.