File tree Expand file tree Collapse file tree 3 files changed +30
-5
lines changed Expand file tree Collapse file tree 3 files changed +30
-5
lines changed Original file line number Diff line number Diff line change 3
3
from pathlib import Path
4
4
5
5
from diffpy .labpdfproc .functions import apply_corr , compute_cve
6
+ from diffpy .labpdfproc .tools import set_output_directory
6
7
from diffpy .utils .parsers .loaddata import loadData
7
8
from diffpy .utils .scattering_objects .diffraction_objects import XQUANTITIES , Diffraction_object
8
9
@@ -65,13 +66,11 @@ def main():
65
66
args = get_args ()
66
67
wavelength = WAVELENGTHS [args .anode_type ]
67
68
filepath = Path (args .input_file )
68
- output_dir = Path (args .output_directory ).resolve () if args .output_directory else Path .cwd ()
69
- output_dir .mkdir (parents = True , exist_ok = True )
70
- args .output_directory = output_dir
69
+ args .output_directory = set_output_directory (args )
71
70
outfilestem = filepath .stem + "_corrected"
72
71
corrfilestem = filepath .stem + "_cve"
73
- outfile = output_dir / (outfilestem + ".chi" )
74
- corrfile = output_dir / (corrfilestem + ".chi" )
72
+ outfile = args . output_directory / (outfilestem + ".chi" )
73
+ corrfile = args . output_directory / (corrfilestem + ".chi" )
75
74
76
75
if outfile .exists () and not args .force_overwrite :
77
76
sys .exit (
Original file line number Diff line number Diff line change
1
+ import argparse
2
+ from pathlib import Path
3
+
4
+ import pytest
5
+
6
+ from diffpy .labpdfproc .tools import set_output_directory
7
+
8
+ params1 = [
9
+ ([None ], [Path .cwd ()]),
10
+ (["corrected" ], [Path ("corrected" ).resolve ()]),
11
+ ]
12
+
13
+
14
+ @pytest .mark .parametrize ("inputs, expected" , params1 )
15
+ def test_set_output_directory (inputs , expected ):
16
+ expected_output_directory = expected [0 ]
17
+ actual_args = argparse .Namespace (output_directory = inputs [0 ])
18
+ actual_output_directory = set_output_directory (actual_args )
19
+ assert actual_output_directory == expected_output_directory
Original file line number Diff line number Diff line change
1
+ from pathlib import Path
2
+
3
+
4
+ def set_output_directory (args ):
5
+ output_dir = Path (args .output_directory ).resolve () if args .output_directory else Path .cwd ()
6
+ output_dir .mkdir (parents = True , exist_ok = True )
7
+ return output_dir
You can’t perform that action at this time.
0 commit comments