Skip to content

Commit

Permalink
Re #328 - changes for MTS anaconda migration
Browse files Browse the repository at this point in the history
  • Loading branch information
marshallmcdonnell committed Jan 25, 2021
1 parent 1927f42 commit cc5ba7c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
channels: marshallmcdonnell,conda-forge,mantid,neutrons
channels: neutrons,conda-forge,mantid,neutrons

- name: Apt install deps
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ The name came about from being developed for the Diffraction Group at SNS locate

This "reduction" entails taking raw neutron counts from detectors in the diffraction experiment and turning them into the reciprocal-space structure factor patterns, F(Q) or S(Q), and applying a Fourier Transform to real-space to give the pair distribution fuction, PDF.

ADDIE is a front-end GUI for total scattering that hopes to support multiple diffractometers performing total scattering measurements. The back-end that uses the [Mantid Framework](https://docs.mantidproject.org/nightly/) is the [`mantid-total-scattering`](https://github.com/marshallmcdonnell/mantid_total_scattering) project.
ADDIE is a front-end GUI for total scattering that hopes to support multiple diffractometers performing total scattering measurements. The back-end that uses the [Mantid Framework](https://docs.mantidproject.org/nightly/) is the [`mantid-total-scattering`](https://github.com/neutrons/mantid_total_scattering) project.

## Install

```
conda config --add channels conda-forge --add channels marshallmcdonnell --add channels mantid --add channels mantid/label/nightly
conda config --add channels conda-forge --add channels neutrons --add channels mantid --add channels mantid/label/nightly
conda create -n addie_env python=${python_version}
source activate addie_env
```
Expand Down
2 changes: 1 addition & 1 deletion addie/processing/mantid/launch_reduction.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from addie.processing.mantid.master_table.master_table_exporter import TableFileExporter as MantidTableExporter

# Mantid Total Scattering integration
# (https://github.com/marshallmcdonnell/mantid_total_scattering)
# (https://github.com/neutrons/mantid_total_scattering)
try:
import total_scattering
print("Mantid Total Scattering Version: ", total_scattering.__version__)
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: addie
channels:
- conda-forge
- marshallmcdonnell
- neutrons
- mantid
dependencies:
- python=3.6
Expand Down

0 comments on commit cc5ba7c

Please sign in to comment.