|
54 | 54 | ## To-Do |
55 | 55 |
|
56 | 56 | * ~~Make the calculation work~~ |
57 | | -* ~~Pull from config file~~ |
58 | | -* ~~Allow selection of pixel_pitch states~~ |
59 | | -* ~~Incorporate Pathlib~~ |
60 | 57 | * Unit Test |
| 58 | +* ~~Pull from config file~~ |
| 59 | +* Allow selection of pixel_pitch states |
| 60 | +* Make 32-bit version work with 64-bit Python |
61 | 61 |
|
62 | 62 | <!-- GETTING STARTED --> |
63 | 63 | ## Getting Started |
|
67 | 67 | ### Prerequisites |
68 | 68 |
|
69 | 69 | <ul> |
70 | | - <li><a href="https://www.python.org/downloads/">Python > 3.7.2 32-bit</a></li> |
71 | | - <li><a href="https://docs.python.org/3/library/configparser.html">ConfigParser 4.1</a></li> |
| 70 | + <li><a href="https://www.python.org/downloads/">Python > 3.8.5 64-bit (Other versions not tested - YMMV)</a></li> |
| 71 | + <li><a href="https://docs.python.org/3/library/configparser.html">ConfigParser > 4.1</a></li> |
72 | 72 | <li><a href="https://docs.python.org/3/library/pathlib.html">PathLib</a></li> |
73 | 73 | </ul> |
74 | 74 |
|
|
104 | 104 | FOCAL_LENGTH = 300 |
105 | 105 | ``` |
106 | 106 | <ul> |
107 | | - <li>APERTURE > Has to be a float in this format 1.0<A<22.0</li> |
| 107 | + <li>APERTURE > Has to be a float in this format 1<A<22</li> |
108 | 108 | <li>FOCAL_LENGTH > has to be an int in this format 1<F<1000</li> |
109 | 109 | </ul> |
110 | 110 |
|
|
119 | 119 | PHYSICAL_WIDTH = 22.2 |
120 | 120 | ``` |
121 | 121 | <ul> |
122 | | - <li>PIXEL_PITCH > Has to be a float in this format 0.1<A<100.0</li> |
| 122 | + <li>PIXEL_PITCH > Has to be a float in this format 0.1<A<100</li> |
123 | 123 | <li>PIXEL_WIDTH > has to be an int in this format 1<F<8192</li> |
124 | | - <li>PHYSICAL_WIDTH > has to be a float in this format 0.1<P<100.0</li> |
| 124 | + <li>PHYSICAL_WIDTH > has to be a float in this format 0.1<P<100</li> |
125 | 125 | </ul> |
126 | 126 |
|
127 | | -#### Pixel Pitch Differentiation |
| 127 | +#### ~~Pixel Pitch Differentiation~~ |
128 | 128 |
|
129 | | -##### Know Pixel Pitch |
| 129 | +##### ~~Know Pixel Pitch~~ |
130 | 130 | ```python |
131 | 131 | PIXEL_PITCH = 6.423611111111111 |
132 | 132 |
|
133 | 133 | PIXEL_WIDTH = "" |
134 | 134 | PHYSICAL_WIDTH = "" |
135 | 135 | ``` |
136 | 136 |
|
137 | | -##### Don't Know Pixel Pitch |
| 137 | +##### ~~Don't Know Pixel Pitch~~ |
138 | 138 | ```python |
139 | 139 | PIXEL_PITCH = "" |
140 | 140 |
|
141 | 141 | PIXEL_WIDTH = 3456 |
142 | 142 | PHYSICAL_WIDTH = 22.2 |
143 | 143 | ``` |
144 | | -Essentially - If you enter a manual value for pixel pitch, the programme will use this - and ignore the values for Pixel and Physical Width. |
| 144 | +<h3>Not Currently implemented</h3> |
145 | 145 |
|
146 | 146 | <!-- CONTRIBUTING --> |
147 | 147 | ## Contributing |
|
0 commit comments