From 28dcba8651636d216b248ac5b9910f3c90c43701 Mon Sep 17 00:00:00 2001
From: chrin <jan.chrin@psi.ch>
Date: Mon, 6 Jan 2025 10:27:56 +0100
Subject: [PATCH] update

---
 src/analysis.py |  3 ++-
 tina.py         | 12 +++++++++++-
 tina.sh         | 13 +++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/analysis.py b/src/analysis.py
index c4659e3..a25238e 100644
--- a/src/analysis.py
+++ b/src/analysis.py
@@ -395,7 +395,8 @@ class AnalysisProcedure(QObject):
             height = 50.0
         else:
             height = 0.005
-       
+
+        #returns indices of peaks, and dictionary of properties    
         y1_peaks_pre = signal.find_peaks(self.y1_sample, height=height,
                                          distance=10)
 
diff --git a/tina.py b/tina.py
index c83c9d7..516d6fb 100644
--- a/tina.py
+++ b/tina.py
@@ -20,7 +20,17 @@ from apps4ops.hipa.enumkind import ElogHIPA
 from src.gui import AppGui
 from pyrcc5 import tina_resources
 
-
+#try:
+#    import pyscan
+#    import pyscan.interface.pyScan as PyScan
+#except:
+#    sys.path.append('/hipa/bd/applications/deps/apps4ops/v1.12.0/common/packages/')
+    #or insert to jump the queue
+    #sys.path.insert(0,'/hipa/bd/applications/deps/apps4ops/v1.12.0/common/packages/')
+#    import pyscan
+#    import pyscan.interface.pyScan as PyScan
+#    print("from common.packages import pyscan")
+    
 _pymodule = os.path.basename(__file__)
 _appname, _appext = _pymodule.split('.')
 _abspath = os.path.dirname(os.path.abspath(__file__))
diff --git a/tina.sh b/tina.sh
index be6467d..d877e75 100755
--- a/tina.sh
+++ b/tina.sh
@@ -5,7 +5,8 @@ cd /hipa/bd/applications/tina/devl
 appNameDefault="tina.sh"
 
 module unload gcc
-module load gcc/7.5.0
+module load gcc/7.3.0
+
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -18,12 +19,12 @@ else
 fi
 
 _EPICS_HOST_ARCH=${RHREL}-x86_64
-
+_EPICS_BASE=base-7.0.8
 
 # Select Python Version here. Currently one of 3.5, 3.7, 3.8 and 3.10
 PYTHON_VERSION=3.10
 #cafe-1.20.0-gcc-7.5.0
-PYTHON_PATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0
+PYTHON_PATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0-0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0
 
 if [ "$1" ]; then
     
@@ -35,7 +36,7 @@ if [ "$1" ]; then
        PYTHON_PATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0
        #module unload gcc
        #module load gcc/10.4.0
-     
+       export LD_PRELOAD=/usr/local/epics/${_EPICS_BASE}/lib/${_EPICS_HOST_ARCH}/libca.so:/usr/local/epics/${_EPICS_BASE}/lib/${_EPICS_HOST_ARCH}/libCom.so
    elif [ "$1" == "3.8" -o "$1" == "38" ]; then
        PYTHON_VERSION=3.8
        #cafe-1.19.3
@@ -94,6 +95,7 @@ echo "nameLog: $nameLog"
 
 python wakeup.py 00:00 &
 
+
 if [ "${STDOUT_FLAG}" -gt  "0" ] ; then
 #if changing the std::out destination, remember to also change it in your json config file (for reading)
     if test -f "$STDOUT_DIR/${nameLog}.log---"; then
@@ -119,4 +121,7 @@ else
     python ${name}.py -u ${name}.json &
 fi
 
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi