Skip to content

Commit d2592fa

Browse files
committed
Version 1.8.2
Magnetic spacegroup positions added, write_mcif added, various improvements. Tensor_Scattering removed.
1 parent 8754bfa commit d2592fa

17 files changed

+178596
-3364
lines changed

Dans_Diffraction/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ The *Crystal* object has the structure:
1818
xtl = dif.Crystal('file.cif')
1919
xtl.Cell # Cell properties - lattice parameters, generation of direct and recriprocal lattice
2020
xtl.Symmetry # Symmetry properties - contains symmetry operations and functions to apply symmetry to positions & reflections.
21-
xtl.Atoms # Atomic site properties - describes atoms at symmetric sites
22-
xtl.Structure # Atomic site properties - describes atoms at all positions in unit cell
21+
xtl.Atoms # Symmetically unique Atomic sites - describes atoms at symmetric sites
22+
xtl.Structure # All Atomic sites - describes atoms at all positions in unit cell
2323
xtl.Plot # Plot functions - Various Plotting methods to produce graphed output
2424
xtl.Scatter # Scattering & Diffraction functions - calculate various types of scattering based on the crystal structure.
2525
xtl.Properties # Various functions - calculate various crystal properties

Dans_Diffraction/Structures/Sr3LiRuO6_C2'c'.mcif

Lines changed: 67 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
1-
# This file was generated by ISODISTORT, version 6.3.1
1+
# This file was generated by ISODISTORT, version 6.3.4
22
# Harold T. Stokes, Branton J. Campbell, David Tanner, Dorian M. Hatch
33
# Brigham Young University, Provo, Utah, USA
44
#
55
# Space Group: 167 R-3c D3d-6
66
# Default space-group preferences: monoclinic axes a(b)c, monoclinic cell choice 1, orthorhombic axes abc, origin choice 2, hexagonal axes, SSG standard setting
7-
# Lattice parameters: a=9.63320, b=9.63320, c=11.09710, alpha=90.00000, beta=90.00000, gamma=120.00000
7+
# Lattice parameters: a=9.62020, b=9.62020, c=11.08130, alpha=90.00000, beta=90.00000, gamma=120.00000
88
# Ru1 6b (0,0,0)
9-
# Sr1 18e (x,0,1/4), x=-0.35868
10-
# O1 36f (x,y,z), x=0.49243, y=0.18049, z=0.22873
11-
# Li 6a (0,0,1/4)
9+
# Sr1 18e (x,0,1/4), x=-0.35893
10+
# O1 36f (x,y,z), x=-0.02190, y=-0.17430, z=0.10501
11+
# Li1 6a (0,0,1/4)
1212
# k point: GM, k7 (0,0,0)
1313
# IR: mGM3+, mk7t5
1414
# P2 (a,0.577a) 15.89 C2'/c', basis={(-2/3,-1/3,2/3),(0,-1,0),(2/3,1/3,1/3)}, origin=(-1/6,-1/3,1/6), s=1, i=6, k-active= (0,0,0)
15+
# Note that this file uses an alternate (possibly nonstandard) setting of the subgroup chosen by the user:
16+
# basis={(1,0,0),(0,1,0),(0,0,1)}, origin=(0.00000,0.00000,0.00000) with respect to the parent space group
1517
# Order parameter values:
1618
# R-3c[0,0,0]mGM3+(a,0.577a) 15.89 C2'/c' s=1 i=6
17-
# [Ru1:b:mag]Eg*_1(a): 3.45000
18-
# [Ru1:b:mag]Eg*_2(a): -2.15000
19+
# [Ru1:b:mag]Eg*_1(a): 3.00000
20+
# [Ru1:b:mag]Eg*_2(a): -1.73100
1921
# R-3c[0,0,0]mGM2+(a) 167.107 R-3c' s=1 i=2
20-
# [Ru1:b:mag]Ag(a): 1.20000
22+
# [Ru1:b:mag]Ag(a): 1.00000
2123

2224
data_isodistort-output
2325

24-
_cell_length_a 9.25550
25-
_cell_length_b 9.63320
26-
_cell_length_c 6.67950
26+
_cell_length_a 9.62020
27+
_cell_length_b 9.62020
28+
_cell_length_c 11.08130
2729
_cell_angle_alpha 90.00000
28-
_cell_angle_beta 93.30782
29-
_cell_angle_gamma 90.00000
30+
_cell_angle_beta 90.00000
31+
_cell_angle_gamma 120.00000
3032

31-
_space_group.magn_number_BNS "15.89"
32-
_space_group.magn_name_BNS "C2'/c'"
33-
_space_group.magn_point_group "2'/m'"
33+
_space_group_magn.number_BNS "15.89"
34+
_space_group_magn.name_BNS "C2'/c'"
35+
_space_group_magn.number_OG "15.5.96"
36+
_space_group_magn.name_OG "C2'/c'"
37+
_space_group_magn.point_group "2'/m'"
3438

3539
loop_
36-
_space_group_transform_id
37-
_space_group_transform_Pp_abc
38-
_space_group_transform_description
39-
1 a,b,c;0,0,0 "to magnetic BNS, standard ISO C2'/c' setting"
40-
2 a,b,c;0,0,0 "to magnetic OG, standard Litvin C2'/c' setting"
40+
_space_group_magn_transforms.id
41+
_space_group_magn_transforms.Pp_abc
42+
_space_group_magn_transforms.source
43+
1 -2/3a-1/3b+2/3c,-b,2/3a+1/3b+1/3c;1/2,1,-1/2 "BNS"
44+
2 -2/3a-1/3b+2/3c,-b,2/3a+1/3b+1/3c;1/2,1,-1/2 "OG"
4145

4246
loop_
43-
_space_group_symop.magn_id
44-
_space_group_symop.magn_operation_xyz
45-
_space_group_symop.magn_operation_mxmymz
46-
1 x,y,z,+1 mx,my,mz
47-
2 -x,-y,-z,+1 mx,my,mz
48-
3 -x,y,-z+1/2,-1 mx,-my,mz
49-
4 x,-y,z+1/2,-1 mx,-my,mz
50-
5 x+1/2,y+1/2,z,+1 mx,my,mz
51-
6 -x+1/2,-y+1/2,-z,+1 mx,my,mz
52-
7 -x+1/2,y+1/2,-z+1/2,-1 mx,-my,mz
53-
8 x+1/2,-y+1/2,z+1/2,-1 mx,-my,mz
47+
_space_group_symop_magn_operation.id
48+
_space_group_symop_magn_operation.xyz
49+
1 x,y,z,+1
50+
2 -x,-y,-z,+1
51+
3 -x+1/3,-x+y+2/3,-z+1/6,-1
52+
4 x+1/3,x-y+2/3,z+1/6,-1
5453

5554
loop_
56-
_space_group_symop.magn_centering_id
57-
_space_group_symop.magn_centering_xyz
58-
_space_group_symop.magn_centering_mxmymz
59-
1 x,y,z,+1 mx,my,mz
55+
_space_group_symop_magn_centering.id
56+
_space_group_symop_magn_centering.xyz
57+
1 x,y,z,+1
58+
2 x+1/3,y+2/3,z+2/3,+1
59+
3 x+2/3,y+1/3,z+1/3,+1
6060

6161
loop_
6262
_atom_site_label
@@ -67,20 +67,21 @@ _atom_site_fract_x
6767
_atom_site_fract_y
6868
_atom_site_fract_z
6969
_atom_site_occupancy
70-
Ru1_1 Ru 4 c 0.25000 0.25000 0.00000 1.00000
71-
Sr1_1 Sr 8 f 0.67934 0.07066 0.89132 1.00000
72-
Sr1_2 Sr 4 e 0.00000 0.10868 0.25000 1.00000
73-
O1_1 O 8 f 0.23252 0.31572 0.72116 1.00000
74-
O1_2 O 8 f 0.06898 0.34782 0.04824 1.00000
75-
O1_3 O 8 f 0.13470 0.08646 0.91680 1.00000
76-
Li_1 Li 4 e 0.00000 0.75000 0.25000 1.00000
70+
Ru1_1 Ru 24 c 0.33333 0.66667 0.66667 1.00000
71+
Sr1_1 Sr 48 f 0.64107 0.00000 0.25000 1.00000
72+
Sr1_2 Sr 24 e 0.66667 -0.02560 0.58333 1.00000
73+
O1_1 O 48 f 0.31143 0.49237 0.77168 1.00000
74+
O1_2 O 48 f 0.50763 0.81907 0.77168 1.00000
75+
O1_3 O 48 f 0.18093 0.68857 0.77168 1.00000
76+
Li1_1 Li 24 e 0.66667 0.33333 0.58333 1.00000
7777

7878
loop_
79-
_atom_site_moment_label
80-
_atom_site_moment_crystalaxis_x
81-
_atom_site_moment_crystalaxis_y
82-
_atom_site_moment_crystalaxis_z
83-
Ru1_1 0.76143 -2.87282 0.43320
79+
_atom_site_moment.label
80+
_atom_site_moment.crystalaxis_x
81+
_atom_site_moment.crystalaxis_y
82+
_atom_site_moment.crystalaxis_z
83+
_atom_site_moment.symmform
84+
Ru1_1 0.00074 2.44949 0.70711 mx,my,mz
8485

8586
_iso_displacivemode_number 0
8687

@@ -91,31 +92,31 @@ loop_
9192
_iso_magneticmode_ID
9293
_iso_magneticmode_label
9394
_iso_magneticmode_value
94-
1 R-3c[0,0,0]mGM3+(a,0.577a)[Ru1:b:mag]Eg*_1(a) 3.45000
95-
2 R-3c[0,0,0]mGM3+(a,0.577a)[Ru1:b:mag]Eg*_2(a) -2.15000
96-
3 R-3c[0,0,0]mGM2+(a)[Ru1:b:mag]Ag(a) 1.20000
95+
1 R-3c[0,0,0]mGM3+(a,0.577a)[Ru1:b:mag]Eg*_1(a) 3.00000
96+
2 R-3c[0,0,0]mGM3+(a,0.577a)[Ru1:b:mag]Eg*_2(a) -1.73100
97+
3 R-3c[0,0,0]mGM2+(a)[Ru1:b:mag]Ag(a) 1.00000
9798

9899
loop_
99100
_iso_magneticmodenorm_ID
100101
_iso_magneticmodenorm_value
101-
1 0.06357
102-
2 0.07340
103-
3 0.06372
102+
1 0.06365
103+
2 0.07350
104+
3 0.06381
104105

105106
loop_
106107
_iso_deltamoment_ID
107108
_iso_deltamoment_label
108109
_iso_deltamoment_value
109-
1 Ru1_1_dmx 0.76143
110-
2 Ru1_1_dmy -2.87282
111-
3 Ru1_1_dmz 0.43320
110+
1 Ru1_1_dmy 2.44949
111+
2 Ru1_1_dmy 2.44949
112+
3 Ru1_1_dmy 2.44949
112113

113114
loop_
114115
_iso_moment_label
115116
_iso_moment_formula
116-
Ru1_1_mx "0 + Ru1_1_dmx"
117-
Ru1_1_my "0 + Ru1_1_dmy"
118-
Ru1_1_mz "0 + Ru1_1_dmz"
117+
Ru1_1_mx "0 + 2*Ru1_1_dmy + 2*Ru1_1_dmy"
118+
Ru1_1_my "0 + Ru1_1_dmy + Ru1_1_dmy + Ru1_1_dmy"
119+
Ru1_1_mz "0 - 2*Ru1_1_dmy + Ru1_1_dmy"
119120
Sr1_1_mx "0"
120121
Sr1_1_my "0"
121122
Sr1_1_mz "0"
@@ -131,9 +132,9 @@ O1_2_mz "0"
131132
O1_3_mx "0"
132133
O1_3_my "0"
133134
O1_3_mz "0"
134-
Li_1_mx "0"
135-
Li_1_my "0"
136-
Li_1_mz "0"
135+
Li1_1_mx "0"
136+
Li1_1_my "0"
137+
Li1_1_mz "0"
137138

138139
# matrix conversion: deltamoments(lattice units) = matrix.(modeamplitudes*modenormfactors)
139140
# Note that deltamoment_i(crystalaxis units) = deltamoment_i(lattice units)*strained_cell_length_i
@@ -143,14 +144,9 @@ loop_
143144
_iso_magneticmodematrix_row
144145
_iso_magneticmodematrix_col
145146
_iso_magneticmodematrix_value
146-
1 1 -0.33333
147-
1 2 -0.50000
148-
1 3 1.00000
149-
2 1 -1.00000
150-
2 2 0.50000
151-
3 1 0.66667
152-
3 2 1.00000
153-
3 3 1.00000
147+
1 1 1.33333
148+
2 1 1.33333
149+
3 1 1.33333
154150

155151
_iso_rotationalmode_number 0
156152

Dans_Diffraction/__init__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Diamond
1818
2017
1919
20-
Version 1.8.1
21-
Last updated: 12/05/20
20+
Version 1.8.2
21+
Last updated: 26/05/20
2222
2323
Version History:
2424
02/03/18 1.0 Version History started.
@@ -29,9 +29,10 @@
2929
13/12/19 1.5 Multiple Scattering added, tkGUI refactored, Startgui changed to start_gui
3030
20/02/20 1.6 Tensor Scattering added
3131
31/03/20 1.7 Refactored multicrystal methods, other minor changes, improved powder diffraction
32-
19/04/20 1.7.1 Added writecif + spacegroup file + functions
32+
19/04/20 1.7.1 Added write_cif + spacegroup file + functions
3333
02/05/20 1.8 Updated readcif, added heavy atom properties, added magnetic spacegroups
3434
12/05/20 1.8.1 Updated readcif, added atomic_scattering_factors and classes_orbitals
35+
26/05/20 1.8.2 Updated copyright, removed tensor scattering. Updated magnetic spacegroups
3536
3637
-----------------------------------------------------------------------------
3738
Copyright 2020 Diamond Light Source Ltd.
@@ -85,8 +86,8 @@
8586
from .classes_fdmnes import Fdmnes, FdmnesAnalysis
8687

8788

88-
__version__ = '1.8.1'
89-
__date__ = '12/05/20'
89+
__version__ = '1.8.2'
90+
__date__ = '26/05/20'
9091

9192

9293
# Build

0 commit comments

Comments
 (0)