added Hush image tp resource file

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>

facility/proscan/config/base.json

@@ -51,11 +51,10 @@
         "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"
     }, 
     "headerMagnetSector" : ["G1","SH","G2","O2","PIF","G3"],
     "header" : ["COMET","BMA1","G1","SH","G2","O2","PIF","G3","MASTER"],
@@ -80,6 +79,13 @@
 	"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",
@@ -94,6 +100,7 @@
     },
     "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)", 
@@ -123,6 +130,7 @@
     },
     "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)", 
@@ -139,6 +147,7 @@
     },
     "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)", 
@@ -155,6 +164,7 @@
     },
     "PIF":{
         "status": "BMD1:STA:2",
+	"mastershipStatus": "XPROSCAN:PIF:STATUS",
 	"colorObj" : "ATHOS",
 	"color": "#2e5894",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #2e5894)", 
@@ -168,10 +178,10 @@
 	"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)", 
@@ -187,15 +197,5 @@
     },	
     "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"]  
     }
 }