Skip to content

Commit 901a98e

Browse files
committed
PATCH: Updated such that examples work
1 parent 00c7d5b commit 901a98e

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The published manuscript may be found [here](https://doi.org/10.1063/1.5013029)
99
# Setup
1010

1111
## Dependencies
12-
This module requires **Python 2.7** or **3.5**. Installation requires **git**.
12+
This module requires **Python 2.7** (development branch works with **Python 3.6**). Installation requires **git**.
1313

1414
**OS X users:** Prior to installing dependencies, ensure an adequate Python installation by following [this guide](https://matplotlib.org/faq/installing_faq.html#osx-notes). The Python that ships with OS X may not work well with some required dependencies.
1515

@@ -85,7 +85,7 @@ For more info check out pages 8 and 9: https://arxiv.org/abs/1603.08617
8585

8686
#### Example
8787
```shell
88-
lin-reconstuct --tol 1.0E-05 --iter 8000 input.txt
88+
lin-reconstruct --tol 1.0E-05 --iter 8000 input.txt
8989
```
9090
This command line script ensures that Gauss-Seidel Tolerance is 1.0E-05 and the number of Gauss-Seidel Iterations 8000 and parses the input.txt constructed by [PRadReader](https://github.com/flash-center/PRadReader).
9191
#### Output
@@ -115,14 +115,14 @@ There is an example intermediate file, test_input.txt, in the `examples/` direct
115115
2. Navigate into the `examples/` directory and copy the file,`test_input.txt`, out.
116116
3. From the same directory run this command
117117
```shell
118-
lin-reconstruct test_input.txt
118+
lin-reconstruct test_input.p
119119
```
120120
Output (after 4000 iterations)
121121

122122
<img src="examples/reference_images/B_Reconstructed.png" width="425"/>
123123

124124
```shell
125-
lin-analyze test_input.txt
125+
lin-analyze test_input.p
126126
```
127127
Output
128128
<p float="left">

praline/Bplot2.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ def B_plot(B, flux_ref, bin_um, type, title):
9797
x = "Flash"
9898
elif type == 'mitcsv':
9999
x = 'MITCSV'
100+
else:
101+
x = str(type)
100102

101103
ax.set(title=x + ": Log " + title + r" $B_\perp$ Projection (G cm)",
102104
ylabel=r"Y (cm)", xlabel=r"X (cm)")

praline/reconstruct.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def prad_wrap():
9191
# Object for handling all the attributes of a proton radiography construction
9292
# problem. Typically, different proton radiograph formats are read into this
9393
# object for use with other reconstruction tools.
94-
prad = pradreader.reader.loadPRR(fn)
94+
pr = pradreader.reader.loadPRRp(fn)
9595
rtype = pr.rtype
9696
flux = pr.flux2D
9797
flux_ref = pr.flux2D_ref

0 commit comments

Comments
 (0)