Skip to content

Commit eee3608

Browse files
sbillingesbillinge
authored
Merge pull request #208 from cadenmyers13/improved-cli
refactor: New cli for labpdfproc
2 parents f1e9b63 + f1d3930 commit eee3608

File tree

8 files changed

+6357
-524
lines changed

8 files changed

+6357
-524
lines changed

‎docs/source/examples/example-data/CeO2_635um_accum_0.xy‎

Lines changed: 5631 additions & 0 deletions
Large diffs are not rendered by default.

‎docs/source/examples/example-data/CeO2_635um_zscan_200umSlit_chanClose_exported.xy‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
'Id: "" Comment: "" Operator: "Lab Manager" Anode: "Mo" Scantype: "Z" TimePerStep: "0.1"
2+
-0.5000 438699.993
3+
-0.4900 437939.993
4+
-0.4800 436679.993
5+
-0.4700 434109.994
6+
-0.4600 439659.993
7+
-0.4500 436119.994
8+
-0.4400 435829.994
9+
-0.4300 438749.993
10+
-0.4200 432339.994
11+
-0.4100 431319.994
12+
-0.4000 435779.994
13+
-0.3900 437599.993
14+
-0.3800 434739.994
15+
-0.3700 433929.994
16+
-0.3600 436689.993
17+
-0.3500 433569.994
18+
-0.3400 435229.994
19+
-0.3300 437549.993
20+
-0.3200 434419.994
21+
-0.3100 435259.994
22+
-0.3000 437439.993
23+
-0.2900 437869.993
24+
-0.2800 434529.994
25+
-0.2700 436509.993
26+
-0.2600 434709.994
27+
-0.2500 432969.994
28+
-0.2400 434899.994
29+
-0.2300 432389.994
30+
-0.2200 436019.994
31+
-0.2100 437949.993
32+
-0.2000 437949.993
33+
-0.1900 435849.994
34+
-0.1800 437349.993
35+
-0.1700 435199.994
36+
-0.1600 439539.993
37+
-0.1500 434519.994
38+
-0.1400 436629.993
39+
-0.1300 435779.994
40+
-0.1200 437839.993
41+
-0.1100 433019.994
42+
-0.1000 440589.993
43+
-0.0900 440729.993
44+
-0.0800 432909.994
45+
-0.0700 435749.994
46+
-0.0600 439069.993
47+
-0.0500 437979.993
48+
-0.0400 437069.993
49+
-0.0300 436549.993
50+
-0.0200 430119.994
51+
-0.0100 426019.994
52+
0.0000 418459.994
53+
0.0100 403369.994
54+
0.0200 383859.994
55+
0.0300 365809.995
56+
0.0400 344199.995
57+
0.0500 320469.995
58+
0.0600 294339.996
59+
0.0700 266309.996
60+
0.0800 239429.996
61+
0.0900 209889.997
62+
0.1000 176649.997
63+
0.1100 144879.998
64+
0.1200 115089.998
65+
0.1300 92299.999
66+
0.1400 72569.999
67+
0.1500 58649.999
68+
0.1600 46629.999
69+
0.1700 38329.999
70+
0.1800 33500.000
71+
0.1900 29950.000
72+
0.2000 26210.000
73+
0.2100 24490.000
74+
0.2200 22100.000
75+
0.2300 21030.000
76+
0.2400 20140.000
77+
0.2500 18260.000
78+
0.2600 17220.000
79+
0.2700 17280.000
80+
0.2800 16080.000
81+
0.2900 16040.000
82+
0.3000 15250.000
83+
0.3100 15030.000
84+
0.3200 14610.000
85+
0.3300 13840.000
86+
0.3400 14300.000
87+
0.3500 14400.000
88+
0.3600 14140.000
89+
0.3700 13810.000
90+
0.3800 13060.000
91+
0.3900 13520.000
92+
0.4000 13930.000
93+
0.4100 13230.000
94+
0.4200 14140.000
95+
0.4300 14110.000
96+
0.4400 14730.000
97+
0.4500 13240.000
98+
0.4600 14850.000
99+
0.4700 14670.000
100+
0.4800 16110.000
101+
0.4900 16920.000
102+
0.5000 18110.000
103+
0.5100 18900.000
104+
0.5200 19600.000
105+
0.5300 21530.000
106+
0.5400 22640.000
107+
0.5500 25950.000
108+
0.5600 27170.000
109+
0.5700 31850.000
110+
0.5800 35309.999
111+
0.5900 40459.999
112+
0.6000 48749.999
113+
0.6100 60139.999
114+
0.6200 77359.999
115+
0.6300 98939.999
116+
0.6400 119429.998
117+
0.6500 144089.998
118+
0.6600 173249.997
119+
0.6700 196839.997
120+
0.6800 222189.997
121+
0.6900 251099.996
122+
0.7000 276849.996
123+
0.7100 306689.995
124+
0.7200 324769.995
125+
0.7300 349759.995
126+
0.7400 370219.994
127+
0.7500 389929.994
128+
0.7600 403689.994
129+
0.7700 415189.994
130+
0.7800 419159.994
131+
0.7900 426049.994
132+
0.8000 430569.994
133+
0.8100 433369.994
134+
0.8200 433519.994
135+
0.8300 431809.994
136+
0.8400 432409.994
137+
0.8500 431049.994
138+
0.8600 432439.994
139+
0.8700 429879.994
140+
0.8800 432939.994
141+
0.8900 430969.994
142+
0.9000 429989.994
143+
0.9100 432439.994
144+
0.9200 433599.994
145+
0.9300 431779.994
146+
0.9400 436329.993
147+
0.9500 432509.994
148+
0.9600 429609.994
149+
0.9700 432349.994
150+
0.9800 429109.994
151+
0.9900 430159.994
152+
1.0000 432219.994

‎docs/source/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ diffpy.labpdfproc - Tools for processing x-ray powder diffraction data from labo
1313
Authors
1414
=======
1515

16-
diffpy.labpdfproc is developed by Billinge Group
16+
diffpy.labpdfproc is developed by Yucong Chen, Till Schertenleib, Caden Myers, the Billinge Group
1717
and its community contributors.
1818

1919
For a detailed list of contributors see

‎news/improved-cli.rst‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
**Added:**
2+
3+
* <news item>
4+
5+
**Changed:**
6+
7+
* Compartmentalize commands into the subcommands ``mud``, ``zscan``, and ``sample``. See documentation for more info.
8+
9+
**Deprecated:**
10+
11+
* <news item>
12+
13+
**Removed:**
14+
15+
* <news item>
16+
17+
**Fixed:**
18+
19+
* <news item>
20+
21+
**Security:**
22+
23+
* <news item>

‎src/diffpy/labpdfproc/functions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def _cve_method(method):
245245
def compute_cve(
246246
input_pattern, mud, method="polynomial_interpolation", xtype="tth"
247247
):
248-
f"""Compute and interpolate the cve
248+
f"""Compute and interpolate the cylindrical volume effect (cve)
249249
for the given input diffraction data and mu*D
250250
using the selected method.
251251

0 commit comments

Comments
 (0)