From e2fc47bd0238cc1c5006caba39e3b3ade13ee983 Mon Sep 17 00:00:00 2001 From: steppke_a Date: Thu, 5 May 2022 12:03:48 +0000 Subject: [PATCH 1/4] Added information how to use shortcuts in conda envs. --- computing.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/computing.md b/computing.md index e996e56..ff6e72e 100644 --- a/computing.md +++ b/computing.md @@ -26,7 +26,7 @@ To check the currently available space: ## File permsissions -We should all be part of the unx-cristall group. Please make sure permissions are set at least `chmod u+rw,g+rw,` so that everyone within the group can access and modify documents. Only set more restrictive permissions when necessary. +We should all be part of the unx-cristall group. Please make sure permissions are set at least `chmod g+rw,` so that everyone within the group can access and modify documents. Only set more restrictive permissions when necessary. (Alternatively `chmod g=u` to set the permissions equal to user permissions). ## Anaconda @@ -44,12 +44,18 @@ The main environments are: for instrument control and data analysis. We are trying to track recent upstream packages but please only update if you ensure a working state afterwards and document the changes. +To be able to use the shortcut for activation, e.g. `conda activate slic` the environment directory needs to be added to your `.condarc` file as follows: + +```` +envs_dirs: + - /sf/cristallina/applications/conda/envs +```` + A backup environment is currently located at: ```` /gpfs/photonics/swissfel/res/cristallina-staff/p19739/backup/cristallina2 ```` -To activate the environment -`conda activate /gpfs/photonics/swissfel/res/cristallina-staff/p19739/backup/cristallina2` if some other conda installation is already available. +if all else fails. # sf_datafiles directly from github From d910e7aae19da3f1252a22e75ec22f8e52815d5b Mon Sep 17 00:00:00 2001 From: vonka_j Date: Mon, 23 May 2022 16:02:46 +0000 Subject: [PATCH 2/4] Command to switch between open/closed slits, needs doing regularly when adjusting pointing --- test.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 test.md diff --git a/test.md b/test.md new file mode 100644 index 0000000..acdcb53 --- /dev/null +++ b/test.md @@ -0,0 +1,10 @@ +# Shortcut when adjusting poiting + +A useful command is to switch between which slit is open or closed +caputq SARFE10-OAPU044:MOTOR_W 0.25; caputq SARFE10-OAPU044:MOTOR_H 0.25; caputq SARFE10-OAPU092:MOTOR_W 3.00; caputq SARFE10-OAPU092:MOTOR_H 3.00; +(to open the back slit and close the upstream one) +caputq SARFE10-OAPU044:MOTOR_W 3.00; caputq SARFE10-OAPU044:MOTOR_H 3.00; caputq SARFE10-OAPU092:MOTOR_W 0.25; caputq SARFE10-OAPU092:MOTOR_H 0.25; +(to do the opposite, open the front and close down the downstream slit) + +To view the beam after both slits, use SAROP21-PPRM113 camera (from the screen_panel). + From efb150312bea183e59036bf321bba197a8a1d559 Mon Sep 17 00:00:00 2001 From: vonka_j Date: Mon, 23 May 2022 16:03:02 +0000 Subject: [PATCH 3/4] Update test.md --- test.md => Pointing_shortcut.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test.md => Pointing_shortcut.md (100%) diff --git a/test.md b/Pointing_shortcut.md similarity index 100% rename from test.md rename to Pointing_shortcut.md From 6df6f8125af234b2750e4102b9a6e17c5135aa11 Mon Sep 17 00:00:00 2001 From: vonka_j Date: Mon, 23 May 2022 16:05:36 +0000 Subject: [PATCH 4/4] Update Pointing_shortcut.md --- Pointing_shortcut.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Pointing_shortcut.md b/Pointing_shortcut.md index acdcb53..79b1504 100644 --- a/Pointing_shortcut.md +++ b/Pointing_shortcut.md @@ -1,9 +1,11 @@ # Shortcut when adjusting poiting -A useful command is to switch between which slit is open or closed -caputq SARFE10-OAPU044:MOTOR_W 0.25; caputq SARFE10-OAPU044:MOTOR_H 0.25; caputq SARFE10-OAPU092:MOTOR_W 3.00; caputq SARFE10-OAPU092:MOTOR_H 3.00; +A useful command is to switch between which slit is open or closed (here using OAPU044 & OAPU092). This is useful because when adjusting pointing, one must switch between the two configurations back and forth regularly. + +`caputq SARFE10-OAPU044:MOTOR_W 0.25; caputq SARFE10-OAPU044:MOTOR_H 0.25; caputq SARFE10-OAPU092:MOTOR_W 3.00; caputq SARFE10-OAPU092:MOTOR_H 3.00; ` (to open the back slit and close the upstream one) -caputq SARFE10-OAPU044:MOTOR_W 3.00; caputq SARFE10-OAPU044:MOTOR_H 3.00; caputq SARFE10-OAPU092:MOTOR_W 0.25; caputq SARFE10-OAPU092:MOTOR_H 0.25; + +`caputq SARFE10-OAPU044:MOTOR_W 3.00; caputq SARFE10-OAPU044:MOTOR_H 3.00; caputq SARFE10-OAPU092:MOTOR_W 0.25; caputq SARFE10-OAPU092:MOTOR_H 0.25; ` (to do the opposite, open the front and close down the downstream slit) To view the beam after both slits, use SAROP21-PPRM113 camera (from the screen_panel).