From 5d3052b4ae84056e4e6edd3fec57e1ebbc5ec1e0 Mon Sep 17 00:00:00 2001
From: Gobbo Alexandre <gobbo_a@sf-lc7a.psi.ch>
Date: Mon, 19 Dec 2022 17:08:35 +0100
Subject: [PATCH] Update CorrelationPanel and ScreenPanel

---
 correlation_panel |  5 ++---
 screen_panel      | 39 ++++++++-------------------------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/correlation_panel b/correlation_panel
index 3f6b0ba..eb860fb 100755
--- a/correlation_panel
+++ b/correlation_panel
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 /sf/bernina/bin/pshell_be \
-     -p=/opt/gfa/pshell/apps/correlation/Correlation2.java \
-     -l -d -k -q -b \
-     -laf=darcula \
+     -m=/opt/gfa/pshell/apps/correlation \
+     -sbar -l -d -k -q -b -e -g \
      $@
diff --git a/screen_panel b/screen_panel
index 4dfe566..c61233d 100755
--- a/screen_panel
+++ b/screen_panel
@@ -1,35 +1,12 @@
 #!/bin/bash
 
-export SP_VER=9
+echo "ScreenPanel" 
 
-for i in "$@"
-do
-case $i in
-    -spv=*|--version=*)
-        export SP_VER="${i#*=}"
-        #shift
-    ;;
-
-    -spt)
-        export SP_VER=9
-        #shift 
-    ;;
-
-    *)    # unknown option            
-    ;;
-esac
-done
-
-echo "ScreenPanel" ${SP_VER}
-
-/sf/bernina/bin/pshell_be -l -d -q -b -e -g -n -buf=10 -poll=250 -clog=SEVERE \
-     -size=1000x800 \
-     -p=/opt/gfa/pshell/apps/screen_panel/SfCamera.java \
-     -p=/opt/gfa/pshell/apps/screen_panel/Inventory.java \
-     -p=/opt/gfa/pshell/apps/screen_panel/CameraCalibrationDialog.java \
-     -p=/opt/gfa/pshell/apps/screen_panel/ScreenPanel${SP_VER}.java \
-     -srv_url=sf-daqsync-01:8889 \
-     -cam_srv_url=sf-daqsync-01:8888 \
-     -laf=darcula \
-     -persist \
+/sf/bernina/bin/pshell_be -l -d -k=false -q -b -e -g -n -buffer_size=10 -clog=SEVERE -size=1000x800 \
+     -p=/opt/gfa/pshell/apps/screen_panel/ScreenPanel.java \
+     -pipeline_server=sf-daqsync-01:8889 \
+     -camera_server=sf-daqsync-01:8888 \
+     -clog=FINE -laf=dark \
+     -persist_camera \
      ${1+"$@"}
+