diff options
| author | Thomas White <htcc01@max-cfel007.desy.de> | 2019-09-30 20:58:02 +0200 |
|---|---|---|
| committer | Thomas White <htcc01@max-cfel007.desy.de> | 2019-09-30 20:58:02 +0200 |
| commit | ba83ae6fb1a19bd6c83957a8643cf56126090e07 (patch) | |
| tree | 6794aff4ba9982c8ecc259dd348ecfe42868695e | |
| parent | 10a69c2b9518cebb8a11c57121566907ba60f125 (diff) | |
Fix commands
| -rw-r--r-- | crystfel-demo.c | 6 | ||||
| -rw-r--r-- | files/calc-foms.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crystfel-demo.c b/crystfel-demo.c index 1916f4d..6533268 100644 --- a/crystfel-demo.c +++ b/crystfel-demo.c @@ -271,8 +271,8 @@ gint calc_fom(GtkWidget *widget, struct crystfeldemo *demo) sub = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE, &error, "xfce4-terminal", - "-x", "sh", - "calc-foms.sh", + "-H", "-x", "sh", "-c", + "sh ${CRYSTFEL_DEMO_FILES}/calc-foms.sh", NULL); if ( sub == NULL ) { @@ -289,7 +289,7 @@ gint show_reflist(GtkWidget *widget, struct crystfeldemo *demo) sub = g_subprocess_new(G_SUBPROCESS_FLAGS_NONE, &error, "xfce4-terminal", - "-x", "sh", "-c", + "-H", "-x", "sh", "-c", "less ${CRYSTFEL_DEMO_FILES}/merged.hkl", NULL); diff --git a/files/calc-foms.sh b/files/calc-foms.sh index 02266a2..ef2e28a 100644 --- a/files/calc-foms.sh +++ b/files/calc-foms.sh @@ -5,11 +5,11 @@ conda activate cfel_crystallography set -x -check_hkl merged.hkl --highres=3 -p 5HT2B.cell +check_hkl ${CRYSTFEL_DEMO_FILES}/merged.hkl --highres=3 -p ${CRYSTFEL_DEMO_FILES}/5HT2B.cell cat shells.dat -compare_hkl merged.hkl1 merged.hkl2 --highres=3 -p 5HT2B.cell --fom=cc +compare_hkl ${CRYSTFEL_DEMO_FILES}/merged.hkl1 ${CRYSTFEL_DEMO_FILES}/merged.hkl2 --highres=3 -p ${CRYSTFEL_DEMO_FILES}/5HT2B.cell --fom=cc cat shells.dat -compare_hkl merged.hkl1 merged.hkl2 --highres=3 -p 5HT2B.cell --fom=Rsplit +compare_hkl ${CRYSTFEL_DEMO_FILES}/merged.hkl1 ${CRYSTFEL_DEMO_FILES}/merged.hkl2 --highres=3 -p ${CRYSTFEL_DEMO_FILES}/5HT2B.cell --fom=Rsplit cat shells.dat |