diff --git a/config/devices.properties b/config/devices.properties index 5e45d8d..fd33537 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -37,6 +37,7 @@ image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/conf #matrix=ch.psi.pshell.epics.GenericMatrix|SINEG01-DSCR350:FPICTURE 2560 2160||| cam1=ch.psi.pshell.epics.PsiCamera|SINEG01-DSCR350||-200|false cam2=ch.psi.pshell.epics.PsiCamera|SLG-LCAM-C041||-200| +cam3=SfCamera|SLG-LCAM-C041||-200| gsx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:X_SP SINEG01-MSOL130:X|||true gsy=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:Y_SP SINEG01-MSOL130:Y|||true gsrx=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:ROT_X_SP SINEG01-MSOL130:ROT_X|||true diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 6f50a84..10e1389 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Fri May 26 16:34:54 CEST 2017 +#Mon May 29 10:01:46 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=2000.0 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-96.58536606067958 -spatialCalOffsetY=-67.48201620883489 -spatialCalScaleX=-14.46944297232279 -spatialCalScaleY=-13.605441964787545 +spatialCalOffsetX=-50.03909304143862 +spatialCalOffsetY=-50.048875855327466 +spatialCalScaleX=-1.0 +spatialCalScaleY=-1.0 spatialCalUnits=mm transpose=false