pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
gac-x03da
2022-11-22 12:18:26 +01:00
parent ad40c9b926
commit fb27f929b4
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.properties
View File

@@ -1,4 +1,4 @@
#Fri Nov 04 14:30:31 CET 2022
#Tue Nov 22 12:06:11 CET 2022
autoSaveScanData=true
simulation=false
commandExecutionEvents=false

10
config/settings.properties
View File

@@ -1,7 +1,7 @@
#Fri Nov 04 14:30:31 CET 2022
pgroup=p20100
#Tue Nov 22 12:16:29 CET 2022
pgroup=p17274
proposal=
proposer=
proposer=bl-dev
prefix=
sample=
authors=
sample=dummy
authors=Matthias Muntwiler

8
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Fri Nov 04 10:05:32 CET 2022
LastRunDate=221104
FileSequentialNumber=14635
DaySequentialNumber=5
#Tue Nov 22 12:16:36 CET 2022
LastRunDate=221122
FileSequentialNumber=14750
DaySequentialNumber=9

4
script/local.py
View File

@@ -112,9 +112,13 @@ def trig_scienta():
time.sleep(0.1)
else:
image_id = Scienta.currentImageCount
print("Scienta.start, image_id = ", image_id)
Scienta.start()
print("Scienta.waitReady")
Scienta.waitReady(-1)
print("Scienta.waitNewImage")
Scienta.waitNewImage(3000, image_id)
print("exit trig_scienta, image_id = ", image_id)
from keithley import KeiSample, KeiReference

22
script/users/Niels/MultiRegionScan2022.py
View File

@@ -21,7 +21,7 @@ MOTORS = [dummy]
# number of cycles (integer - not decimal point!)
# (actual number of cycles is + 1)
NUMBER_OF_CYCLES = 0
NUMBER_OF_CYCLES = 30
POSITIONS = [1., 10., NUMBER_OF_CYCLES]
SCAN = 'lscan'
@@ -48,20 +48,20 @@ LATENCY = 0.0
# 'slit': exit slit (default: unchanged)
# 'position': 'reference' or 'sample'
REFERENCE_POSITION = {'X': -0.7,'Y': 0., 'Z': 118., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
SAMPLE_POSITION = {'X': -1.1,'Y': 0., 'Z': 114., 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
REFERENCE_POSITION = {'X': -0.8,'Y': 1.2, 'Z': 116.2, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
SAMPLE_POSITION = {'X': -1.2,'Y': 0., 'Z': 113.7, 'Theta': -9., 'Tilt': -2.0, 'Phi': -90.}
# REGIONS for 578 eV
#REGION1 = {'name': 'Cu3p','ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'reference'}
#REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
#REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
#REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION1 = {'name': 'Au4f','ephot': 578., 'elo': 482., 'ehi':492., 'estep': 0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'reference'}
REGION2 = {'name': 'In4d','ephot': 578., 'elo': 552.5, 'ehi':559., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION3 = {'name': 'As3d','ephot': 578., 'elo': 529., 'ehi':534.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION4 = {'name': 'In3d','ephot': 578., 'elo': 119., 'ehi':124., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
# REGIONS for 1050 eV
REGION1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'reference'}
REGION2 = {'name': 'In4d','ephot': 1050., 'elo': 1024.5, 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION3 = {'name': 'As3d','ephot': 1050., 'elo': 1002., 'ehi':1007.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
REGION4 = {'name': 'In3d','ephot': 1050., 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
#REGION1 = {'name': 'Au4f', 'ephot': 1050., 'elo': 954., 'ehi':964, 'estep': 0.02, 'epass': 50., 'tstep': 0.2, 'iter': 1, 'cis': False, 'position': 'reference'}
#REGION2 = {'name': 'In4d','ephot': 1050., 'elo': 1024.5, 'ehi':1031., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
#REGION3 = {'name': 'As3d','ephot': 1050., 'elo': 1002., 'ehi':1007.5, 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
#REGION4 = {'name': 'In3d','ephot': 1050., 'elo': 591., 'ehi':596., 'estep':0.02, 'epass': 50., 'tstep': 0.1, 'iter': 1, 'cis': False, 'position': 'sample'}
# list of region dictionaries to execute at each scan position