diff --git a/config/config.properties b/config/config.properties index 9d24384..d5ab68a 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 21:13:20 CEST 2017 +#Mon Nov 06 12:06:12 CET 2017 autoSaveScanData=true createSessionFiles=false dataLayout=default @@ -14,6 +14,7 @@ logDaysToLive=-1 logLevel=Fine logLevelConsole=Off logPath={logs}/{date}_{time} +notificationLevel=null scanStreamerPort=-1 serverEnabled=false serverPort=8095 diff --git a/config/devices.properties b/config/devices.properties index b9800e1..f4aa657 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -18,5 +18,3 @@ adc_xh1=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-014-x-h1-DATA-SU adc_yh2=ch.psi.pshell.epics.ChannelInteger|SARFE10-PBPG050:HAMP-011-y-h2-DATA-SUM|||true m2rx=ch.psi.pshell.epics.Motor|SAROP21-OOMV096:W_RX|||true #camtool=ch.psi.pshell.bs.Camtool|localhost:10000||| -invalid1=ch.psi.pshell.epics.ChannelDouble|SARUN15-UIND030:INVALID-PV -1 True Nullify|||true -invalid2=ch.psi.pshell.epics.ChannelDouble|SARUN15-UIND030:INVALID-PV -1 False Exception|||true diff --git a/config/mail.properties b/config/mail.properties new file mode 100644 index 0000000..eb5c2cb --- /dev/null +++ b/config/mail.properties @@ -0,0 +1,9 @@ +#Mon Nov 06 12:06:13 CET 2017 +auth=None +from= +host= +port=0 +pwd= +smsSuffix=@sms.switch.ch +to= +usr= diff --git a/devices/apu44x.properties b/devices/apu44x.properties index 75a8776..446909c 100644 --- a/devices/apu44x.properties +++ b/devices/apu44x.properties @@ -1,4 +1,4 @@ -#Sat Sep 02 12:48:50 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=1.0 estbilizationDelay=1 hasEnable=false @@ -12,4 +12,5 @@ precision=2 resolution=0.01 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/apu44y.properties b/devices/apu44y.properties index 6bce51a..6000794 100644 --- a/devices/apu44y.properties +++ b/devices/apu44y.properties @@ -1,4 +1,4 @@ -#Sat Sep 02 12:46:26 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=1.0 estbilizationDelay=1 hasEnable=false @@ -12,4 +12,5 @@ precision=2 resolution=0.1 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/m1ba.properties b/devices/m1ba.properties index b6cbdca..05d3a41 100644 --- a/devices/m1ba.properties +++ b/devices/m1ba.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 20:25:39 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=0.05 estbilizationDelay=0 hasEnable=false @@ -12,4 +12,5 @@ precision=3 resolution=1.0E-6 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/m1bb.properties b/devices/m1bb.properties index 44d95e3..05d3a41 100644 --- a/devices/m1bb.properties +++ b/devices/m1bb.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 20:26:13 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=0.05 estbilizationDelay=0 hasEnable=false @@ -12,4 +12,5 @@ precision=3 resolution=1.0E-6 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/m2rx.properties b/devices/m2rx.properties index 6bde955..329c8e2 100644 --- a/devices/m2rx.properties +++ b/devices/m2rx.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 17:17:38 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=100.0 estbilizationDelay=0 hasEnable=false @@ -12,4 +12,5 @@ precision=6 resolution=0.001 rotation=false scale=1.0 +startRetries=1 unit=mrad diff --git a/devices/pbpg_mx.properties b/devices/pbpg_mx.properties index 988f9b1..4cf90e2 100644 --- a/devices/pbpg_mx.properties +++ b/devices/pbpg_mx.properties @@ -1,15 +1,16 @@ -#Tue Aug 29 17:00:42 CEST 2017 +#Sat Oct 21 15:38:05 CEST 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false homingType=None maxSpeed=10.0 -maxValue=0.8 +maxValue=1.6 minSpeed=NaN -minValue=-0.6 +minValue=-1.6 offset=0.0 precision=3 resolution=0.001 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/pbpg_my.properties b/devices/pbpg_my.properties index 6d55afb..76e2907 100644 --- a/devices/pbpg_my.properties +++ b/devices/pbpg_my.properties @@ -1,15 +1,16 @@ -#Tue Aug 29 17:00:42 CEST 2017 +#Sat Oct 21 15:38:30 CEST 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false homingType=None maxSpeed=10.0 -maxValue=1.0 +maxValue=1.6 minSpeed=NaN -minValue=-1.4 +minValue=-1.6 offset=0.0 precision=3 resolution=0.001 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/pbps53_mx.properties b/devices/pbps53_mx.properties index 810f1dc..95f3882 100644 --- a/devices/pbps53_mx.properties +++ b/devices/pbps53_mx.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 16:45:14 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false @@ -12,4 +12,5 @@ precision=3 resolution=1.953125E-5 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/devices/pbps53_my.properties b/devices/pbps53_my.properties index 810f1dc..95f3882 100644 --- a/devices/pbps53_my.properties +++ b/devices/pbps53_my.properties @@ -1,4 +1,4 @@ -#Fri Sep 01 16:45:14 CEST 2017 +#Wed Oct 18 13:40:45 CEST 2017 defaultSpeed=1.5 estbilizationDelay=0 hasEnable=false @@ -12,4 +12,5 @@ precision=3 resolution=1.953125E-5 rotation=false scale=1.0 +startRetries=1 unit=mm diff --git a/script/PbpgPosXScan.py b/script/PbpgPosXScan.py index 73e0836..2aa009b 100644 --- a/script/PbpgPosXScan.py +++ b/script/PbpgPosXScan.py @@ -12,7 +12,7 @@ av_xbpm_x = create_averager(xbpm_x, count = 20, interval = -1, name = "av_xbpm_x av_xbpm_x.monitored = True #The actuals scan -r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -0.5, 0.5, 20, latency = 0.0) +r=lscan(pbpg_mx, [av_hamp_x, av_xbpm_x], -1.5, 1.5, 60, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd') diff --git a/script/PbpgPosYScan.py b/script/PbpgPosYScan.py index 409589a..0b866f1 100644 --- a/script/PbpgPosYScan.py +++ b/script/PbpgPosYScan.py @@ -12,7 +12,7 @@ av_xbpm_y = create_averager(xbpm_y, count = 20, interval = -1, name = "av_xbpm_y av_xbpm_y.monitored = True #The actuals scan -r=lscan(pbpg_my, [av_hamp_y, av_xbpm_y], -0.5, 0.5, 20, latency = 0.0) +r=lscan(pbpg_my, [av_hamp_y, av_xbpm_y], -1.5, 1.5, 30, latency = 0.0) #Fitting values = to_array(r.getReadable(0), 'd')