Skip to content

Commit 8a2dc3b

Browse files
author
mantid-builder
committed
Update documentation
1 parent 98d6eb2 commit 8a2dc3b

21 files changed

+54
-50
lines changed

_modules/mantidimaging/core/io/instrument_log_implmentations.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,15 +605,15 @@ <h1>Source code for mantidimaging.core.io.instrument_log_implmentations</h1><div
605605

606606

607607
<span class="nd">@staticmethod</span>
608-
<span class="k">def</span> <span class="nf">_has_imat_header</span><span class="p">(</span><span class="n">line</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
608+
<span class="k">def</span> <span class="nf">_has_imat_header</span><span class="p">(</span><span class="n">line</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
609609
<span class="n">HEADERS</span> <span class="o">=</span> <span class="p">[</span>
610610
<span class="s2">&quot;TIME STAMP,IMAGE TYPE,IMAGE COUNTER,COUNTS BM3 before image,COUNTS BM3 after image&quot;</span><span class="p">,</span>
611611
<span class="s2">&quot;TIME STAMP IMAGE TYPE IMAGE COUNTER COUNTS BM3 before image COUNTS BM3 after image&quot;</span><span class="p">,</span>
612612
<span class="p">]</span>
613613
<span class="k">return</span> <span class="n">line</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span> <span class="ow">in</span> <span class="n">HEADERS</span>
614614

615615
<span class="nd">@classmethod</span>
616-
<span class="k">def</span> <span class="nf">_has_imat_data_line</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">line</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
616+
<span class="k">def</span> <span class="nf">_has_imat_data_line</span><span class="p">(</span><span class="bp">cls</span><span class="p">,</span> <span class="n">line</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
617617
<span class="k">try</span><span class="p">:</span>
618618
<span class="n">_</span> <span class="o">=</span> <span class="bp">cls</span><span class="o">.</span><span class="n">read_imat_date</span><span class="p">(</span><span class="n">line</span><span class="p">[:</span><span class="mi">24</span><span class="p">])</span>
619619
<span class="k">except</span> <span class="ne">ValueError</span><span class="p">:</span>

_modules/mantidimaging/core/io/saver.html

Lines changed: 12 additions & 9 deletions
Large diffs are not rendered by default.

_modules/mantidimaging/core/net/help_pages.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ <h1>Source code for mantidimaging.core.net.help_pages</h1><div class="highlight"
487487

488488
<div class="viewcode-block" id="open_user_operation_docs">
489489
<a class="viewcode-back" href="../../../../api/mantidimaging.core.net.help_pages.html#mantidimaging.core.net.help_pages.open_user_operation_docs">[docs]</a>
490-
<span class="k">def</span> <span class="nf">open_user_operation_docs</span><span class="p">(</span><span class="n">operation_name</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
490+
<span class="k">def</span> <span class="nf">open_user_operation_docs</span><span class="p">(</span><span class="n">operation_name</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
491491
<span class="n">page_url</span> <span class="o">=</span> <span class="s2">&quot;operations/index&quot;</span>
492492
<span class="n">section</span> <span class="o">=</span> <span class="n">operation_name</span><span class="o">.</span><span class="n">lower</span><span class="p">()</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s2">&quot; &quot;</span><span class="p">,</span> <span class="s2">&quot;-&quot;</span><span class="p">)</span>
493493
<span class="n">open_help_webpage</span><span class="p">(</span><span class="n">SECTION_USER_GUIDE</span><span class="p">,</span> <span class="n">page_url</span><span class="p">,</span> <span class="n">section</span><span class="p">)</span></div>
@@ -496,7 +496,7 @@ <h1>Source code for mantidimaging.core.net.help_pages</h1><div class="highlight"
496496

497497
<div class="viewcode-block" id="open_help_webpage">
498498
<a class="viewcode-back" href="../../../../api/mantidimaging.core.net.help_pages.html#mantidimaging.core.net.help_pages.open_help_webpage">[docs]</a>
499-
<span class="k">def</span> <span class="nf">open_help_webpage</span><span class="p">(</span><span class="n">section_url</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">page_url</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">section</span><span class="p">:</span> <span class="nb">str</span> <span class="o">|</span> <span class="kc">None</span> <span class="o">=</span> <span class="kc">None</span><span class="p">):</span>
499+
<span class="k">def</span> <span class="nf">open_help_webpage</span><span class="p">(</span><span class="n">section_url</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">page_url</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">section</span><span class="p">:</span> <span class="nb">str</span> <span class="o">|</span> <span class="kc">None</span> <span class="o">=</span> <span class="kc">None</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
500500
<span class="k">if</span> <span class="n">section</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
501501
<span class="n">url</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">section_url</span><span class="si">}{</span><span class="n">page_url</span><span class="si">}</span><span class="s2">.html#</span><span class="si">{</span><span class="n">section</span><span class="si">}</span><span class="s2">&quot;</span>
502502
<span class="k">else</span><span class="p">:</span>

_modules/mantidimaging/core/parallel/shared.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ <h1>Source code for mantidimaging.core.parallel.shared</h1><div class="highlight
511511
<span class="n">num_operations</span><span class="p">:</span> <span class="nb">int</span><span class="p">,</span>
512512
<span class="n">arrays</span><span class="p">:</span> <span class="nb">list</span><span class="p">[</span><span class="n">pu</span><span class="o">.</span><span class="n">SharedArray</span><span class="p">]</span> <span class="o">|</span> <span class="n">pu</span><span class="o">.</span><span class="n">SharedArray</span><span class="p">,</span>
513513
<span class="n">params</span><span class="p">:</span> <span class="nb">dict</span><span class="p">[</span><span class="nb">str</span><span class="p">,</span> <span class="n">Any</span><span class="p">],</span>
514-
<span class="n">progress</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
514+
<span class="n">progress</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
515515
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arrays</span><span class="p">,</span> <span class="n">pu</span><span class="o">.</span><span class="n">SharedArray</span><span class="p">):</span>
516516
<span class="n">arrays</span> <span class="o">=</span> <span class="p">[</span><span class="n">arrays</span><span class="p">]</span>
517517
<span class="n">all_data_in_shared_memory</span><span class="p">,</span> <span class="n">data</span> <span class="o">=</span> <span class="n">_check_shared_mem_and_get_data</span><span class="p">(</span><span class="n">arrays</span><span class="p">)</span>

_modules/mantidimaging/core/parallel/utility.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ <h1>Source code for mantidimaging.core.parallel.utility</h1><div class="highligh
501501

502502
<div class="viewcode-block" id="enough_memory">
503503
<a class="viewcode-back" href="../../../../api/mantidimaging.core.parallel.utility.html#mantidimaging.core.parallel.utility.enough_memory">[docs]</a>
504-
<span class="k">def</span> <span class="nf">enough_memory</span><span class="p">(</span><span class="n">shape</span><span class="p">,</span> <span class="n">dtype</span><span class="p">):</span>
504+
<span class="k">def</span> <span class="nf">enough_memory</span><span class="p">(</span><span class="n">shape</span><span class="p">,</span> <span class="n">dtype</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">bool</span><span class="p">:</span>
505505
<span class="k">return</span> <span class="n">full_size_KB</span><span class="p">(</span><span class="n">shape</span><span class="o">=</span><span class="n">shape</span><span class="p">,</span> <span class="n">dtype</span><span class="o">=</span><span class="n">dtype</span><span class="p">)</span> <span class="o">&lt;</span> <span class="n">system_free_memory</span><span class="p">()</span><span class="o">.</span><span class="n">kb</span><span class="p">()</span></div>
506506

507507

@@ -596,7 +596,7 @@ <h1>Source code for mantidimaging.core.parallel.utility</h1><div class="highligh
596596

597597
<div class="viewcode-block" id="execute_impl">
598598
<a class="viewcode-back" href="../../../../api/mantidimaging.core.parallel.utility.html#mantidimaging.core.parallel.utility.execute_impl">[docs]</a>
599-
<span class="k">def</span> <span class="nf">execute_impl</span><span class="p">(</span><span class="n">img_num</span><span class="p">:</span> <span class="nb">int</span><span class="p">,</span> <span class="n">partial_func</span><span class="p">:</span> <span class="n">partial</span><span class="p">,</span> <span class="n">is_shared_data</span><span class="p">:</span> <span class="nb">bool</span><span class="p">,</span> <span class="n">progress</span><span class="p">:</span> <span class="n">Progress</span><span class="p">,</span> <span class="n">msg</span><span class="p">:</span> <span class="nb">str</span><span class="p">):</span>
599+
<span class="k">def</span> <span class="nf">execute_impl</span><span class="p">(</span><span class="n">img_num</span><span class="p">:</span> <span class="nb">int</span><span class="p">,</span> <span class="n">partial_func</span><span class="p">:</span> <span class="n">partial</span><span class="p">,</span> <span class="n">is_shared_data</span><span class="p">:</span> <span class="nb">bool</span><span class="p">,</span> <span class="n">progress</span><span class="p">:</span> <span class="n">Progress</span><span class="p">,</span> <span class="n">msg</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
600600
<span class="n">task_name</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">msg</span><span class="si">}</span><span class="s2">&quot;</span>
601601
<span class="n">progress</span> <span class="o">=</span> <span class="n">Progress</span><span class="o">.</span><span class="n">ensure_instance</span><span class="p">(</span><span class="n">progress</span><span class="p">,</span> <span class="n">num_steps</span><span class="o">=</span><span class="n">img_num</span><span class="p">,</span> <span class="n">task_name</span><span class="o">=</span><span class="n">task_name</span><span class="p">)</span>
602602
<span class="n">indices_list</span> <span class="o">=</span> <span class="nb">range</span><span class="p">(</span><span class="n">img_num</span><span class="p">)</span>
@@ -624,7 +624,7 @@ <h1>Source code for mantidimaging.core.parallel.utility</h1><div class="highligh
624624
<span class="n">num_operations</span><span class="p">:</span> <span class="nb">int</span><span class="p">,</span>
625625
<span class="n">is_shared_data</span><span class="p">:</span> <span class="nb">bool</span><span class="p">,</span>
626626
<span class="n">progress</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
627-
<span class="n">msg</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="s2">&quot;&quot;</span><span class="p">):</span>
627+
<span class="n">msg</span><span class="p">:</span> <span class="nb">str</span> <span class="o">=</span> <span class="s2">&quot;&quot;</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
628628
<span class="n">task_name</span> <span class="o">=</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">msg</span><span class="si">}</span><span class="s2">&quot;</span>
629629
<span class="n">progress</span> <span class="o">=</span> <span class="n">Progress</span><span class="o">.</span><span class="n">ensure_instance</span><span class="p">(</span><span class="n">progress</span><span class="p">,</span> <span class="n">num_steps</span><span class="o">=</span><span class="n">num_operations</span><span class="p">,</span> <span class="n">task_name</span><span class="o">=</span><span class="n">task_name</span><span class="p">)</span>
630630
<span class="n">indices_list</span> <span class="o">=</span> <span class="nb">range</span><span class="p">(</span><span class="n">num_operations</span><span class="p">)</span>

_modules/mantidimaging/core/reconstruct/astra_recon.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,14 +505,14 @@ <h1>Source code for mantidimaging.core.reconstruct.astra_recon</h1><div class="h
505505
<span class="c1"># https://github.com/dkazanc/ToMoBAR/blob/5990aaa264e2f08bd9b0069c8847e5021fbf2ee2/src/Python/tomobar/supp/astraOP.py#L20-L70</span>
506506
<div class="viewcode-block" id="rotation_matrix2d">
507507
<a class="viewcode-back" href="../../../../api/mantidimaging.core.reconstruct.astra_recon.html#mantidimaging.core.reconstruct.astra_recon.rotation_matrix2d">[docs]</a>
508-
<span class="k">def</span> <span class="nf">rotation_matrix2d</span><span class="p">(</span><span class="n">theta</span><span class="p">:</span> <span class="nb">float</span><span class="p">):</span>
508+
<span class="k">def</span> <span class="nf">rotation_matrix2d</span><span class="p">(</span><span class="n">theta</span><span class="p">:</span> <span class="nb">float</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">:</span>
509509
<span class="k">return</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([[</span><span class="n">np</span><span class="o">.</span><span class="n">cos</span><span class="p">(</span><span class="n">theta</span><span class="p">),</span> <span class="o">-</span><span class="n">np</span><span class="o">.</span><span class="n">sin</span><span class="p">(</span><span class="n">theta</span><span class="p">)],</span> <span class="p">[</span><span class="n">np</span><span class="o">.</span><span class="n">sin</span><span class="p">(</span><span class="n">theta</span><span class="p">),</span> <span class="n">np</span><span class="o">.</span><span class="n">cos</span><span class="p">(</span><span class="n">theta</span><span class="p">)]])</span></div>
510510

511511

512512

513513
<div class="viewcode-block" id="vec_geom_init2d">
514514
<a class="viewcode-back" href="../../../../api/mantidimaging.core.reconstruct.astra_recon.html#mantidimaging.core.reconstruct.astra_recon.vec_geom_init2d">[docs]</a>
515-
<span class="k">def</span> <span class="nf">vec_geom_init2d</span><span class="p">(</span><span class="n">angles_rad</span><span class="p">:</span> <span class="n">ProjectionAngles</span><span class="p">,</span> <span class="n">detector_spacing_x</span><span class="p">:</span> <span class="nb">float</span><span class="p">,</span> <span class="n">center_rot_offset</span><span class="p">:</span> <span class="nb">float</span><span class="p">):</span>
515+
<span class="k">def</span> <span class="nf">vec_geom_init2d</span><span class="p">(</span><span class="n">angles_rad</span><span class="p">:</span> <span class="n">ProjectionAngles</span><span class="p">,</span> <span class="n">detector_spacing_x</span><span class="p">:</span> <span class="nb">float</span><span class="p">,</span> <span class="n">center_rot_offset</span><span class="p">:</span> <span class="nb">float</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">:</span>
516516
<span class="n">angles_value</span> <span class="o">=</span> <span class="n">angles_rad</span><span class="o">.</span><span class="n">value</span>
517517
<span class="n">s0</span> <span class="o">=</span> <span class="p">[</span><span class="mf">0.0</span><span class="p">,</span> <span class="o">-</span><span class="mf">1.0</span><span class="p">]</span> <span class="c1"># source</span>
518518
<span class="n">u0</span> <span class="o">=</span> <span class="p">[</span><span class="n">detector_spacing_x</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">]</span> <span class="c1"># detector coordinates</span>

_modules/mantidimaging/core/reconstruct/base_recon.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ <h1>Source code for mantidimaging.core.reconstruct.base_recon</h1><div class="hi
506506
<div class="viewcode-block" id="BaseRecon.prepare_sinogram">
507507
<a class="viewcode-back" href="../../../../api/mantidimaging.core.reconstruct.base_recon.html#mantidimaging.core.reconstruct.base_recon.BaseRecon.prepare_sinogram">[docs]</a>
508508
<span class="nd">@staticmethod</span>
509-
<span class="k">def</span> <span class="nf">prepare_sinogram</span><span class="p">(</span><span class="n">data</span><span class="p">:</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">,</span> <span class="n">recon_params</span><span class="p">:</span> <span class="n">ReconstructionParameters</span><span class="p">):</span>
509+
<span class="k">def</span> <span class="nf">prepare_sinogram</span><span class="p">(</span><span class="n">data</span><span class="p">:</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">,</span> <span class="n">recon_params</span><span class="p">:</span> <span class="n">ReconstructionParameters</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">:</span>
510510
<span class="n">logged_data</span> <span class="o">=</span> <span class="n">BaseRecon</span><span class="o">.</span><span class="n">negative_log</span><span class="p">(</span><span class="n">data</span><span class="p">)</span>
511511
<span class="k">if</span> <span class="n">recon_params</span><span class="o">.</span><span class="n">beam_hardening_coefs</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span>
512512
<span class="n">coefs</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">([</span><span class="mf">0.0</span><span class="p">,</span> <span class="mf">1.0</span><span class="p">]</span> <span class="o">+</span> <span class="n">recon_params</span><span class="o">.</span><span class="n">beam_hardening_coefs</span><span class="p">)</span>

0 commit comments

Comments
 (0)