Commit 153857bb authored by Valentin Valls's avatar Valentin Valls
Browse files

Merge branch 'xia_install_update_april22' into 'master'

xia install doc update

See merge request !4611
parents 2894a915 be3ae66d
Pipeline #75774 failed with stages
in 107 minutes and 19 seconds
......@@ -39,8 +39,6 @@ There are 2 versions of ProSpect:
* Advanced Options:
- tick `Register`
- untick `Add miniconda3 to PATH`
- `Next`
* `Install`
* untick "Anaconda Individual Edition Tutorial" + "Getting Started with Anaconda" / `Finish`
* Create a link from taskbar to anaconda powershell:
* click on Windows Start Menu / type `anaconda` / Right click on `Anaconda Powershell Prompt` ( not `Anaconda Prompt`) / `Pin to taskbar`
......@@ -51,42 +49,44 @@ There are 2 versions of ProSpect:
* `conda activate bliss`
* Configue channels:
```
conda config --env --add channels conda-forge
conda config --env --append channels esrf-bcu
```
```bash
conda config --env --add channels conda-forge
conda config --env --append channels esrf-bcu
```
### Installation of BLISS
* Clone and install BLISS
```bash
git clone https://gitlab.esrf.fr/bliss/bliss bliss.git
cd bliss.git
```shell
git clone https://gitlab.esrf.fr/bliss/bliss bliss.git
git checkout 1.9.x
cd bliss.git
conda install -y --file requirements-win64.txt
git checkout 1.9.x
pip install -e . --no-deps
```
conda install -y --file requirements-win64.txt
!!!note
As of March 22, 2022, Bliss `1.9.x` branch points to commit #`1391b98bf`.
Python version is 3.7.12.
These are the versions used by ESRF detector pool's computers.
pip install -e . --no-deps
```
!!!note
As of March 22, 2022, Bliss `1.9.x` branch points to commit #`1391b98bf`.
Python version is `3.7.12`.
These are the versions used by ESRF detector pool's computers.
* test bliss installation:
```
C:\ python
>>> import bliss
>>>
```
```
C:\ python
>>> import bliss
>>>
```
### Installation of XIA software
* Copy into `c:\blissadm` files an directories found in:
* Copy into `c:\blissadm\` files an directories found in:
```
P:\\ISDD\SOFTWARE\Public\distrib\XIA\
......@@ -104,11 +104,15 @@ P:\\ISDD\SOFTWARE\Public\distrib\XIA\
* version 1.1.22 64 bits
* Depending on the XIA device FalconX or Xmap/Mercury:
* Depending on the XIA device type, **FalconX** or **Xmap/Mercury**:
* Install the corresponding *ProSpect*
* Test connection to the device with *ProSpect*
* If available, install configuration file(s) in: `c:\blissadm\falconx\config\id00` or in `c:\blissadm\xmap\config\id00`
!!!tip
Avoid to rename Prospect for Xmap/Mercury installation directory.
There is a link to it hard coded in config files. An update of the name means an update of all config files.
* If available, install configuration file(s) in: `c:\blissadm\falconx\config\id00\` or in `c:\blissadm\xmap\config\id00\`
!!! note "For FalconX"
* Connection to the falconX can be tested with a browser using address `http://192.168.200.201`
......@@ -125,17 +129,23 @@ P:\\ISDD\SOFTWARE\Public\distrib\XIA\
!!!important
To ensure a peaceful coexistence between conda and powershell, the shortcut
`falconx/falconx-start IDXX` should point to the startup script
`falconx/falconx-server_IDXX.ps1`. They need to be customised.
`falconx/falconx-server_IDXX.ps1`. They need to be customized.
* Duplicate startup script (let it in falconx/ directory) and rename it:
- `falconx\falconx-server_IDXX.ps1` -> `falconx\falconx-server_ID00.ps1`
* Copy *in `falconx` directory* and rename startup script:
`falconx\falconx-server_IDXX.ps1` -> `falconx\falconx-server_ID00.ps1`.
* Customize it according to Beamline configuration (BEACON_HOST / Device Name):
- right-click / `edit`
- right-clisk / edit
* Copy and rename the shortcut `falconx\falconx-start IDXX` on the desktop:
- drag'n drop with right mouse button OR `ctrl-c` `ctrl-v`
- rename the desktop shortcut `falconx-start ID00` (right click / rename)
* Customize the desktop shortcut:
- 'right-click' / 'properties' ; Change end of "Traget" line: `IDXX` -> `ID00`
* Copy and rename the shortcut *to the desktop* `falconx\falconx-start IDXX` ->
`falconx\falconx-start ID00`
* Customize it:
- Right-click / properties / Change end of `Traget` line: IDXX -> ID00
!!!note "Developer's details"
The `bliss-handel-server` start-up script is created at installation time using
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment