Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .github/workflows/mcxtrace-conda-basictest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,17 @@ jobs:
channels: conda-forge
python-version: ${{ matrix.python }}

- name: Setup conda
id: setup-conda
- name: Get conda dependency list
id: conda-deps
run: |
./src/devel/bin/mccode-create-conda-yml -m mcxtrace -n mcxtrace -o dependencies.yml
conda env update --file dependencies.yml
echo DONE
cat dependencies.yml

- name: Update conda
id: update-conda
run: |
conda install mamba -y
mamba env update --file dependencies.yml

- name: Check versions
id: version-checks
Expand Down
10 changes: 10 additions & 0 deletions mcstas-comps/contrib/Source_custom.comp
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,25 @@
* <b>Model description:</b>
*
* The normalised Maxwellian distribution for moderated neutrons is defined by [1]
* <div class="latex">
* $M(\lambda)=\frac{2a^2}{T^2\lambda^5}\exp\left(-\frac{a}{T\lambda^{2}}\right)$
* </div>
* where
* <div class="latex">
* $a=\left(\frac{h^2}{2m_{N}k_{B}}\right)$
* </div>
* and the joining function for the under-moderated neutrons is given by [1]
* <div class="latex">
* $M(\lambda)_{um}=\frac{1}{\lambda(1+\exp(\lambda\chi-\kappa))}$
* </div>
*
* The normalised time structure of the long pulse is defined by [2]
* <div class="latex">
* $N_{t<=t_p}=1-\exp\left(-\frac{t}{\tau/n}\right)$
* </div>
* <div class="latex">
* $N_{t>t_p}=\exp\left(-\frac{t-t_p}{\tau}\right)-\exp\left(-\frac{t}{\tau/n}\right)$
* </div>
* where tp is the pulse period, tau is the pulse decay time constant, and n is the ratio of decay to ascend time constants.
*
* <b>Parameters for some sources:</b>
Expand Down
6 changes: 4 additions & 2 deletions mcxtrace-comps/optics/Capillary.comp
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
* A Capillary tube allowing for reflections along the tube. A material coating can be applied. Multilayer
* coatings may be handled by generating a reflectivity file (e.g. by IMD) and setting rtable=1.
* Waviness is implemented using the model described in
* Wang et.al., J. Appl. Phys., 1996
* where the grazing incidence angle $\theta$ is altered as
* Wang et.al., J. Appl. Phys., 1996 where the grazing incidence angle <span class="latex">$\theta$</span> is altered as
* <br>
* <div class="latex">
* $\theta' = \theta + \delta \theta \in [-min(theta,\Delta\theta,\Delta\theta]$
* </div>
* This ensures that reflected rays will never be scattered into the capillary.
* \Delta\theta is the value specified by the parameter waviness.
*
Expand Down
Loading