added Hush image tp resource file

devl
hush
2024-02-27 16:13:56 +01:00 · 2024-02-27 15:05:54 +01:00 · 2024-02-15 16:30:15 +01:00 · 2024-02-15 16:12:11 +01:00
8 changed files with 56653 additions and 29388 deletions
--- a/common/images/Hush.jpg
+++ b/common/images/Hush.jpg
--- 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/hipa/resources.qrc
+++ b/facility/hipa/resources.qrc
@@ -27,6 +27,7 @@
 <file alias="aramis.png">images/aramis.png</file>
 <file alias="log.png">images/log.png</file>
 <file alias="list.png">images/list.png</file>
+<file alias="Hush.jpg">images/Hush.jpg</file>
 <file alias="remove.png">images/remove.png</file>
 <file alias="joint.png">images/joint.png</file>
 <file alias="play.png">images/play.png</file>
--- a/facility/proscan/config/base.json
+++ b/facility/proscan/config/base.json
@@ -1,10 +1,10 @@
 {
    "menuFlags":{
-        "hasFile": 1,
-        "loadInitFile": 1,
-        "hasDaq":  1,
-        "hasH5" : 1,
-	"hasEpics" : 1
+        "hasFile": 0,
+        "loadInitFile": 0,
+        "hasDaq":  0,
+        "hasH5" : 0,
+	"hasEpics" : 0
    },
   "ElogBooks": {

@@ -51,14 +51,13 @@
        "destination": "/tmp/"
    },
    "url": {
-        "archiver"  : "https://data-ui.psi.ch/preselect?c1=proscan-archive/"
-	
+        "archiver"  : "https://data-ui.psi.ch/preselect?c1=proscan-archive/"	
    },
    "Shift":{
-        "type" :"ZORG:SHIFT-TYPE"
+        "type" :"XPROSCAN:OPERATION:STATUS"
    }, 
-    "header2" : ["G1","SH","G2","O2","PIF","G3"],
-    "header" : ["COMET","G1","SH","G2","O2","PIF","G3","MASTER"],
+    "headerMagnetSector" : ["G1","SH","G2","O2","PIF","G3"],
+    "header" : ["COMET","BMA1","G1","SH","G2","O2","PIF","G3","MASTER"],

    "COMET":{
        "status": "MMAC3:STR:2",
@@ -74,20 +73,44 @@
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #00b7eb)"
    },

-    "BMA1":{
+    "BMA1":{               
 	"status" : "BMA1:STA:2",
 	"colorObj" : "Machine",
 	"color": "gray",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 gray)"
    },
+    
+    "BMD1":{               
+	"status" : "BMD1:STA:2",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 gray)"
+    },
+    "B1B2":{
+	"status": "PRO-HUSH:SHIFT-TYPE",
+	"colorObj" : "Machine",
+	"color": "#9888b6",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)", 
+	"device" : ["QMA1", "QMA2", "QMA3", "QMA4", "QMA5"],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"],
+	"standby":  [-9.155,    9.155, -6.867, -6.867,  6.867],
+	"ref" :     [-91.464, 102.359, -97.096, -44.269, 37.113],
+	"pwrref" :  [9.065,   5.142,  4.061,  0.867,  0.597],
+	"iocDevice" : ["QMA1", "QMA2", "QMA5"]
+    },
    "G1":{
        "status": "BME1:STA:2",
+	"mastershipStatus": "XPROSCAN:GANTRY1:STATUS",
 	"colorObj" : "Beamline",
 	"color": "#9888b6",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)", 
 	"device" : ["QME1", "QME2", "AME1", "QME4", "QME5", 
 		    "AME2", "QME7",  "QME8", "QME10", "QME11"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"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],
+	"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"]
    },
    "SH":{
        "status": "BMA1:STA:2",
@@ -96,57 +119,83 @@
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 gray)", 
 	"device" : ["QMA6", "QMA7", "QMA8", "QMA9", "AMA2", "QMA10", "QMA11", 
 		    "QMA12", "QMA13",  "AMA3"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"attribute" : ["SOL:2", "IST:2", "PWR"],
+	"standby":  [-6.8, 6.8, 6.8, -6.8, 6.8, 6.8, -6.8, -6.8, 
+		     6.8, 0],
+	"ref" :     [-34.048, 26.68, 26.68, -34.05, 87.764, 37.424, -47.207, -38.156, 
+		     36.977, 87.642],
+	"pwrref" :   [0.504, 0.292, 0.289, 0.498, 5.434, 0.577, 0.912, 0.608, 
+		      0.578, 3.712],
+	"iocDevice" : ["QMA7", "AMA2", "QMA12"]
    },
    "G2":{
        "status": "BMB1:STA:2",
+	"mastershipStatus": "XPROSCAN:GANTRY2:STATUS",
 	"colorObj" : "Beamline",
 	"color": "#9888b6",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)", 
 	"device" : ["QMB1", "QMB2", "QMB3", "QMB4", "QMB5", "QMF1", "QMF2", 
 		    "QMF3", "QMF4",  "QMF6", "QMF7", "AMF1", "AMF2", "AMF3"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"attribute" : ["SOL:2", "IST:2", "PWR"],
+	"standby" : [-6.867, 6.867, -6.867, 6.867, -6.867, -7.553, 7.553, -7.553, 
+			 7.553, 7.553, -7.553, 10.758, 10.758, 23.804],
+	"ref":  [-41.056, 36.548, -30.490, 52.433, -27.636, -37.412, 41.966, -37.296, 
+		     51.200, 53.657, -41.966, 109.543, 109.405, 251.492],
+	"pwrref" :   [0.699, 0.545, 0.389, 1.152, 0.323, 0.374, 0.467, 0.378, 
+		      0.700, 0.772, 0.464, 7.114, 7.112, 21.727],
+	"iocDevice" : ["QMB2", "QMB4", "AMF1"]	
    },
    "O2":{
        "status": "BMC1:STA:2",
+	"mastershipStatus": "XPROSCAN:OPTIS2:STATUS",
 	"colorObj" : "Beamline",
 	"color": "#9888b6",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)", 
 	"device" : ["QMC1", "QMC2", "QMC3", "QMC4", "AMC1", "QMC5", "QMC6", 
 		    "QMC7", "QMC8",  "QMC9"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"attribute" : ["SOL:2", "IST:2", "PWR"],
+	"standby":  [-6.867, 6.867, 6.867, -6.867, 9.155, 6.867, -6.867, 6.867,
+		     -6.867, 6.867],
+	"ref" :     [-40.85, 26.974, 26.974, -40.851, 45.988, 30.890, -29.542, 33.742, 
+		     -45.960, 20.165],
+	"pwrref" :   [0.681, 0.297, 0.295, 0.677, 1.013, 0.401, 0.363, 0.475, 
+		      0.887, 0.169],
+	"iocDevice" : ["QMC2", "AMC1", "QMC7"]
    },
    "PIF":{
        "status": "BMD1:STA:2",
-	"colorObj" : "Athos",
+	"mastershipStatus": "XPROSCAN:PIF:STATUS",
+	"colorObj" : "ATHOS",
 	"color": "#2e5894",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #2e5894)", 
 	"device" : ["QMD1", "QMD2", "QMD3", "QMD4", "AMD1","QMD5", "QMD6", "QMD7", 
 		    "QMD8", "QMD9"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"attribute" : ["SOL:2", "IST:2", "PWR"],
+	"standby":  [-6.800, 6.800, 6.800, -6.800, 6.800, 6.800, -6.800, 6.800, 
+		     -6.800, 6.800],
+	"ref" :     [-36.159, 34.434, 42.277, -43, 135, 61, -62, 37, 
+		     -55, 30],
+	"pwrref" :   [0.16, 0.16, 0.28, 0.31, 3.7, 0.6, 0.73, 0.25, 
+		      0.59, 0.145],
+	"iocDevice" : ["QMD2", "AMD1", "QMD9"]
    },
    "G3":{
        "status": "BMD2:STA:2",
+	"mastershipStatus": "XPROSCAN:GANTRY3:STATUS",
 	"colorObj" : "Beamline",
 	"color": "#9888b6",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)", 
 	"device" : ["QMD10", "QMD11", "QMD12"],
-	"attribute" : ["SOL:2", "IST:2", "PWR"]
+	"attribute" : ["SOL:2", "IST:2", "PWR"],
+	"standby":  [-6.800, 6.800, -6.800],
+	"ref" :     [-40.388, 68.393, -34.805],
+	"pwrref" :   [0.64, 1.8, 0.46],
+	"iocDevice" : ["QMD10", "QMD11", "QMD12"]
    },
    "hdf": {
 	"destination" : "/tmp"
    },	
    "hdfGroups": {
        "General":["Created","Author","Application","Comment","Filepath","Process","UID","User"]
-    },
-    "h5Machine": {
-        "charge":   "SINEG01-DICT215:B1_CHARGE_AVERAGE-OP",
-        "laser":    "SLG-LGEN:WHICH_LASER",
-        "repRate":  "SIN-TIMAST-TMA:Beam-Appl-Freq-RB",
-        "beamDest": "SF:MODE_AR",
-        "energy":   "SF:ENERGY_AR"
-    },
-    "h5Data": {
-        "dataSet": ["timestamp","data", "pulse_id", "timestamp_offset"]  
    }
 }
--- 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/proscan/resources.qrc
+++ b/facility/proscan/resources.qrc
@@ -27,6 +27,7 @@
 <file alias="aramis.png">images/aramis.png</file>
 <file alias="log.png">images/log.png</file>
 <file alias="list.png">images/list.png</file>
+<file alias="Hush.jpg">images/Hush.jpg</file>
 <file alias="remove.png">images/remove.png</file>
 <file alias="joint.png">images/joint.png</file>
 <file alias="play.png">images/play.png</file>
Author	SHA1	Message	Date
chrin	2e590765f0	added Hush image tp resource file	2024-02-27 16:13:56 +01:00
chrin	9fce6056ab	devl	2024-02-27 15:05:54 +01:00
chrin	19f3d90351	hush	2024-02-15 16:30:15 +01:00
chrin	cf7f4c7257	devl	2024-02-15 16:12:11 +01:00