22
33from pathlib import Path
44
5- import pytest
65import numpy
6+ import pytest
77
8- from diffpy .morph .morphapp import (
9- create_option_parser ,
10- single_morph ,
11- )
8+ from diffpy .morph .morphapp import create_option_parser , single_morph
9+ from diffpy .morph .morphpy import morph , morphpy
1210from diffpy .morph .tools import getRw
13- from diffpy .morph .morphpy import (
14- morph ,
15- morphpy ,
16- )
1711
1812thisfile = locals ().get ("__file__" , "file.py" )
1913tests_dir = Path (thisfile ).parent .resolve ()
@@ -78,15 +72,25 @@ def test_morph(self, setup_morph):
7872 morph_results = {}
7973 morph_file = self .testfiles [0 ]
8074 for target_file in self .testfiles [1 :]:
81- mr , grm = morph (morph_file , target_file , scale = 1 , stretch = 0 , sort_by = "temperature" )
75+ mr , grm = morph (
76+ morph_file ,
77+ target_file ,
78+ scale = 1 ,
79+ stretch = 0 ,
80+ sort_by = "temperature" ,
81+ )
8282 _ , grt = morph (target_file , target_file )
8383 morph_results .update ({target_file .name : mr })
84+
8485 class Chain :
8586 xyallout = grm [:, 0 ], grm [:, 1 ], grt [:, 0 ], grt [:, 1 ]
87+
8688 chain = Chain ()
8789 rw = getRw (chain )
8890 del chain
89- assert numpy .allclose ([rw ], [self .morphapp_results [target_file .name ]["Rw" ]])
91+ assert numpy .allclose (
92+ [rw ], [self .morphapp_results [target_file .name ]["Rw" ]]
93+ )
9094 assert morph_results == self .morphapp_results
9195
9296 def test_morphpy (self , setup_morph ):
@@ -95,7 +99,9 @@ def test_morphpy(self, setup_morph):
9599 for target_file in self .testfiles [1 :]:
96100 _ , grm0 = morph (morph_file , morph_file )
97101 _ , grt = morph (target_file , target_file )
98- mr , grm = morphpy (grm0 , grt , scale = 1 , stretch = 0 , sort_by = "temperature" )
102+ mr , grm = morphpy (
103+ grm0 , grt , scale = 1 , stretch = 0 , sort_by = "temperature"
104+ )
99105 morph_results .update ({target_file .name : mr })
100106
101107 class Chain :
@@ -104,7 +110,9 @@ class Chain:
104110 chain = Chain ()
105111 rw = getRw (chain )
106112 del chain
107- assert numpy .allclose ([rw ], [self .morphapp_results [target_file .name ]["Rw" ]])
113+ assert numpy .allclose (
114+ [rw ], [self .morphapp_results [target_file .name ]["Rw" ]]
115+ )
108116 assert morph_results == self .morphapp_results
109117
110118
0 commit comments