corrected typo in base.json for G1 initial values

added stylesheet for hush and awake labels
added QInputDialog
2025-04-27 14:12:04 +02:00 · 2025-04-18 16:33:36 +02:00 · 2025-01-09 16:21:11 +01:00 · 2024-11-26 09:31:50 +01:00 · 2024-11-26 08:30:53 +01:00
8 changed files with 64294 additions and 64181 deletions
--- a/facility/hipa/pyrcc5/qrc_resources.py
+++ b/facility/hipa/pyrcc5/qrc_resources.py
--- a/facility/hipa/qrc_resources.py
+++ b/facility/hipa/qrc_resources.py
--- a/facility/proscan/config/base.json
+++ b/facility/proscan/config/base.json
@@ -54,7 +54,7 @@
        "archiver"  : "https://data-ui.psi.ch/preselect?c1=proscan-archive/"	
    },
    "Shift":{
-        "type" :"XPROSCAN:OPERATION:STATUS"
+        "type" :"PRO-HUSH:SHIFT-TYPE"
    }, 
    "headerMagnetSector" : ["G1","SH","G2","O2","PIF","G3"],
    "header" : ["COMET","BMA1","G1","SH","G2","O2","PIF","G3","MASTER"],
@@ -108,7 +108,7 @@
 		    "AME2", "QME7",  "QME8", "QME10", "QME11"],
 	"attribute" : ["SOL:2", "IST:2", "PWR"],
 	"standby":  [-6.867, 6.867, 9.155, 6.867, 6.867, 9.155, 6.867, -6.867,  6.867, -6.867],
-	"ref" :     [-43.813, 43.177, 157.28, 20.017, 30.544, 157,79, 42.203, -42.467, 52.179, -77.032],
+	"ref" :     [-43.813, 43.177, 157.28, 20.017, 30.544, 157.79, 42.203, -42.467, 52.179, -77.032],
 	"pwrref" :  [0.789,   0.764,  17.341,  0.164,  0.366,  17.482, 0.737, 0.736,  1.096, 2.464],
 	"iocDevice" : ["AME1", "AME2", "QME10"]
    },
--- a/facility/proscan/pyrcc5/qrc_resources.py
+++ b/facility/proscan/pyrcc5/qrc_resources.py
--- a/facility/proscan/qrc_resources.py
+++ b/facility/proscan/qrc_resources.py
--- a/facility/sls/config/base.json
+++ b/facility/sls/config/base.json
@@ -108,7 +108,7 @@
    "Elog":{
        "useELOGenv": 0,
        "host": "elog-gfa.psi.ch",
-	"book": "SLS-test2",
+	"book": "SLS2-test",
 	"url": "https://elog-gfa.psi.ch/SLS",
 	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
    },
@@ -139,6 +139,9 @@
 	"xmean": "ARIDI-BPM:OFB-XMEAN",
 	"ymean": "ARIDI-BPM:OFB-YMEAN"
    },
+    "PVAmbient" : {
+	"PCT": {"current": "ARIDI-PCT:CURRENT"}
+    },	
    "hdf": {
 	"destination" : "/sf/data/measurements/"
    },	
--- a/facility/sls/pyrcc5/qrc_resources.py
+++ b/facility/sls/pyrcc5/qrc_resources.py
--- a/facility/sls/qrc_resources.py
+++ b/facility/sls/qrc_resources.py
Author	SHA1	Message	Date
chrin	9130d1e29b	corrected typo in base.json for G1 initial values	2025-04-27 14:12:04 +02:00
chrin	5ffec1fd1c	added stylesheet for hush and awake labels	2025-04-18 16:33:36 +02:00
chrin	33ead359e6	added QInputDialog	2025-01-09 16:21:11 +01:00
chrin	a18f0e6bbb	corrected SLS2-test entry for Elog key in base.json	2024-11-26 09:31:50 +01:00
chrin	d36d2e02dd	added PVAmbient key tpo base.json	2024-11-26 08:30:53 +01:00