v1.4.0

common/config/acc.qss

@@ -0,0 +1 @@
+../../../../../common/config/acc.qss

common/config/style.json

@@ -1,52 +0,0 @@
-{
-    "menuFlags":{
-        "hasFile": 1,
-        "loadInitFile": 1,
-        "hasDaq":  1,
-        "hasH5" : 1,
-	"hasEpics" : 1
-    },    
-    "MsgSeverity": {
-        "fatal": "#ee0011",
-        "error": "#990033",
-        "warn":  "#cc6600",
-        "info":  "#0040ff",
-        "debug": "#11aaee"
-    },
-    "stdlog": {
-        "destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/stdlog/"
-    },
-    "screenshot": {
-        "destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/screenshot/"
-    },    
-    "StyleGuide":{ 
-        "widgetHeight": 25,
-	"extraGroupHeight": 30,
-        "fgAlarmInvalid": "#ffffff",
-        "fgAlarmMajor":   "#ff0000",
-        "fgAlarmMinor":   "#fbfb04",
-        "fgAlarmNoAlarm": "#00cd00",
-        "fgNormalText": "#000000",
-        "fgCurveHor":   "#2a63e4",
-        "fgCurveVer":   "#8b1a96",
-        "fgCurveLong":  "#cd6100",
-        "bgTitleOperation": "#dadada",
-        "bgTitleExpert":    "#646464", 
-        "bgTitleSimulation":"#8b1a96",
-        "bgMain":           "#ececec",
-        "bgReadbackAlarm":  "#c8c8c8",
-        "bgReadback" :  "#ffffe0",
-        "bgPVSetBeam":  "#d4db9d",
-        "bgPVSet":      "#a0a0a0",
-        "bgButtonWindow":  "#b79d5c",
-        "bgGroupContainers":"#e1e1e1",
-	"bgErrorLogFile" : "#f0f0f8",
-	"machine_color": "#2e5894",
-	"machine_qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 gray , stop: 1 #ffffff)"
-
-    },
-    "Machine" : {
-	"color" : "gray",
-	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 gray , stop: 1 #ffffff)"
-	}
-}

common/config/style.json

@@ -0,0 +1 @@
+../../../../../common/config/style.json

facility/sf/config/base.json

@@ -77,7 +77,7 @@
 	"offset":      0,
 	"timeoutMS":1000
     },
-    
+    "Target" : ["Aramis", "Athos", "Porthos"],
     "Aramis":{
         "undulators":["SARUN03-UIND030:K_SET", "SARUN04-UIND030:K_SET", "SARUN05-UIND030:K_SET", 
 		      "SARUN06-UIND030:K_SET", "SARUN07-UIND030:K_SET", "SARUN08-UIND030:K_SET",
@@ -93,7 +93,7 @@
 	"beamStatus": "SOP-BEAMSTATUS-AR",
 	"energy" : "SARBD02-DBPM040:ENERGY-OP",
 	"charge": "SINEG01-DICT215:B1_CHARGE-OP",
-	"freq": "SIN-TIMAST-TMA:Bunch-1-Appl-Freq-RB",
+	"freq": "SIN-TIMAST-TMA:Bunch-1-Exp-Freq-RB",
 	"laser": "SWISSFEL-STATUS:Bunch-1-Las-Appl-RB",
 	"photonEnergy": "SARFE10-PBPG050:PHOTON-ENERGY-PER-PULSE-AVG",
 	"color": "#00b7eb",
@@ -117,7 +117,7 @@
 	"beamStatus": "SOP-BEAMSTATUS-AT",
 	"energy" : "SATBD02-DBPM040:ENERGY-OP",
 	"charge": "SINEG01-DICT215:B2_CHARGE-OP",
-	"freq": "SIN-TIMAST-TMA:Bunch-2-Appl-Freq-RB",
+	"freq": "SIN-TIMAST-TMA:Bunch-2-Exp-Freq-RB",
         "laser": "SWISSFEL-STATUS:Bunch-2-Las-Appl-RB",
 	"photonEnergy": "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
 	"color": "#2e5894",
@@ -126,7 +126,7 @@
     "Porthos":{
         "laser": "SWISSFEL-STATUS:Bunch-2-Las-Appl-RB",
 	"pvFreqRB": "SIN-TIMAST-TMA:Bunch-2-Appl-Freq-RB",
-	"freq": "SIN-TIMAST-TMA:Bunch-2-Appl-Freq-RB",
+	"freq": "SIN-TIMAST-TMA:Bunch-2-Exp-Freq-RB",
 	"beamStatus": "SOP-BEAMSTATUS-AT",
 	"energy" : "SATBD02-DBPM040:ENERGY-OP",
         "charge": "SINEG01-DICT215:B2_CHARGE-OP",
@@ -134,6 +134,7 @@
 	"color": "#9c6da5",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #9b111e, stop: 1 #FFFFFF)"
     },
+    "showPorthos": 0,
     "Update":{
         "freq": [0.5, 1, 2, 5, 10],
 	"defaultIdx": 1

facility/sf/help/energy_loss_meas/page1.html

@@ -9,14 +9,14 @@
 
 <p>These web pages are to be completed by the application owner.<br>
 They are located in the following directory: <br>
-/afs/psi.ch/intranet/SF/Beamdynamics/common/qrc_resources/help/&lt;appname&gt;<br>
+/afs/psi.ch/project/pyqtacc/pyqtacc/qrc_resources/facility/sf/help/&lt;appname&gt;<br>
 where &lt;appname&gt;.py is the name of the application program</p> 
 
 <p> After modification, execute the following script to incorporate changes<br>
 into qrc_resource.py for import into PyQt4- and PyQt5-based applications:</p>
 
-<p>cd /afs/psi.ch/intranet/SF/Beamdynamics/common/qrc_resources</p>
+<p>cd /afs/psi.ch/project/pyqtacc/pyqtacc/qrc_resources/facility</p>
-<p>./make_and_install.sh</>
+<p>source make.sh</>
 
 
 

facility/sf/images

@@ -1 +1 @@
-../../common/images/
+../../../../../common/images