PShell v1_14

correlation_panel

@@ -7,6 +7,7 @@
      -data=/sf/bernina/config/pshell_data \
      -l -d -k -q -b \
      -p=Correlation.java \
-     -version=v1_10 \
+     -version=v1_14 \
+     -pini=true \
      $@ 
 

pshell_be

@@ -8,6 +8,7 @@
      -home=/sf/bernina/config/pshell_be \
      -data=/sf/bernina/config/pshell_data \
      -strh=/sf/bernina/config/pshell_be/stripchart \
-     -version=v1_10 \
+     -version=v1_14 \
+     -pini=true \
      $@
 

screen_panel

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export SP_VER=5
+export SP_VER=6
 
 for i in "$@"
 do
@@ -11,7 +11,7 @@ case $i in
     ;;
 
     -spt)
-        export SP_VER=5
+        export SP_VER=6
         #shift 
     ;;
 
@@ -22,22 +22,17 @@ done
 
 echo "ScreenPanel" ${SP_VER}
 
+# Shared
 /opt/gfa/pshell/pshell \
      -jvmarg="-Duser.home=/sf/data/measurements"  \
      -dlaf \
+     -version=v1_14 \
      -home=/afs/psi.ch/intranet/SF/Applications/config/pshell_op \
      -data=/sf/data/measurements -l -d -k -q -b -e -g -n -buf=10 -poll=250 -clog=SEVERE -p=SfCamera.java -p=Inventory.java -p=CameraCalibrationDialog.java -p=ScreenPanel${SP_VER}.java -srv_url=sf-daqsync-01:8889 -cam_srv_url=sf-daqsync-01:8888 \
      $@
 
-#/opt/gfa/pshell/pshell \
-     #-jvmarg="-Duser.home=/sf/data/measurements"  \
-     #-dlaf \
-     #-home=/sf/bernina/config/pshell_be \
-     #-data=/sf/bernina/config/pshell_data -l -d -k -q -b -e -g -n -buf=10 -poll=250 -clog=SEVERE -p=SfCamera.java -p=Inventory.java -p=CameraCalibrationDialog.java -p=ScreenPanel${SP_VER}.java -srv_url=sf-daqsync-01:8889 -cam_srv_url=sf-daqsync-01:8888 \
-     #$@
 
-
-# old 2019-09-23
+# Exclusive
 #/opt/gfa/pshell/pshell \
      #-jvmarg="-Duser.home=/sf/bernina/data"  \
      #-dlaf \
@@ -45,11 +40,11 @@ echo "ScreenPanel" ${SP_VER}
      #-data=/sf/bernina/config/pshell_data \
      #-l -d -k -q -b -e -g -n -buf=10 -poll=250 -clog=SEVERE \
      #-p=SfCamera.java \
-     #-persist \
      #-p=Inventory.java \
      #-p=CameraCalibrationDialog.java \
-     #-p=ScreenPanel4.java \
-     #-srv_url=sf-daqsync-01:8889 -cam_srv_url=sf-daqsync-01:8888 \
-     #-version=v1_10 \
+     #-p=ScreenPanel6.java \
+     #-srv_url=sf-daqsync-01:8889 \
+     #-cam_srv_url=sf-daqsync-01:8888 \
+     #-version=v1_14 \
      #$@
 

strip_chart

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-#-strh=/sf/bernina/config/pshell_be/stripchart \
 
 /opt/gfa/pshell/pshell \
      -jvmarg="-Duser.home=/sf/bernina/config/pshell_be/stripchart"  \
@@ -10,5 +9,6 @@
      -dlaf \
      -strp \
      -strh=/sf/bernina/config/strip_chart \
-     -version=v1_10 \
+     -version=v1_14 \
+     -pini=true \
      $@