gui.py: attributes dictionary for HIPA specific keys corrected in end-of-year clear_savings routine; Use cafe-1.12.0 in hush.sh which specifically links epics 7.0.8 libraries and define LD_PRELOAD with ca for python 3.7

hush.py

@@ -181,7 +181,7 @@ class StartMain(BaseWindow):
             All rights reserved.</p>
             <p>Author: J. Chrin, February 2024 </p>
             <p>(EPICS db adapted from A. Kovach, 2016) </p>
-            <p>IOC Administrator: H. Lutz </p>
+            <p>IOC Administrator: P. Fernandez (prev. H. Lutz) </p>
             <p>1st Responsible: J. Chrin  </p>
             <p>Initiates energy saving procedures and records power saved</p>
             <p>Python {2} - Qt {3} - PyQt {4} <br>

hush.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/control
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 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, 3.10
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,7 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -52,13 +56,11 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 
 #C_EXT version
-export PYTHONPATH=.:/afs/psi.ch/project/cafe/gitlab/CAFE/cycafe/python3.10-sls2/lib/RHEL8-x86_64:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
     export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR}
@@ -114,3 +116,7 @@ else
 fi
 
 
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi
+

hush_g1.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush_g1.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/g1
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 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, 3,10
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,7 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -52,15 +56,13 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
     export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR}
@@ -119,3 +121,6 @@ else
 fi
 
 
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi

hush_g2.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush_g2.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/g2
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 fi
 
+_EPICS_HOST_ARCH=${RHREL}-x86_64
+_EPICS_BASE=base-7.0.8
+
 # Select Python Version here. Currently one of 3.5, 3.7
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,8 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -52,15 +57,13 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
     export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR}
@@ -118,4 +121,6 @@ else
     python ${name}.py -u ${configSector}/${nameconfig}.json &
 fi
 
-
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi

hush_g3.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush_g3.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/g3
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 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, 3.10
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,8 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -52,15 +57,13 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
     export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.10.0/common/python${PYTHON_VERSION_DIR}
@@ -117,4 +120,6 @@ else
     python ${name}.py -u ${configSector}/${nameconfig}.json &
 fi
 
-
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi

hush_o2.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush_o2.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/o2
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 fi
 
+_EPICS_HOST_ARCH=${RHREL}-x86_64
+_EPICS_BASE=base-7.0.8
+
 # Select Python Version here. Currently one of 3.5, 3.7
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,8 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -53,15 +58,13 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
@@ -118,4 +121,8 @@ else
     python ${name}.py -u ${configSector}/${nameconfig}.json &
 fi
 
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi
+
 

hush_pif.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.5.0
 
 # For use if script is sourced rather than executed
 appNameDefault="hush_pif.sh"
@@ -8,7 +8,7 @@ configSector=${configBase}/pif
 echo "${configSector}"
 
 module unload gcc
-module load gcc/7.3.0
+module load gcc/7.5.0
 
 if [ -z "$PS1" ] # no prompt?
 ### if [ -v PS1 ]   # On Bash 4.2+ ...
@@ -20,6 +20,9 @@ else
   echo "Interactive/sourced script"
 fi
 
+_EPICS_HOST_ARCH=${RHREL}-x86_64
+_EPICS_BASE=base-7.0.8
+
 # Select Python Version here. Currently one of 3.5, 3.7
 PYTHON_VERSION=3.10
 
@@ -35,6 +38,8 @@ if [ "$1" ]; then
    elif [ "$1" == "3.7" -o "$1" == "37" ]; then
        PYTHON_VERSION=3.7
        PYTHON_VERSION_DIR=37
+       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
        PYTHON_VERSION_DIR=38
@@ -54,15 +59,13 @@ fi
  
 echo "PYTHON_VERSION $PYTHON_VERSION"
 
-_EPICS_HOST_ARCH=${RHREL}-x86_64
-#_EPICS_HOST_ARCH=${EPICS_HOST_ARCH}
 . /opt/gfa/python $PYTHON_VERSION
 
 #/sf/bd/applications/OnlineModel/current/PythonModule:/sf/bd/applications/OnlineModel/current
 #/sf/bd/applications/OnlineModel/default/scripts/VA:
 
 #C_EXT version for Py 3.7:
-export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.19.3/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
+export PYTHONPATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/proscan/bd/applications/deps/apps4ops/v1.10.0
 
 
 if [ "${EXTRA_PYTHON_PATH_FLAG}" -gt  "0" ] ; then
@@ -121,3 +124,8 @@ else
 fi
 
 
+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi
+
+

src/gui.py

@@ -16,7 +16,10 @@ from qtpy.QtWidgets import (
     QMessageBox, QPushButton, QSpacerItem, QTabBar, QTabWidget,
     QTableWidgetItem, QTextEdit, QWidget)
 
-from common.packages import elog
+try:
+    import elog
+except:
+    from common.packages import elog
 
 from apps4ops.bdbase.utils import _line
 from apps4ops.bdbase.enumkind import MsgSeverity
@@ -1355,8 +1358,14 @@ class AppGui(QWidget):
         if "Sandkasten" in self.parent.logbook:
             attributes["Eintrag"] = "Anregung"
         else:
-            attributes["Eintrag"] = self.elog_enum.eintrag.INFO.name
-            attributes["Effekt"] = self.elog_enum.effekt.NONE.name #"keiner"
+            required_dict = self.parent.settings.data['ElogBooks'][
+                self.parent.logbook]['Required']
+            optional_dict = self.parent.settings.data['ElogBooks'][
+                self.parent.logbook]['Optional']
+            attributes["Eintrag"] = required_dict['Eintrag'][
+                self.elog_enum.eintrag.INFO]
+            attributes["Effekt"] = optional_dict["Effekt"][
+                self.elog_enum.effekt.NONE] # NONE='', NO=keiner
 
         log_mess = self.parent.message.replace("<br>", "\n")