corrected typo in base.json for G1 initial values

facility/hipa/config/base.json

@@ -10,7 +10,7 @@
 
         "HIPA": {
             "url": "https://elog-gfa.psi.ch:443/HIPA",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/hipa/",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/HIPA/",
 	    "Required": {"Eintrag": ["Problem", "Info", "Tuning", 
                                      "Betriebs-Wechsel", "Überbrückung", 
                                      "Pikett", "Status", "Bestandes aufnahme", "Meldung-AK3",
@@ -36,7 +36,7 @@
 
         "HIPA+Strahlentwicklung": {
             "url": "https://elog-gfa.psi.ch:443/HIPA+Strahlentwicklung",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/hipa/",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/HIPA/",
 	    "Required" : {"Projekt": ["","Superbuncher","Ringphase", "Sondenkopf für RIE2",
 				      "OPAL - Abweichungen", "BW860", "BW860StrahlOptik",
 				      "Strahlentwicklung", "Ausbildung/Accelerator Wiki",
@@ -50,7 +50,7 @@
 
         "HIPA-Bestandesaufnahme": {
             "url": "https://elog-gfa.psi.ch:443/HIPA-Bestandesaufnahme",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/hipa/",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/HIPA/",
 	    "Required": {"Ort": ["Ionenquelle", "Cockcroft Walton",
 				 "Strahlführung 870 keV", "Injektor 2", "Strahlführung 72 MeV",
 				 "Isotopenproduktion", "Ring Zyklotron", "Protonen-Kanal",
@@ -61,13 +61,9 @@
 	   
         },
        
-
-
-       
-       
        "Sandkasten": {
 	     "url": "https://elog-gfa.psi.ch:443/Sandkasten",
-             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/HIPA/",
 	     "Required" : {"Eintrag": ["Problem","Anregung"]}, 
 	     "Optional" : {"Status": ["","Offen", "Geschlossen"]}
        }
@@ -76,9 +72,10 @@
     "Elog":{
         "useELOGenv": 0,
         "host": "elog-gfa.psi.ch",
-	"book": "SLS",
-	"url": "https://elog-gfa.psi.ch/SLS",
-	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
+	"book": "HIPA",
+	"url": "https://elog-gfa.psi.ch/HIPA",
+	"destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/HIPA/",
+	"addDateToDir" : 1
     },
     "stdlog":{
         "destination": "/tmp/"
@@ -175,17 +172,21 @@
 	"attribute" : ["SOL:2", "IST:2", "PWR:2"]	
     },
     "hdf": {
-	"destination" : "/sf/data/measurements/"
+	"destination" : "/hipa/bd/data/measurements/",
+	"addDateToDir" : 1
     },	
     "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"
+        "shift": "ZORG:SHIFT-TYPE ",
+        "inj2": "MWC2:IST:2",
+        "ip2": "MYC1:IST:2",
+        "iw2": "MXC2:IST:2",
+        "pk1": "MHC1:IST:2",
+        "pk2": "MHC2:IST:2",
+	"sinq": "MHC6:IST:2",
+        "ucn": "MBC1:IST:2"
     },
     "h5Data": {
         "dataSet": ["timestamp","data", "pulse_id", "timestamp_offset"]  

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" :"PRO-HUSH:SHIFT-TYPE"
     }, 
     "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)", 
@@ -101,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"]
     },
@@ -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"]  
     }
 }

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/"
     },