tell/X10SA
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mount.py plus settings

Browse Source
This commit is contained in:
gac-S_Changer
2022-04-05 09:13:02 +02:00
parent b39215fb92
commit 9bd775bfeb
18 changed files with 81 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.properties
+27 -14
View File
@@ -1,37 +1,50 @@
#Fri Aug 14 09:21:30 CEST 2020
#Wed Mar 02 10:57:08 CET 2022
autoSaveScanData=true
simulation=false
commandExecutionEvents=false
logDaysToLive=30
dataScanSaveOutput=false
userAuthenticator=
logLevelConsole=Off
filePermissionsConfig=Default
scanStreamerPort=-1
dataScanSaveScript=false
dataScanSaveSetpoints=false
notifiedTasks=
parallelInitialization=false
dataTransferPath=
saveConsoleSessionFiles=false
versionTrackingManual=true
dataTransferMode=Off
hostName=null
userManagement=false
instanceName=X10SA
autoSaveScanData=true
simulation=false
disableEmbeddedAttributes=false
dataServerPort=-1
hideServerMessages=true
serverPort=8080
versionTrackingEnabled=true
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
serverEnabled=true
commandExecutionEvents=false
logDaysToLive=30
dataScanReleaseRecords=false
depthDimension=0
dataScanPreserveTypes=false
logLevel=Fine
dataScanSaveOutput=false
dataScanFlushRecords=true
logPath={logs}/{date}_{time}
filePermissionsLogs=Default
dataLayout=table
disableDataFileLogs=false
sessionHandling=Off
terminalEnabled=false
notificationLevel=null
userAuthenticator=
logLevelConsole=Off
notificationLevel=Off
filePermissionsScripts=Default
terminalPort=3579
scanStreamerPort=-1
dataScanSaveScript=false
dataScanSaveSetpoints=false
parallelInitialization=false
dataTransferUser=
filePermissionsData=Default
createSessionFiles=true
versionTrackingLogin={context}/svcusr-hlapp_robot
versionTrackingManual=true
noBytecodeFiles=false
versionTrackingRemote=git@git.psi.ch\:tell/X10SA.git
dataProvider=txt
saveCommandStatistics=true
config/devices-modbus.properties
+1
View File
@@ -1,6 +1,7 @@
th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.118.200:502|||
temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000|
humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000|
#dew_point=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 9||1000|
wago=ch.psi.pshell.modbus.ModbusTCP|tell10s-wago:502|||
led_ok_1=ch.psi.pshell.modbus.DigitalInput|wago 0||1000|
config/devices.properties
+3 -3
View File
@@ -2,9 +2,9 @@ aerotech_x=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-DF1:GMX-RBV|Read|1000|fals
cryopos=ch.psi.pshell.epics.Motor|X10SA-ES-CJ:TRY1|||true
magnet_position=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-DFS:CBOX-SENSOR1|Read||true
magnet_position_ok=ch.psi.pshell.epics.ChannelString|X10SA-ES-DF1:SN1-CMP|Read||true
th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.118.200:502|||
temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000|
humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000|
#th2e=ch.psi.pshell.modbus.ModbusTCP|129.129.118.200:502|||
#temperature=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 1||10000|
#humidity=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 5||10000|
#dew_point=ch.psi.pshell.modbus.ReadonlyProcessVariable|th2e 9||1000|
#img=ch.psi.pshell.prosilica.Prosilica|204464 "PacketSize=1504;PixelFormat=Mono8;BinningX=1;BinningY=1;RegionX=290;RegionY=130;Width=1000;Height=1000;MulticastEnable=Off"||-200|false
#gripper_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8ea5e463.psi.ch/axis-cgi/mjpg/video.cgi?camera=1 reopen||-200|false
config/jcae.properties
+9 -8
View File
@@ -1,11 +1,12 @@
#Tue Sep 06 15:10:24 CEST 2016
ch.psi.jcae.ContextFactory.addressList=
ch.psi.jcae.ContextFactory.serverPort=
#Mon Mar 14 10:49:28 CET 2022
ch.psi.jcae.ContextFactory.maxArrayBytes=20000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ChannelFactory.timeout=500
ch.psi.jcae.impl.DefaultChannelService.retries=2
ch.psi.jcae.impl.DefaultChannelService.timeout=1000
ch.psi.jcae.ContextFactory.autoAddressList=true
ch.psi.jcae.ChannelFactory.timeout=1000
ch.psi.jcae.ContextFactory.maxSendArrayBytes=
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ContextFactory.useShellVariables=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=true
ch.psi.jcae.ContextFactory.addressList=X10SA-VME-ES1.psi.ch
ch.psi.jcae.ContextFactory.serverPort=
ch.psi.jcae.impl.DefaultChannelService.retries=2
ch.psi.jcae.ContextFactory.autoAddressList=true
config/settings.properties
+2 -2
View File
@@ -1,10 +1,10 @@
#Thu Dec 09 11:39:57 CET 2021
#Tue Apr 05 09:11:38 CEST 2022
dry_mount_counter=0
room_temperature_enabled=false
pin_offset=-0.0
puck_types=true
imaging_enabled=false
dry_timestamp=1.639039691589E9
dry_timestamp=1.649142698729E9
roi_h=1000
led_level=0.0
beamline_status_enabled=false
config/setup.properties
+16 -13
View File
@@ -1,20 +1,23 @@
#Tue Sep 17 15:06:05 CEST 2019
configFile={config}/config.properties
#Wed Mar 02 10:57:08 CET 2022
scriptPath={home}/script
sessionsPath={outp}/sessions
pluginsPath={home}/plugins
configFileDevices={config}/devices.properties
consoleSessionsPath={sessions}/console
libraryPath={script}; {script}/Lib
configFilePlugins={config}/plugins.properties
configFileSettings={config}/settings.properties
configFileTasks={config}/tasks.properties
configFileVariables={config}/variables.properties
configPath={home}/config
contextPath={outp}/context
extensionsPath={home}/extensions
configPath={home}/config
configFileSessions={config}/sessions.properties
userSessionsPath={sessions}/user
dataPath={outp}/data
devicesPath={home}/devices
extensionsPath={home}/extensions
imagesPath={outp}/images
libraryPath={script}; {script}/Lib
configFileVariables={config}/variables.properties
configFileSettings={config}/settings.properties
logPath={outp}/log
pluginsPath={home}/plugins
scriptPath={home}/script
scriptType=py
sessionsPath={outp}/sessions
wwwPath={home}/www
configFile={config}/config.properties
imagesPath={outp}/images
scriptType=py
configFileTasks={config}/tasks.properties
config/variables.properties
+4 -2
View File
@@ -1,2 +1,4 @@
#Wed Dec 01 11:40:27 CET 2021
FileSequentialNumber=180
#Wed Mar 02 10:58:36 CET 2022
LastRunDate=220302
FileSequentialNumber=206
DaySequentialNumber=2
devices/A3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Wed Apr 07 10:28:05 CEST 2021
#Sat Apr 02 16:26:23 CEST 2022
detection=Mechanical
disabled=false
disabled=true
devices/B2.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Tue Nov 30 11:36:27 CET 2021
#Fri Apr 01 11:06:19 CEST 2022
detection=Mechanical
disabled=false
disabled=true
devices/C1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Tue Aug 03 11:50:02 CEST 2021
#Fri Apr 01 11:06:42 CEST 2022
detection=Mechanical
disabled=false
disabled=true
devices/C5.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Tue Oct 06 13:31:33 CEST 2020
#Wed Mar 23 13:38:45 CET 2022
detection=Mechanical
disabled=false
disabled=true
devices/E1.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Tue Oct 05 08:32:25 CEST 2021
#Wed Mar 23 13:38:50 CET 2022
detection=Mechanical
disabled=false
disabled=true
devices/E3.properties
+1 -1
View File
@@ -1,3 +1,3 @@
#Mon Nov 15 08:51:11 CET 2021
#Tue Jan 18 10:28:22 CET 2022
detection=Mechanical
disabled=false
devices/F3.properties
+2 -2
View File
@@ -1,3 +1,3 @@
#Wed Aug 25 10:06:24 CEST 2021
#Fri Apr 01 11:06:30 CEST 2022
detection=Mechanical
disabled=false
disabled=true
devices/led_ctrl_1.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Dec 01 11:21:24 CET 2021
#Fri Mar 11 13:48:49 CET 2022
minValue=0.0
unit=V
offset=0.0
devices/led_ctrl_2.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Dec 01 11:21:24 CET 2021
#Fri Mar 11 13:48:49 CET 2022
minValue=0.0
unit=V
offset=0.0
devices/led_ctrl_3.properties
+1 -1
View File
@@ -1,4 +1,4 @@
#Wed Dec 01 11:21:24 CET 2021
#Fri Mar 11 13:48:49 CET 2022
minValue=0.0
unit=V
offset=0.0
script/motion/mount.py
+3 -3
View File
@@ -15,6 +15,7 @@ def mount(segment, puck, sample, force=True, read_dm=False, auto_unmount=False):
previous_mounted = get_setting("mounted_sample_position")
if previous_mounted is not None:
print "here now"
previous_segment, previous_puck, previous_sample = previous_mounted[0], int(previous_mounted[1]), int(previous_mounted[2:])
else:
previous_segment, previous_puck, previous_sample = "-", 0, 0
@@ -163,8 +164,7 @@ def mount(segment, puck, sample, force=True, read_dm=False, auto_unmount=False):
if read_dm:
mount_sample_id = barcode_reader.get_readout()
evlog("mount() read pin barcode: %s" % (mount_sample_id,))
else:
mount_sample_id = None
else:
mount_sample_id = None
curpos = cryopos.getPosition()
@@ -174,7 +174,7 @@ def mount(segment, puck, sample, force=True, read_dm=False, auto_unmount=False):
else:
speed = cryopos.getSpeed() / 1000.0
movetime = int(round(3000 + (15. - curpos) / speed))
cryopos.waitValueInRange(15.0, 1.0, movetime)
cryopos.move(15.0, movetime)
cryopos.waitValueInRange(15.0, 1.0, movetime)