From 0478e82275433d8038c399cd4cfee58f8c8ec089 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Wed, 3 Jul 2019 13:15:28 +0200 Subject: [PATCH] Closedown --- config/diffcalc/test1.json | 6 +++--- config/settings.properties | 2 +- script/daq/daq4-setup.py | 4 ++-- script/test/TestPixScan.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/diffcalc/test1.json b/config/diffcalc/test1.json index 0af1d53..3b30d08 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-03-07T17:02:32.044000" + "time": "2019-07-03T10:57:28.194000" }, "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-03-07T17:02:32.074000" + "time": "2019-07-03T10:57:28.217000" }, "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-03-07T17:02:32.137000" + "time": "2019-07-03T10:57:28.257000" } }, "orientlist": {}, diff --git a/config/settings.properties b/config/settings.properties index 5d05ff9..eff1b7a 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,4 +1,4 @@ -#Wed Jul 03 09:00:34 CEST 2019 +#Wed Jul 03 10:57:27 CEST 2019 count_time=0.1 geometry=fourcv roi=190 45 290 125 diff --git a/script/daq/daq4-setup.py b/script/daq/daq4-setup.py index 7b2eb72..89ca13c 100644 --- a/script/daq/daq4-setup.py +++ b/script/daq/daq4-setup.py @@ -64,9 +64,9 @@ setlat('cubic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0) addref([0, 1, 2], [5.0, 9.379, 19.7895, 102.6162], energy.take()) addref([2, 0, 2], [5.0, 19.0754, 20.1865, 11.9693], energy.take()) addref([2, 2, 2], [5.0, 27.1234, 21.2368, 60.0354], energy.take()) - - showub() + + checkub() print getub() diff --git a/script/test/TestPixScan.py b/script/test/TestPixScan.py index d9114b9..78e49b7 100644 --- a/script/test/TestPixScan.py +++ b/script/test/TestPixScan.py @@ -2,8 +2,8 @@ set_count_time(0.1) detectors = [pixel, pixel.image_filename, image.intensity,image.corrected_intensity, image.matrix] -#pixel.set_path("tmp", "gobbo") -pixel.set_path("../../expdata/bml_20190211a/pixel/", "images") +pixel.set_path("tmp", "gobbo") +#pixel.set_path("../../expdata/bml_20190211a/pixel/", "images") pixel.set_threshold(40, 500, 8000, 100000) pixel.show()