diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 4c25ac4..f4d5738 100755 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,11 +1,11 @@ -#Tue Sep 24 17:38:23 CEST 2019 -spatialCalOffsetY=-79.30384541357998 -spatialCalOffsetX=-105.35473003527441 +#Wed Sep 25 13:42:47 CEST 2019 +spatialCalOffsetY=-483.5036425564949 +spatialCalOffsetX=-637.4980411378614 colormapLogarithmic=false scale=1.0 grayscale=false -spatialCalScaleX=-35.21126989416174 -spatialCalScaleY=-48.38709622896635 +spatialCalScaleX=-35.21126887460907 +spatialCalScaleY=-48.38709552593848 colormapMax=58981.0 serverURL=http\://gfa-lc6-64\:8889 rescaleOffset=0.0 diff --git a/plugins/ScreenPanel5.java b/plugins/ScreenPanel5.java index ec96b53..d104531 100644 --- a/plugins/ScreenPanel5.java +++ b/plugins/ScreenPanel5.java @@ -2271,7 +2271,11 @@ public class ScreenPanel5 extends Panel { } boolean getLaserState() throws Exception { - return (Epics.get("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", Integer.class) == 0); + try{ + return (Epics.get("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", Integer.class) == 0); + }catch (Exception ex){ + return false; + } } void elog(String logbook, String title, String message, String[] attachments) throws Exception {