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:21:11 +02:00
parent d5eb1fe57e
commit 3a1d612e34
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/diffcalc/test1.json
+3 -3
View File
@@ -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": {},
config/settings.properties
+1 -1
View File
@@ -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
script/local.py
+1 -3
View File
@@ -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):