diff --git a/config/diffcalc/test1.json b/config/diffcalc/test1.json index 400afe0..87d147b 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-31T10:03:23.048000" + "time": "2019-07-31T10:30:43.597000" }, "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-31T10:03:23.082000" + "time": "2019-07-31T10:30:43.624000" }, "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-31T10:03:23.189000" + "time": "2019-07-31T10:30:43.660000" } }, "orientlist": {}, diff --git a/config/settings.properties b/config/settings.properties index e5d026a..30abc5f 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Wed Jul 31 10:23:10 CEST 2019 +#Wed Jul 31 10:30:43 CEST 2019 count_time=1.0 geometry=fourcv roi=173 88 285 136 diff --git a/script/local.py b/script/local.py index 5677732..d1dae2a 100644 --- a/script/local.py +++ b/script/local.py @@ -382,8 +382,8 @@ def wait_for_file_size(filepath, size, timeout = None): def ci(positions, energy=None): return hklci(positions, energy)[0] -def ca(positions, energy=None): - return hklca(positions, energy)[0] +def ca(hkl, energy=None): + return hklca(hkl, energy)[0] def wh(): hklwh()