Skip to content

Commit 725d641

Browse files
committed
Avoid using ICSD and CSD CIF files.
Replace with COD data.
1 parent 481a270 commit 725d641

File tree

6 files changed

+1512
-460
lines changed

6 files changed

+1512
-460
lines changed

pyobjcryst/tests/testcif.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,21 +111,21 @@ def test_CaTiO3_cif(self):
111111
'''
112112
c = loadcifdata('CaTiO3.cif')
113113
self.assertTrue(c is not None)
114-
s = c.GetScatt(0)
114+
s = c.GetScatt(3)
115115
name = s.GetName()
116-
self.assertEquals(name, "Ca1")
116+
self.assertEquals(name, "O2")
117117
sp = c.GetScatteringPower(name)
118118
self.assertFalse(sp.IsIsotropic())
119119
utob = 8 * pi**2
120-
self.assertAlmostEquals(utob * 0.0077, sp.B11)
121-
self.assertAlmostEquals(utob * 0.0079, sp.B22)
122-
self.assertAlmostEquals(utob * 0.0077, sp.B33)
123-
self.assertAlmostEquals(-utob * 0.0013, sp.B12)
124-
self.assertAlmostEquals(0, sp.B13)
125-
self.assertAlmostEquals(0, sp.B23)
126-
self.assertAlmostEquals(-0.00676, s.X, 5)
127-
self.assertAlmostEquals(0.03602, s.Y, 5)
128-
self.assertAlmostEquals(0.25, s.Z, 2)
120+
self.assertAlmostEquals(utob * 0.0065, sp.B11)
121+
self.assertAlmostEquals(utob * 0.0060, sp.B22)
122+
self.assertAlmostEquals(utob * 0.0095, sp.B33)
123+
self.assertAlmostEquals(utob * 0.0020, sp.B12)
124+
self.assertAlmostEquals(utob * -0.0008, sp.B13)
125+
self.assertAlmostEquals(utob * -0.0010, sp.B23)
126+
self.assertAlmostEquals(0.2897, s.X, 5)
127+
self.assertAlmostEquals(0.2888, s.Y, 5)
128+
self.assertAlmostEquals(0.0373, s.Z, 2)
129129
self.assertAlmostEquals(1, s.Occupancy)
130130
return
131131

@@ -146,10 +146,10 @@ def test_CeO2_cif(self):
146146
return
147147

148148

149-
def test_menthol_cif(self):
150-
'''Check loading of menthol.cif
149+
def test_lidocainementhol_cif(self):
150+
'''Check loading of lidocainementhol.cif
151151
'''
152-
c = loadcifdata('menthol.cif')
152+
c = loadcifdata('lidocainementhol.cif')
153153
self.assertTrue(c is not None)
154154
return
155155

0 commit comments

Comments
 (0)