From 3a1d612e349577bcb40015fd6037578a9d153ccf Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Tue, 30 Jul 2019 16:21:11 +0200 Subject: [PATCH] Closedown --- config/diffcalc/test1.json | 6 +++--- config/settings.properties | 2 +- script/local.py | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/diffcalc/test1.json b/config/diffcalc/test1.json index 6022478..cb8ec44 100644 --- a/config/diffcalc/test1.json +++ b/config/diffcalc/test1.json @@ -7,21 +7,21 @@ "hkl": "[0.0, 1.0, 2.0]", "pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]", "energy": 9.5007, - "time": "2019-07-30T15:16:23.421000" + "time": "2019-07-30T16:07:13.341000" }, "2": { "tag": null, "hkl": "[2.0, 0.0, 2.0]", "pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]", "energy": 9.5007, - "time": "2019-07-30T15:16:23.457000" + "time": "2019-07-30T16:07:13.369000" }, "3": { "tag": null, "hkl": "[2.0, 2.0, 2.0]", "pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]", "energy": 9.5007, - "time": "2019-07-30T15:16:23.509000" + "time": "2019-07-30T16:07:13.451000" } }, "orientlist": {}, diff --git a/config/settings.properties b/config/settings.properties index c5b328a..c93c4c1 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Tue Jul 30 16:05:02 CEST 2019 +#Tue Jul 30 16:07:12 CEST 2019 count_time=1.0 geometry=fourcv roi=173 88 285 136 diff --git a/script/local.py b/script/local.py index 18a5f4e..9dfd6ca 100644 --- a/script/local.py +++ b/script/local.py @@ -240,9 +240,7 @@ def before_sample(position, scan): def after_sample(rec, scan): close_shutter() - print 1 if auto_after_sample(rec, scan): - print 2 save_metadata(rec, scan) ################################################################################################### @@ -268,7 +266,7 @@ def get_diag_channels(): diag_channels.append(h.readback) diag_channels.append(k.readback) diag_channels.append(l.readback) - diag_channels.append("wavelength") + diag_channels.append(wavelength) return diag_channels def get_diag_name(diag):