sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SFELPHOTON-1337: SwissMX split/ cleanup/move repositories

Browse Source
This commit is contained in:
zamofing_t
2024-09-24 18:56:27 +02:00
parent e63c814662
commit 3a0367073e
8 changed files with 130 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Readme.md
View File

@@ -1,9 +1,32 @@
Repository structure and dependency (update:23.09.24)
-----------------------------------------------------
```
https://jira.psi.ch/browse/SFELPHOTON-1337
psigithub git@git.psi.ch:grp-sf_cristallina/SwissMX.git --> ~/Documents/prj/SwissFEL/apps/SwissMX
Main python user interface fro SwissMX
psigithub git@git.psi.ch:grp-sf_cristallina/PBSwissMX.git --> ~/Documents/prj/SwissFEL/apps/PBSwissMX
PowerBrick documents and tool to generate trajectories and motion programs for SwissMX
psigithub git@git.psi.ch:epics_support_apps/PBTools.git --> ~/Documents/prj/SwissFEL/PBTools
packages needed by PBSwissMX for low level communication to PowerBrick
psigithub git@git.psi.ch:epics_support_apps/ppmac.git --> ~/Documents/prj/SwissFEL/PBTools/ppmac
packages needed by PBTools for lowest level communication to PowerBrick
additional module 'slic' is needed, which is provided by Sven and covers the JungFrau acquisition framefork
```
deployment and tests (update: 18.01.24)
---------------------------------------
#initial full deployment:
git commit-amend && git push psigithub -f && make uninstall init update
Document to start SwissMX in cristallina environment:
https://docs.google.com/document/d/1yEmV_DbRBKQKVCoovjXriNgSjNEBaz50WA0l3yA5jtg/edit#heading=h.z9io692b8tow
```
***************************
* push local stuff to git *
@@ -22,13 +45,14 @@ git push psigithub
*************************************
ssh zamofing_t@saresc-cons-03
#PRELIMINARY:
#cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX
#git remote add psigithub git@git.psi.ch:epics_ioc_modules/ESB_MX.git
#cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX
#git remote add psigithub git@git.psi.ch:zamofing_t/SwissMX.git
#first time only:
cd /sf/cristallina/applications/
git clone -o psigithub git@git.psi.ch:grp-sf_cristallina/SwissMX.git
git clone -o psigithub git@git.psi.ch:grp-sf_cristallina/SwissMX_PB.git
rsync -vain ~/Documents/prj/SwissFEL/apps/SwissMX/simCamImg saresc-cons-03:/sf/cristallina/applications/SwissMX/
cd /sf/cristallina/applications/SwissMX
cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX &&\
cd /sf/cristallina/applications/SwissMX &&\
git checkout master &&\
git stash push &&\
git fetch psigithub master &&\
@@ -36,19 +60,28 @@ git reset psigithub/master --hard &&\
git stash pop
#git pull psigithub --ff-only master
cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX &&\
cd /sf/cristallina/applications/SwissMX_PB &&\
git checkout master &&\
git stash push &&\
git fetch psigithub master &&\
git reset psigithub/master --hard &&\
git stash pop && chmod -R g+w *
git stash pop
#git pull psigithub --ff-only master
*******************
* run application *
*******************
additionally needed packages on an RH8 system:
pip install --user pandas zmq qtawesome
mkdir -p /sf/cristallina/applications/python3.6-packages
pip3.6 install --prefix /sf/cristallina/applications/SwissMX pandas zmq qtawesome
cd /sf/cristallina/applications/SwissMX
/opt/gfa/python-3.8/latest/bin/python swissmx.py
ssh gac-cristall@saresc-cons-03 (pw:ValToira_2021)
cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX/
cd /sf/cristallina/applications/SwissMX/
# conda env list
conda activate crmx38
python swissmx.py --sim 0xc0
@@ -383,9 +416,11 @@ MXMotion.py -> setup_sync()
s.a. ~/Documents/prj/SwissFEL/epics_ioc_modules/ESB_MX/Readme.md -> EVR
```
23.9.24 spitting/moving repositories
------------------------------------
```
https://jira.psi.ch/browse/SFELPHOTON-1337: SwissMX split/ cleanup/move repositories
```
----------------------------------- SCRATCH -----------------------------------