pshell_config/x04sa-es3
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x04sa
2019-07-30 16:01:21 +02:00
parent 40654daa4c
commit 46a3fff3bd
3 changed files with 15 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
config/diffcalc/test1.json
View File

@@ -1,41 +1,27 @@
{
"name": "test1",
"crystal": "['cubic', 'Triclinic', 7.723071056222668, 7.702898811460209, 7.720064193668625, 89.99965543112849, 89.21875367198528, 89.99500143686504]",
"crystal": "['cubic', 'Triclinic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0]",
"reflist": {
"1": {
"tag": "None",
"tag": null,
"hkl": "[0.0, 1.0, 2.0]",
"pos": "[5.0, 9.3822, 19.7785, 104.4223, 0, 0]",
"pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]",
"energy": 9.5007,
"time": "2019-07-04T08:48:00.667000"
"time": "2019-07-30T15:16:23.421000"
},
"2": {
"tag": "None",
"tag": null,
"hkl": "[2.0, 0.0, 2.0]",
"pos": "[5.0, 19.054, 20.167, 13.8111, 0, 0]",
"pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]",
"energy": 9.5007,
"time": "2019-07-04T09:47:45.672000"
"time": "2019-07-30T15:16:23.457000"
},
"3": {
"tag": "None",
"tag": null,
"hkl": "[2.0, 2.0, 2.0]",
"pos": "[5.0, 27.1074, 21.198, 61.8741, 0, 0]",
"pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]",
"energy": 9.5007,
"time": "2019-07-04T10:13:37.671000"
},
"4": {
"tag": "None",
"hkl": "[0.0, -1.0, 2.0]",
"pos": "[5.0, 9.5098, 19.7025, -76.397, 0, 0]",
"energy": 9.5007,
"time": "2019-07-04T10:46:10.117000"
},
"5": {
"tag": "None",
"hkl": "[0.0, 3.0, 2.0]",
"pos": "[5.0, 28.827, 21.7498, 107.7429, 0, 0]",
"energy": 9.5007,
"time": "2019-07-04T10:56:41.220000"
"time": "2019-07-30T15:16:23.509000"
}
},
"orientlist": {},
@@ -45,11 +31,7 @@
"n_hkl_configured": null,
"n_phi_configured": "[0.0, 0.0, 1.0]"
},
"u": [
"0.9999129122215213, 0.007489577628036139, 0.010866195269269147",
"-0.007454780892516531, 0.999966966138507, -0.0032392705343809503",
"-0.01089009708500512, 0.0031579833286385197, 0.9999357143970682"
],
"u": null,
"ub": null,
"or0": null,
"or1": null

2
config/settings.properties
View File

@@ -1,4 +1,4 @@
#Tue Jul 30 15:11:05 CEST 2019
#Tue Jul 30 15:16:22 CEST 2019
count_time=1.0
geometry=fourcv
roi=173 88 285 136

6
script/local.py
View File

@@ -74,9 +74,6 @@ if not get_context().isSimulation():
else:
energy.write(9.5)
def after_sample(record, scan):
close_shutter()
run("utils/Auto")
###################################################################################################
@@ -242,7 +239,10 @@ 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)
###################################################################################################