added to help pages

password protected Reset Account
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
2025-04-14 08:51:12 +02:00 · 2025-01-10 14:16:45 +01:00 · 2025-01-03 18:08:03 +01:00 · 2024-09-26 15:51:57 +02:00 · 2024-09-26 14:19:36 +02:00
20 changed files with 326 additions and 273 deletions
--- a/config/control/#hush.json#
+++ b/config/control/#hush.json#
@@ -1,20 +0,0 @@
-{
-    
-    "Parameters":{ 
-	"drawLine" : {"flag" : 0, "data":{ "widget": "QHLine", "text" : "None", "value" : "None"}},
-	"delayRamp" : {"flag" : 1, "data":{ "widget": "QDoubleSpinBox", "text" : "Ramp delay (s):", 
-					    "value" : 0.1, "min": 0.00, "max": 0.20, "step": 0.01, 
-		"tooltip":"Wait time between sending set point to each magnet in 'Restore'/'Standby' "}},
-	"drawLine2" : {"flag" : 0, "data":{ "widget": "QHLine", "text" : "None", "value" : "None"}}
-       	
-    },
-    "Expert":{
-	"debug": {"flag" : 0, "data":{ "widget": "None", "text" : "Debug", "value" : 0}},
-        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
-    },
-    "IOC": {
-	"resultsTabTitle" : "IOC"
-    },
-    "headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
-    "Master": "Controlroom"
-}
--- a/config/control/hush.json
+++ b/config/control/hush.json
@@ -17,5 +17,6 @@
 	"resultsTabTitle" : "IOC"
    },
    "headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
-    "Master": "Controlroom"
+    "Master": "Controlroom",
+    "Reset": "HUSH!"
 }
--- a/config/control/hush_full.json
+++ b/config/control/hush_full.json
@@ -73,5 +73,6 @@
    "IOC": {
 	"resultsTabTitle" : "IOC"
    },
-    "Master": "Controlroom
+    "Master": "Controlroom",
+    "Reset": "HUSH!"
 }
--- a/config/g1/hush.json
+++ b/config/g1/hush.json
@@ -14,5 +14,6 @@
        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
    },
    "headerMagnetSector": ["G1"],
-    "Master": "Gantry 1"
+    "Master": "Gantry 1",
+    "Reset": "HUSH!"
 }
--- a/config/g2/hush.json
+++ b/config/g2/hush.json
@@ -14,5 +14,6 @@
        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
    },
    "headerMagnetSector": ["G2"],
-    "Master": "Gantry 2"
+    "Master": "Gantry 2",
+    "Reset": "HUSH!"
 }
--- a/config/g3/hush.json
+++ b/config/g3/hush.json
@@ -14,5 +14,6 @@
        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
    },
    "headerMagnetSector": ["PIF", "G3"],
-    "Master": "Gantry 3"
+    "Master": "Gantry 3",
+    "Reset": "HUSH!"
 }
--- a/config/o2/hush.json
+++ b/config/o2/hush.json
@@ -14,5 +14,6 @@
        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
    },
    "headerMagnetSector": ["O2"],
-    "Master": "OPTIS2"
+    "Master": "OPTIS2",
+    "Reset": "HUSH!"
 }
--- a/config/pif/hush.json
+++ b/config/pif/hush.json
@@ -14,5 +14,6 @@
        "simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Dry run", "value" : 0}}
    },
    "headerMagnetSector": ["PIF"],
-    "Master": "PIF"
+    "Master": "PIF",
+    "Reset": "HUSH!"
 }
--- a/help/hush_resources.py
+++ b/help/hush_resources.py
@@ -9,30 +9,7 @@
 from PyQt5 import QtCore

 qt_resource_data = b"\
-\x00\x00\x00\xa7\
-\x3c\
-\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
-\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
-\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
-\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
-\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
-\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
-\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
-\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
-\x68\x74\x6d\x6c\x3e\x0a\
-\x00\x00\x00\x80\
-\x3c\
-\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
-\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
-\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
-\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
-\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
-\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
-\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
-\x00\x00\x23\xb9\
+\x00\x00\x23\xd6\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
@@ -561,64 +538,76 @@ qt_resource_data = b"\
 \x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
 \x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
 \x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
-\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x61\x6c\x73\
-\x6f\x20\x72\x65\x63\x6f\x72\x64\x73\x20\x74\x68\x65\x20\x65\x6e\
-\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x76\x61\x6c\x75\x65\
-\x20\x69\x6e\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x0a\x0a\x20\
-\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\
-\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\x73\
-\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\x20\
-\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\x61\
-\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\x74\
-\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\x74\
-\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\x72\
-\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\x65\
-\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\x76\
-\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\x74\
-\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\x2c\
-\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\x6e\
-\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\x61\
-\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\x65\
-\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
-\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\x67\
-\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\x77\
-\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\x65\
-\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\x20\
-\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\x20\
-\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\x33\
-\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\x37\
-\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\x6d\
-\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\x65\
-\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\x0a\
-\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\x75\
-\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\x30\
-\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\x62\
-\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\x20\
-\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\x64\
-\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\x61\
-\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\x6c\
-\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\x50\
-\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x44\x6f\
-\x20\x67\x69\x76\x65\x20\x74\x68\x65\x6d\x20\x61\x20\x6c\x69\x73\
-\x74\x65\x6e\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\
-\x73\x69\x63\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\
-\x72\x65\x20\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\
-\x0a\x20\x20\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\
-\x0a\x3c\x2f\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\
-\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
+\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
+\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\
+\x65\x64\x20\x28\x48\x55\x53\x48\x21\x29\x20\x54\x68\x65\x20\x65\
+\x6e\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x69\x73\x20\x61\
+\x6c\x73\x6f\x20\x72\x65\x63\x6f\x72\x64\x65\x64\x20\x69\x6e\x20\
+\x74\x68\x65\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x20\x0a\x0a\
+\x20\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\
+\x6c\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\
+\x73\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\
+\x20\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\
+\x61\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\
+\x74\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\
+\x74\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\
+\x72\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\
+\x65\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\
+\x76\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\
+\x74\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\
+\x2c\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\
+\x6e\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\
+\x61\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\
+\x65\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\
+\x20\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\
+\x67\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\
+\x77\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\
+\x65\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\
+\x20\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\
+\x20\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\
+\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\
+\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\
+\x6d\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\
+\x65\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\
+\x0a\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\
+\x75\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\
+\x30\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\
+\x62\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\
+\x20\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\
+\x64\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\
+\x61\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\
+\x6c\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\
+\x50\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x47\
+\x69\x76\x65\x20\x27\x65\x6d\x20\x61\x20\x6c\x69\x73\x74\x65\x6e\
+\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\x73\x69\x63\
+\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\x72\x65\x20\
+\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\x0a\x20\x20\
+\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\x0a\x3c\x2f\
+\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\
+\x74\x6d\x6c\x3e\x0a\
 \x00\x00\x00\xa7\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
 \x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
 \x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
 \x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
 \x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
 \x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
 \x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
 \x68\x74\x6d\x6c\x3e\x0a\
+\x00\x00\x00\x80\
+\x3c\
+\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
+\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
+\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
+\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
+\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
+\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
+\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
 \x00\x00\x00\xa7\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
@@ -637,10 +626,23 @@ qt_resource_data = b"\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
 \x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
 \x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
 \x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
+\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
+\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
+\x68\x74\x6d\x6c\x3e\x0a\
+\x00\x00\x00\xa7\
+\x3c\
+\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
+\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
+\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
+\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
+\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
+\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
 \x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
 \x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
 \x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
@@ -649,56 +651,56 @@ qt_resource_data = b"\

 qt_resource_name = b"\
 \x00\x0a\
-\x08\x6a\x34\x9c\
+\x0c\xba\xf2\x7c\
+\x00\x69\
+\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x0a\
+\x08\x5a\x34\x9c\
 \x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
 \x08\x8a\x34\x9c\
 \x00\x70\
 \x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
-\x0c\xba\xf2\x7c\
-\x00\x69\
-\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
-\x00\x0a\
-\x08\x4a\x34\x9c\
-\x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
-\x00\x0a\
 \x08\x7a\x34\x9c\
 \x00\x70\
 \x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
-\x08\x5a\x34\x9c\
+\x08\x6a\x34\x9c\
 \x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x0a\
+\x08\x4a\x34\x9c\
+\x00\x70\
+\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 "

 qt_resource_struct_v1 = b"\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
-\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
+\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
+\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
+\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
+\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
+\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
-\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
-\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
 "

 qt_resource_struct_v2 = b"\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
 \x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
-\x00\x00\x01\x8d\xc6\x98\xaa\x4d\
-\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
-\x00\x00\x01\x8d\xc6\x98\xaa\x50\
+\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
+\x00\x00\x01\x94\x50\x2e\x84\x4a\
+\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
+\x00\x00\x01\x94\x50\x2e\x84\x4c\
+\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
+\x00\x00\x01\x94\x50\x2e\x84\x4d\
+\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
+\x00\x00\x01\x94\x50\x2e\x84\x4f\
+\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
+\x00\x00\x01\x94\x50\x2e\x84\x51\
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8d\xc6\x98\xaa\x52\
-\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
-\x00\x00\x01\x8d\xc6\x98\xaa\x54\
-\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
-\x00\x00\x01\x8d\xc6\x98\xaa\x55\
-\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
-\x00\x00\x01\x8d\xf0\x21\xc8\x6b\
+\x00\x00\x01\x94\x50\x7b\xd3\x65\
 "

 qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/help/index.html
+++ b/help/index.html
@@ -99,7 +99,7 @@ Enumerated values for SEQ-STATE (not all states may have necessarily been implem
  The accounting of the energy saved for a given is year is to be recorded.
  At the end of the calendar year, the process variables holding the power
  saved values are to be reset to zero. This is accomplished through the "Reset Account" button.
-  This action also records the energy saved value in elogbook.
+  This action is password protected (HUSH!) The energy saved is also recorded in the elogbook. 

   <h3 style="color:#7b68ee;">Last Power</h3>
   This sub-panel allows the expert user to reset the Initial Power in "Savings Overview" for a given section to its default value, should such a need ever haphazardly arise while the section is in Energy Saving mode, and for which the "Update" button in the Magnet panel is disenabled.
@@ -108,7 +108,7 @@ Enumerated values for SEQ-STATE (not all states may have necessarily been implem
 <table>
     <tr><td>
   <img src=":Hush.jpg" width=90 height=90/> &nbsp; </td><td>
-   Inspired by Dada Ante Portas, arguably Switzerland's greatest Pop/Rock band! Do give them a listen.
+   Inspired by Dada Ante Portas, arguably Switzerland's greatest Pop/Rock band! Give 'em a listen.
   Their music and lyrics are awesome!</td>
   </table>
 <p>
--- a/hush.json
+++ b/hush.json
@@ -127,5 +127,6 @@
 	"resultsTabTitle" : "IOC"
    },
    "headerMagnetSector": ["B1B2","G1","SH","G2","O2","PIF", "G3"],
-    "Master": "Controlroom"
+    "Master": "Controlroom",
+    "Reset": "HUSH!"
 }
--- a/hush.py
+++ b/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>
--- a/hush.sh
+++ b/hush.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd /proscan/bd/applications/hush/hla/1.3.0
+cd /proscan/bd/applications/hush/hla/1.6.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,16 +56,14 @@ 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.13.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}
+    export PYTHONPATH=$PYTHONPATH:/proscan/bd/applications/deps/apps4ops/v1.13.0/common/python${PYTHON_VERSION_DIR}
 fi
 echo $PYTHONPATH

@@ -114,3 +116,7 @@ else
 fi


+if [ "${PYTHON_VERSION}" == "3.7" ] ; then
+    unset LD_PRELOAD
+fi
+
--- a/hush_g1.sh
+++ b/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
--- a/hush_g2.sh
+++ b/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
--- a/hush_g3.sh
+++ b/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
--- a/hush_o2.sh
+++ b/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
+

--- a/hush_pif.sh
+++ b/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
+
+
--- a/pyrcc5/hush_resources.py
+++ b/pyrcc5/hush_resources.py
@@ -9,30 +9,7 @@
 from PyQt5 import QtCore

 qt_resource_data = b"\
-\x00\x00\x00\xa7\
-\x3c\
-\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
-\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
-\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
-\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
-\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
-\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
-\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
-\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
-\x68\x74\x6d\x6c\x3e\x0a\
-\x00\x00\x00\x80\
-\x3c\
-\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
-\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
-\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
-\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
-\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
-\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
-\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
-\x00\x00\x23\xb9\
+\x00\x00\x23\xd6\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x48\x61\x6e\x64\x73\x6f\x6d\x65\x20\x50\x6f\x77\x65\x72\
@@ -561,64 +538,76 @@ qt_resource_data = b"\
 \x63\x6f\x6d\x70\x6c\x69\x73\x68\x65\x64\x20\x74\x68\x72\x6f\x75\
 \x67\x68\x20\x74\x68\x65\x20\x22\x52\x65\x73\x65\x74\x20\x41\x63\
 \x63\x6f\x75\x6e\x74\x22\x20\x62\x75\x74\x74\x6f\x6e\x2e\x0a\x20\
-\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x61\x6c\x73\
-\x6f\x20\x72\x65\x63\x6f\x72\x64\x73\x20\x74\x68\x65\x20\x65\x6e\
-\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x76\x61\x6c\x75\x65\
-\x20\x69\x6e\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x0a\x0a\x20\
-\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\
-\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\x73\
-\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\x20\
-\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\x61\
-\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\x74\
-\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\x74\
-\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\x72\
-\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\x65\
-\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\x76\
-\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\x74\
-\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\x2c\
-\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\x6e\
-\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\x61\
-\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\x65\
-\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
-\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\x67\
-\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\x77\
-\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\x65\
-\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\x20\
-\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\x20\
-\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\x33\
-\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\x37\
-\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\x6d\
-\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\x65\
-\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\x0a\
-\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\x75\
-\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\x30\
-\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\x62\
-\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\x20\
-\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\x64\
-\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\x61\
-\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\x6c\
-\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\x50\
-\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x44\x6f\
-\x20\x67\x69\x76\x65\x20\x74\x68\x65\x6d\x20\x61\x20\x6c\x69\x73\
-\x74\x65\x6e\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\
-\x73\x69\x63\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\
-\x72\x65\x20\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\
-\x0a\x20\x20\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\
-\x0a\x3c\x2f\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\
-\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
+\x20\x54\x68\x69\x73\x20\x61\x63\x74\x69\x6f\x6e\x20\x69\x73\x20\
+\x70\x61\x73\x73\x77\x6f\x72\x64\x20\x70\x72\x6f\x74\x65\x63\x74\
+\x65\x64\x20\x28\x48\x55\x53\x48\x21\x29\x20\x54\x68\x65\x20\x65\
+\x6e\x65\x72\x67\x79\x20\x73\x61\x76\x65\x64\x20\x69\x73\x20\x61\
+\x6c\x73\x6f\x20\x72\x65\x63\x6f\x72\x64\x65\x64\x20\x69\x6e\x20\
+\x74\x68\x65\x20\x65\x6c\x6f\x67\x62\x6f\x6f\x6b\x2e\x20\x0a\x0a\
+\x20\x20\x20\x3c\x68\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\
+\x6c\x6f\x72\x3a\x23\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x4c\x61\
+\x73\x74\x20\x50\x6f\x77\x65\x72\x3c\x2f\x68\x33\x3e\x0a\x20\x20\
+\x20\x54\x68\x69\x73\x20\x73\x75\x62\x2d\x70\x61\x6e\x65\x6c\x20\
+\x61\x6c\x6c\x6f\x77\x73\x20\x74\x68\x65\x20\x65\x78\x70\x65\x72\
+\x74\x20\x75\x73\x65\x72\x20\x74\x6f\x20\x72\x65\x73\x65\x74\x20\
+\x74\x68\x65\x20\x49\x6e\x69\x74\x69\x61\x6c\x20\x50\x6f\x77\x65\
+\x72\x20\x69\x6e\x20\x22\x53\x61\x76\x69\x6e\x67\x73\x20\x4f\x76\
+\x65\x72\x76\x69\x65\x77\x22\x20\x66\x6f\x72\x20\x61\x20\x67\x69\
+\x76\x65\x6e\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x74\x6f\x20\x69\
+\x74\x73\x20\x64\x65\x66\x61\x75\x6c\x74\x20\x76\x61\x6c\x75\x65\
+\x2c\x20\x73\x68\x6f\x75\x6c\x64\x20\x73\x75\x63\x68\x20\x61\x20\
+\x6e\x65\x65\x64\x20\x65\x76\x65\x72\x20\x68\x61\x70\x68\x61\x7a\
+\x61\x72\x64\x6c\x79\x20\x61\x72\x69\x73\x65\x20\x77\x68\x69\x6c\
+\x65\x20\x74\x68\x65\x20\x73\x65\x63\x74\x69\x6f\x6e\x20\x69\x73\
+\x20\x69\x6e\x20\x45\x6e\x65\x72\x67\x79\x20\x53\x61\x76\x69\x6e\
+\x67\x20\x6d\x6f\x64\x65\x2c\x20\x61\x6e\x64\x20\x66\x6f\x72\x20\
+\x77\x68\x69\x63\x68\x20\x74\x68\x65\x20\x22\x55\x70\x64\x61\x74\
+\x65\x22\x20\x62\x75\x74\x74\x6f\x6e\x20\x69\x6e\x20\x74\x68\x65\
+\x20\x4d\x61\x67\x6e\x65\x74\x20\x70\x61\x6e\x65\x6c\x20\x69\x73\
+\x20\x64\x69\x73\x65\x6e\x61\x62\x6c\x65\x64\x2e\x0a\x0a\x3c\x68\
+\x33\x20\x73\x74\x79\x6c\x65\x3d\x22\x63\x6f\x6c\x6f\x72\x3a\x23\
+\x37\x62\x36\x38\x65\x65\x3b\x22\x3e\x48\x55\x53\x48\x21\x20\x49\
+\x6d\x61\x67\x65\x3c\x2f\x68\x33\x3e\x0a\x20\x3c\x74\x61\x62\x6c\
+\x65\x3e\x0a\x20\x20\x20\x20\x20\x3c\x74\x72\x3e\x3c\x74\x64\x3e\
+\x0a\x20\x20\x20\x3c\x69\x6d\x67\x20\x73\x72\x63\x3d\x22\x3a\x48\
+\x75\x73\x68\x2e\x6a\x70\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x39\
+\x30\x20\x68\x65\x69\x67\x68\x74\x3d\x39\x30\x2f\x3e\x20\x26\x6e\
+\x62\x73\x70\x3b\x20\x3c\x2f\x74\x64\x3e\x3c\x74\x64\x3e\x0a\x20\
+\x20\x20\x49\x6e\x73\x70\x69\x72\x65\x64\x20\x62\x79\x20\x44\x61\
+\x64\x61\x20\x41\x6e\x74\x65\x20\x50\x6f\x72\x74\x61\x73\x2c\x20\
+\x61\x72\x67\x75\x61\x62\x6c\x79\x20\x53\x77\x69\x74\x7a\x65\x72\
+\x6c\x61\x6e\x64\x27\x73\x20\x67\x72\x65\x61\x74\x65\x73\x74\x20\
+\x50\x6f\x70\x2f\x52\x6f\x63\x6b\x20\x62\x61\x6e\x64\x21\x20\x47\
+\x69\x76\x65\x20\x27\x65\x6d\x20\x61\x20\x6c\x69\x73\x74\x65\x6e\
+\x2e\x0a\x20\x20\x20\x54\x68\x65\x69\x72\x20\x6d\x75\x73\x69\x63\
+\x20\x61\x6e\x64\x20\x6c\x79\x72\x69\x63\x73\x20\x61\x72\x65\x20\
+\x61\x77\x65\x73\x6f\x6d\x65\x21\x3c\x2f\x74\x64\x3e\x0a\x20\x20\
+\x20\x3c\x2f\x74\x61\x62\x6c\x65\x3e\x0a\x3c\x70\x3e\x0a\x3c\x2f\
+\x70\x3e\x0a\x20\x20\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\
+\x74\x6d\x6c\x3e\x0a\
 \x00\x00\x00\xa7\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
 \x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
 \x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
 \x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
 \x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
 \x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
 \x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
 \x68\x74\x6d\x6c\x3e\x0a\
+\x00\x00\x00\x80\
+\x3c\
+\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
+\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
+\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x35\x20\x6f\
+\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
+\x70\x3e\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x65\x74\x63\x2e\x2e\x2e\
+\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x70\x3e\x0a\
+\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a\
 \x00\x00\x00\xa7\
 \x3c\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
@@ -637,10 +626,23 @@ qt_resource_data = b"\
 \x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
 \x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
 \x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
-\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x32\x20\x6f\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x33\x20\x6f\
 \x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
 \x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
-\x22\x70\x61\x67\x65\x33\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x22\x70\x61\x67\x65\x34\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
+\x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
+\x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
+\x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
+\x68\x74\x6d\x6c\x3e\x0a\
+\x00\x00\x00\xa7\
+\x3c\
+\x68\x74\x6d\x6c\x3e\x3c\x68\x65\x61\x64\x3e\x3c\x74\x69\x74\x6c\
+\x65\x3e\x57\x65\x62\x20\x48\x65\x6c\x70\x3c\x2f\x74\x69\x74\x6c\
+\x65\x3e\x3c\x2f\x68\x65\x61\x64\x3e\x0a\x3c\x62\x6f\x64\x79\x3e\
+\x0a\x0a\x3c\x70\x3e\x3c\x62\x3e\x50\x61\x67\x65\x20\x31\x20\x6f\
+\x66\x20\x77\x65\x62\x20\x68\x65\x6c\x70\x3c\x2f\x62\x3e\x3c\x2f\
+\x70\x3e\x0a\x3c\x70\x3e\x20\x20\x3c\x61\x20\x68\x72\x65\x66\x3d\
+\x22\x70\x61\x67\x65\x32\x2e\x68\x74\x6d\x6c\x22\x3e\x20\x4e\x65\
 \x78\x74\x3c\x2f\x61\x3e\x3c\x2f\x70\x3e\x0a\x3c\x70\x3e\x3c\x62\
 \x3e\x65\x74\x63\x2e\x2e\x2e\x3c\x2f\x62\x3e\x20\x65\x74\x63\x2e\
 \x2e\x2e\x3c\x2f\x70\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x3c\x2f\
@@ -649,56 +651,56 @@ qt_resource_data = b"\

 qt_resource_name = b"\
 \x00\x0a\
-\x08\x6a\x34\x9c\
+\x0c\xba\xf2\x7c\
+\x00\x69\
+\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x0a\
+\x08\x5a\x34\x9c\
 \x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
 \x08\x8a\x34\x9c\
 \x00\x70\
 \x00\x61\x00\x67\x00\x65\x00\x35\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
-\x0c\xba\xf2\x7c\
-\x00\x69\
-\x00\x6e\x00\x64\x00\x65\x00\x78\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
-\x00\x0a\
-\x08\x4a\x34\x9c\
-\x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
-\x00\x0a\
 \x08\x7a\x34\x9c\
 \x00\x70\
 \x00\x61\x00\x67\x00\x65\x00\x34\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 \x00\x0a\
-\x08\x5a\x34\x9c\
+\x08\x6a\x34\x9c\
 \x00\x70\
-\x00\x61\x00\x67\x00\x65\x00\x32\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x61\x00\x67\x00\x65\x00\x33\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
+\x00\x0a\
+\x08\x4a\x34\x9c\
+\x00\x70\
+\x00\x61\x00\x67\x00\x65\x00\x31\x00\x2e\x00\x68\x00\x74\x00\x6d\x00\x6c\
 "

 qt_resource_struct_v1 = b"\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
-\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
+\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
+\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
+\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
+\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
+\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
-\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
-\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
 "

 qt_resource_struct_v2 = b"\
 \x00\x00\x00\x00\x00\x02\x00\x00\x00\x06\x00\x00\x00\x01\
 \x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x24\xec\
-\x00\x00\x01\x8d\xc6\x98\xaa\x4d\
-\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x42\
-\x00\x00\x01\x8d\xc6\x98\xaa\x50\
+\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x26\x5f\
+\x00\x00\x01\x94\x50\x2e\x84\x4a\
+\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x23\xda\
+\x00\x00\x01\x94\x50\x2e\x84\x4c\
+\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\xb4\
+\x00\x00\x01\x94\x50\x2e\x84\x4d\
+\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x25\x09\
+\x00\x00\x01\x94\x50\x2e\x84\x4f\
+\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x24\x85\
+\x00\x00\x01\x94\x50\x2e\x84\x51\
 \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8d\xc6\x98\xaa\x52\
-\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x25\x97\
-\x00\x00\x01\x8d\xc6\x98\xaa\x54\
-\x00\x00\x00\x1a\x00\x00\x00\x00\x00\x01\x00\x00\x00\xab\
-\x00\x00\x01\x8d\xc6\x98\xaa\x55\
-\x00\x00\x00\x34\x00\x00\x00\x00\x00\x01\x00\x00\x01\x2f\
-\x00\x00\x01\x8d\xf0\x21\xc8\x6b\
+\x00\x00\x01\x94\x50\x7b\xd3\x65\
 "

 qt_version = [int(v) for v in QtCore.qVersion().split('.')]
--- a/src/gui.py
+++ b/src/gui.py
@@ -12,11 +12,14 @@ from qtpy.QtGui import QColor, QPixmap
 from qtpy.QtCore import __version__ as QT_VERSION_STR
 from qtpy.QtCore import QEventLoop, Qt, QTimer, Slot
 from qtpy.QtWidgets import (
-    QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QLabel,
-    QMessageBox, QPushButton, QSpacerItem, QTabBar, QTabWidget,
-    QTableWidgetItem, QTextEdit, QWidget)
+    QApplication, QFrame, QGridLayout, QGroupBox, QHBoxLayout, QInputDialog,
+    QLabel, QLineEdit, 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
@@ -1324,6 +1327,7 @@ class AppGui(QWidget):
    def clear_saving(self, sector_prefix_list: list = None):
        if not sector_prefix_list:
            return
+        '''
        qm = QMessageBox()
        mess = ("This action will reset the energy saving account to zero. \n" +
                "This is typically undertaken at the end of the calendar " +
@@ -1335,7 +1339,22 @@ class AppGui(QWidget):

        if reply == QMessageBox.No:
            return
-
+        '''
+        
+        qd = QInputDialog(self)
+        #pwedit = QLineEdit()
+        mess = ("To execute the reset,\nplease enter the password:")
+        text, ok = qd.getText(None, "Reset Account", mess,
+                              QLineEdit.Password)       
+        if ok and text:
+            if text.upper()!= self.settings.data["Reset"]:
+                qmb = QMessageBox(qd)
+                mess = "Incorrect password!\nTry Reset Account once again."
+                qmb.information(self, "Reset Account", mess)
+                return
+        else:
+            return
+          
        self.parent.prepare_elog_message()
        print("message", self.parent.message)
        print("logbook", self.parent.logbook, flush=True)
@@ -1355,8 +1374,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")
Author	SHA1	Message	Date
chrin	63cc3f68e3	added to help pages	2025-04-14 08:51:12 +02:00
chrin	6fa7a82c26	password protected Reset Account	2025-01-10 14:16:45 +01:00
chrin	0c179b7191	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	2025-01-03 18:08:03 +01:00
Fernandez Carmona Pablo	8a8fb9e7c4	upgrade to EPICS 7.0.8	2024-09-26 15:51:57 +02:00
Fernandez Carmona Pablo	ae880ddc0e	upgrade to EPICS 7.0.8	2024-09-26 14:19:36 +02:00