Skip to content

Commit b0d3656

Browse files
authored
Merge pull request #2291 from willend/main
Use JS LaTeX environments to render equations in headers
2 parents fe651ff + 9671974 commit b0d3656

3 files changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/mcxtrace-conda-basictest.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,17 @@ jobs:
5252
channels: conda-forge
5353
python-version: ${{ matrix.python }}
5454

55-
- name: Setup conda
56-
id: setup-conda
55+
- name: Get conda dependency list
56+
id: conda-deps
5757
run: |
5858
./src/devel/bin/mccode-create-conda-yml -m mcxtrace -n mcxtrace -o dependencies.yml
59-
conda env update --file dependencies.yml
60-
echo DONE
59+
cat dependencies.yml
60+
61+
- name: Update conda
62+
id: update-conda
63+
run: |
64+
conda install mamba -y
65+
mamba env update --file dependencies.yml
6166
6267
- name: Check versions
6368
id: version-checks

mcstas-comps/contrib/Source_custom.comp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,25 @@
4040
* <b>Model description:</b>
4141
*
4242
* The normalised Maxwellian distribution for moderated neutrons is defined by [1]
43+
* <div class="latex">
4344
* $M(\lambda)=\frac{2a^2}{T^2\lambda^5}\exp\left(-\frac{a}{T\lambda^{2}}\right)$
45+
* </div>
4446
* where
47+
* <div class="latex">
4548
* $a=\left(\frac{h^2}{2m_{N}k_{B}}\right)$
49+
* </div>
4650
* and the joining function for the under-moderated neutrons is given by [1]
51+
* <div class="latex">
4752
* $M(\lambda)_{um}=\frac{1}{\lambda(1+\exp(\lambda\chi-\kappa))}$
53+
* </div>
4854
*
4955
* The normalised time structure of the long pulse is defined by [2]
56+
* <div class="latex">
5057
* $N_{t<=t_p}=1-\exp\left(-\frac{t}{\tau/n}\right)$
58+
* </div>
59+
* <div class="latex">
5160
* $N_{t>t_p}=\exp\left(-\frac{t-t_p}{\tau}\right)-\exp\left(-\frac{t}{\tau/n}\right)$
61+
* </div>
5262
* where tp is the pulse period, tau is the pulse decay time constant, and n is the ratio of decay to ascend time constants.
5363
*
5464
* <b>Parameters for some sources:</b>

mcxtrace-comps/optics/Capillary.comp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
* A Capillary tube allowing for reflections along the tube. A material coating can be applied. Multilayer
1919
* coatings may be handled by generating a reflectivity file (e.g. by IMD) and setting rtable=1.
2020
* Waviness is implemented using the model described in
21-
* Wang et.al., J. Appl. Phys., 1996
22-
* where the grazing incidence angle $\theta$ is altered as
21+
* Wang et.al., J. Appl. Phys., 1996 where the grazing incidence angle <span class="latex">$\theta$</span> is altered as
22+
* <br>
23+
* <div class="latex">
2324
* $\theta' = \theta + \delta \theta \in [-min(theta,\Delta\theta,\Delta\theta]$
25+
* </div>
2426
* This ensures that reflected rays will never be scattered into the capillary.
2527
* \Delta\theta is the value specified by the parameter waviness.
2628
*

0 commit comments

Comments
 (0)