proscan makefile added

SLS2-test elogbook made default
SLS2-test elogbook added
2024-02-08 14:14:48 +01:00 · 2024-01-22 17:10:49 +01:00 · 2024-01-22 17:07:36 +01:00 · 2024-01-22 16:58:51 +01:00 · 2023-08-21 15:44:17 +02:00 · 2023-07-21 15:54:33 +02:00
47 changed files with 95606 additions and 33923 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,17 @@ common/config/*.*~
 common/config/*.*-*
 facility/*.*~
 facility/sf/config/*.*-*
-facility/sf/help/BBA_Quad_BPM/*.*~
-facility/sf/pyrcc5/__pycache__
+facility/sf/pyrcc5/__pycache__/
+facility/sf/pyrcc5/__pycache__/*.*
 facility/sf/pyrcc5/*.*-*
 facility/sf/*.*~
 facility/sls/config/*.*-*
-facility/sls/help/BBA_Quad_BPM/*.*~
 facility/sls/pyrcc5/__pycache__
+facility/sls/pyrcc5/__pycache__/*.*
 facility/sls/pyrcc5/*.*-*
-facility/sls/*.*~
+facility/sls/*.*~
+facility/hipa/config/*.*-*
+facility/hipa/pyrcc5/__pycache__
+facility/hipa/pyrcc5/__pycache__/*.*
+facility/hipa/pyrcc5/*.*-*
+facility/hipa/*.*~
--- a/common/config/acc.qss
+++ b/common/config/acc.qss
--- a/common/config/acc.qss
+++ b/common/config/acc.qss
@@ -0,0 +1 @@
+../../../../common/config/acc.qss
--- a/common/config/style.json
+++ b/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)"
-	}
-}
--- a/common/config/style.json
+++ b/common/config/style.json
@@ -0,0 +1 @@
+../../../../common/config/style.json
--- a/facility/hipa/config/acc.qss
+++ b/facility/hipa/config/acc.qss
@@ -0,0 +1 @@
+../../../common/config/acc.qss
--- a/facility/hipa/config/base.json
+++ b/facility/hipa/config/base.json
@@ -0,0 +1,193 @@
+{
+    "menuFlags":{
+        "hasFile": 1,
+        "loadInitFile": 1,
+        "hasDaq":  1,
+        "hasH5" : 1,
+	"hasEpics" : 1
+    },
+   "ElogBooks": {
+
+        "HIPA": {
+            "url": "https://elog-gfa.psi.ch:443/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",
+                                     "Tips & Tricks", "Schicht-Übergabe", 
+                                     "Schicht-Auftrag"]},
+	    "Optional" : {"Effekt": ["","Strahluntertbruch","reduzierter Strahl","anderer","keiner"], 
+			  "System":["","nicht definiert","Beam dynamics application", "Controls", "Diagnostik", 
+				    "Elektrostatische-Elemente", "Elektrostatische-Speisegeräte", 
+				    "Elektroversorgung", "Geplanter Unterbruch", "Hochfahr-Probleme",
+				    "HF", "Infrastruktur", "Interlock System", "Ionenquelle", "Külung", 
+				    "Magnet", "Mag.Speisegeräte", "Operator Fehler", 
+				    "Produktions Start aufgeschoben", "PSYS", "SINQ nicht bereit",
+				    "Service", "Setup", "SU", "Strahlentwicklung", "Target-E", 
+				    "Target-M", "Tuning", "Unbekannte Ursache", "Vakuum", 
+				    "Andere Ursache"], 
+			  "Ort": ["","nicht definiert","Ionenquelle", "Cockcroft Walton",
+				  "Strahlführung 870 keV", "Injektor 2", "Strahlführung 72 MeV",
+				  "Isotopenproduktion", "Ring Zyklotron", "Protonen-Kanal",
+				  "Sekundär-Strahllinien", "Spallations Neutronenquelle",
+				  "Ultrakalte Neutronenquelle", "Global", "Andere"]
+			 } 
+        },
+
+        "HIPA+Strahlentwicklung": {
+            "url": "https://elog-gfa.psi.ch:443/HIPA+Strahlentwicklung",
+            "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",
+				     "RING-Phasensonden", "neue RING-Phasensonden",
+				     "Beamdump", "Schwerpunktmonitore", "Injektor 2",
+				     "axiale Bewegung", "EHT Splitterbetrieb", "MinT",
+				     "Optimizer"]
+			 } 
+        },
+
+
+        "HIPA-Bestandesaufnahme": {
+            "url": "https://elog-gfa.psi.ch:443/HIPA-Bestandesaufnahme",
+            "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",
+				 "Sekundär-Strahllinien", "Spallations Neutronenquelle",
+				 "Ultrakalte Neutronenquelle", "Global", "Andere"],
+			 "Konsole" :["acsw00","acsw03","acsw04", "acsw05","acsw06"]
+			}
+	   
+        },
+       
+
+
+       
+       
+       "Sandkasten": {
+	     "url": "https://elog-gfa.psi.ch:443/Sandkasten",
+             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	     "Required" : {"Eintrag": ["Problem","Anregung"]}, 
+	     "Optional" : {"Status": ["","Offen", "Geschlossen"]}
+       }
+    },
+ 
+    "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/"
+    },
+    "stdlog":{
+        "destination": "/tmp/"
+    },  
+    "screenshot": {
+        "destination": "/tmp/"
+    },
+    "url": {
+        "archiver"  : "https://data-ui.psi.ch/preselect?c1=hipa-archive/"
+	
+    },
+    "Shift":{
+        "type" :"ZORG:SHIFT-TYPE"
+    }, 
+    "header2" : ["INJ2", "IP2", "IW2", "PK1", "PK2", "SINQ", "UCN"],
+    "header" : ["SHIFT", "INJ2", "IP2", "IW2", "PK1", "PK2", "SINQ", "UCN"],
+    "SHIFT":{
+        "current": "ZORG:SHIFT-TYPE",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 stop)"
+    },
+    "INJ2":{
+        "current": "MWC2:IST:2",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 stop)",
+	"device" : ["CI1IN", "CI3IN", "CI4IN","CR1IN", "CR2IN", "CR3IN", "CR4IN", "CR5IN"],
+	"attribute" : ["IST:2"]
+    },
+    "IP2":{
+        "current": "MYC1:IST:2",
+	"colorObj" : "Beamline",
+	"color": "#9888b6",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #gray)", 
+	"device" : ["QYA1", "QYA2", "QYA3", "SYC1X", "SYC2Y", "AYB",  "SYA3X", 
+		    "SYA4Y","QYA4", "QYA5", "QYA6",  "QYC1",  "QYC2", "SYA5X",  
+		    "SYA6Y", "AYD", "SYA8Y", "QYA7", "QYA8", "SYA9X", "SYA10Y", 
+		    "SYA11X", "SYA12Y", "QYA9", "QYA10" ],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]
+
+    },
+    "IW2":{
+        "current": "MXC2:IST:2",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0  #ffffff, stop: 1 #00b7eb)", 
+	"device" : ["QXA4", "QXA5", "SXB6Y", "QXB6", "QXB7", "QXB8",  "QXB9", 
+		    "SXB5X","SXA7X", "SXA8Y", "QXA10",  "QXA11",  "QXA12", "QXA13",  
+		    "SXA9X", "SXA10Y", "SXA12Y", "QXA14", "QXA15", "AXD", "QXA16", 
+		    "AXE", "SNB1Y", "QXA17", "QXA18","QXA19", "SND1X", "SND2Y",
+		    "ANC", "QND1", "QND2", "SND3Y", "AND1", "AND2"],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]
+    },
+    "PK1":{
+        "current": "MHC1:IST:2",
+	"colorObj" : "Pk",
+	"color": "#00b7eb",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0  #ffffff, stop: 1 #00b7eb)" , 
+	"device" : ["AHB", "SHA1Y", "QHA1", "QHA2", "SHA2X", "SHA3Y", "AHC", 
+		    "QHA3","QHA4", "SHC4X", "QHTC5",  "QHTC6",  "SHD5Y", "SHD6X",  
+		    "ABS"],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]	
+    },
+    "PK2":{
+        "current": "MHC2:IST:2",
+	"colorObj" : "Pk",
+	"color": "#00b7eb",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FFFFFF, stop: 1 #2e5894)",
+	"device" : ["SHB7X", "QHB7", "QHB8", "AHD1", "QHA9", "QHA10",  "SHA8Y", 
+		    "SHA9X","AHD2", "QHC11", "QHC12",  "SHB10X",  "SHA11Y", "QHTC13",  
+		    "QHTC14", "QHTC15", "SHD13Y", "SHD14X", "SHD15Y", "SHD16X", "QHTC16", 
+		    "QHTC17", "QHTC18", "QHG21", "SHG21X", "QHG22", "AHL", "SHL" ],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]
+    },
+    "SINQ":{
+        "current": "MHC6:IST:2",
+	"colorObj" : "Athos",
+	"color": "#2e5894",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FFFFFF, stop: 1 #2e5894)",
+	"device" : ["QHG23", "SHG22X", "QHG24", "QHI25", "QHI26", "SHI23X",  "AHM", 
+		    "QHI27", "QHI28", "SHI24X",  "AHN", "SHI25X","QHI29", "QHJ30", 
+		    "AHO",  "QHJ31",  "QHJ32"],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]
+    },
+    "UCN":{
+        "current": "MBC1:IST:2",
+	"colorObj" : "Porthos",
+	"color": "#9c6da5",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FFFFFF, stop: 1 #9b111e)",
+	"device" : ["ABT", "QBB1", "QBB2", "SBB2Y", "SBB3X", "SBB4Y",  "SBB5X", 
+		    "QBB3","QBB4", "ABK1", "QBA5",  "QBA6",  "SBA6Y", "ABK2",  
+		    "QBB7"],
+	"attribute" : ["SOL:2", "IST:2", "PWR:2"]	
+    },
+    "hdf": {
+	"destination" : "/sf/data/measurements/"
+    },	
+    "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/hipa/config/style.json
+++ b/facility/hipa/config/style.json
@@ -0,0 +1 @@
+../../../common/config/style.json
--- a/facility/hipa/help/example_app/index.html
+++ b/facility/hipa/help/example_app/index.html
@@ -0,0 +1,25 @@
+<html><head><title>Lifetime Measurement</title></head>
+<body>
+
+<h5  style="color:gray;">Fall 2021, Andreas Streun, Jan Chrin</h5>
+<h4>Beam lifetime measurement</h4>
+<h2 style="color:blue;">About</h2>
+
+<p>This <b>Example Application</b> inherits from the SLSMainWindow base class.<br>  
+<p>information concerning this application, such as configuration parameters or other, may be entered, e.g., <a href="page1.html">here</a></p>
+
+<h2 style="color:blue;">The Panel</h2>
+
+<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>
+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 (automatic) import into PyQt4- and PyQt5-based applications:</p>
+
+<p>cd /afs/psi.ch/intranet/SF/Beamdynamics/common/qrc_resources</p>
+<p>./make_and_install.sh</>
+
+
+</body></html>
--- a/facility/hipa/help/example_app/page1.html
+++ b/facility/hipa/help/example_app/page1.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 1 of web help</b></p>
+<p>  <a href="page2.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/hipa/help/example_app/page2.html
+++ b/facility/hipa/help/example_app/page2.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 2 of web help</b></p>
+<p>  <a href="page3.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/hipa/help/example_app/page3.html
+++ b/facility/hipa/help/example_app/page3.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 3 of web help</b></p>
+<p>  <a href="page4.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/hipa/help/example_app/page4.html
+++ b/facility/hipa/help/example_app/page4.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 4 of web help</b></p>
+<p>  <a href="page5.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/hipa/help/example_app/page5.html
+++ b/facility/hipa/help/example_app/page5.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 5 of web help</b></p>
+
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/hipa/images
+++ b/facility/hipa/images
@@ -0,0 +1 @@
+../../common/images/
--- a/facility/hipa/makefile
+++ b/facility/hipa/makefile
@@ -0,0 +1 @@
+makefile-pyrcc5
--- a/facility/hipa/makefile-pyrcc5
+++ b/facility/hipa/makefile-pyrcc5
@@ -0,0 +1,10 @@
+compile:
+	pyrcc5 resources.qrc  > qrc_resources.py
+
+install:
+	mkdir -p pyrcc5
+	if [ ! -f qrc_resources.py ]; then echo "pyrcc5 compilation of resources.qrc failed"; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py-- ]; then cp pyrcc5/qrc_resources.py-- pyrcc5/qrc_resources.py---; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py- ]; then cp pyrcc5/qrc_resources.py- pyrcc5/qrc_resources.py--; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py ]; then cp pyrcc5/qrc_resources.py pyrcc5/qrc_resources.py-; fi
+	if [ -f qrc_resources.py ]; then cp qrc_resources.py pyrcc5/qrc_resources.py; fi
--- 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
@@ -0,0 +1,56 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file alias="helpabout.png">images/helpabout.png</file>
+<file alias="filenew.png">images/filenew.png</file>
+<file alias="fileopen.png">images/fileopen.png</file>
+<file alias="filesave.png">images/filesave.png</file>
+<file alias="filesaveas.png">images/filesaveas.png</file>
+<file alias="fileprint.png">images/fileprint.png</file>
+<file alias="filequit.png">images/filequit.png</file>
+<file alias="fileelog.png">images/send.png</file>
+<file alias="filestdlog.png">images/filestdlog.png</file>
+<file alias="elog.png">images/EL.png</file>
+<file alias="epics.png">images/EPICS.png</file>
+<file alias="hdf.png">images/HDF_logo.png</file>
+<file alias="hdfS.png">images/HDF_logoS.png</file>
+<file alias="editinvert.png">images/editinvert.png</file>
+<file alias="editswap.png">images/editswap.png</file>
+<file alias="editzoom.png">images/editzoom.png</file>
+<file alias="editmirror.png">images/editmirror.png</file>
+<file alias="editunmirror.png">images/editunmirror.png</file>
+<file alias="editmirrorhoriz.png">images/editmirrorhoriz.png</file>
+<file alias="editmirrorvert.png">images/editmirrorvert.png</file>
+<file alias="forbidden.png">images/forbidden.png</file>
+<file alias="back.png">images/back.png</file>
+<file alias="home.png">images/home.png</file>
+<file alias="icon.png">images/icon.png</file>
+<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="remove.png">images/remove.png</file>
+<file alias="joint.png">images/joint.png</file>
+<file alias="play.png">images/play.png</file>
+<file alias="pause.png">images/pause.png</file>
+<file alias="bar.png">images/bar.png</file>
+<file alias="screenshot.png">images/screenshot.png</file>
+<file alias="viewclearlog.png">images/viewclearlog.png</file>
+<file alias="loading.gif">images/loading.gif</file>
+
+<file alias="up_arrow.png">images/up_arrow.png</file>
+<file alias="down_arrow.png">images/down_arrow.png</file>
+<file alias="spinup.png">images/spinup.png</file>
+<file alias="spindown.png">images/spindown.png</file>
+
+<file alias="acc.qss">config/acc.qss</file>
+<file alias="base.json">config/base.json</file>
+<file alias="style.json">config/style.json</file>
+
+<file>help/example_app/page5.html</file>
+<file>help/example_app/page4.html</file>
+<file>help/example_app/page3.html</file>
+<file>help/example_app/page2.html</file>
+<file>help/example_app/page1.html</file>
+<file>help/example_app/index.html</file>
+</qresource>
+</RCC>
+
--- a/facility/hipa_make.sh
+++ b/facility/hipa_make.sh
@@ -0,0 +1,4 @@
+cd hipa
+make -f makefile-pyrcc5 -s compile
+make -f makefile-pyrcc5 -s install
+cd ../
--- a/facility/proscan/config/acc.qss
+++ b/facility/proscan/config/acc.qss
@@ -0,0 +1 @@
+../../../common/config/acc.qss
--- a/facility/proscan/config/base.json
+++ b/facility/proscan/config/base.json
@@ -0,0 +1,152 @@
+{
+    "menuFlags":{
+        "hasFile": 1,
+        "loadInitFile": 1,
+        "hasDaq":  1,
+        "hasH5" : 1,
+	"hasEpics" : 1
+    },
+   "ElogBooks": {
+
+        "Proscan": {
+            "url": "https://elog-gfa.psi.ch:443/Proscan",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/proscan/",
+	    "Required": {"Eintrag": ["Problem", "Info", "Tuning", 
+                                     "Betriebs-Wechsel", "Überbrückung", 
+                                     "Pikett", "Status",  "Meldung-AK3",
+                                     "Tips & Tricks", "Schicht-Übergabe", 
+                                     "Schicht-Auftrag"]},
+	    "Optional" : {"Effekt": ["","Abruch","Verzögerung","keiner","anderer"], 
+			  "System":["","Beamprobe Commissioning","Beamprobe Radial", "Diagnostik & Stopper Strahlweg", 
+				    "Extraktionselemente", "Gasversorgunung", "HF", "Interlock System", "Ionenquelle",
+				    "Kontrollsysteme", "Kryo und Magnet", "Külung", "Mag.Speisegeräte",
+				    "PaSS Gantry 1", "PaSS Gantry 2","PaSS Gantry 3", "PaSS OPTIS 2",
+				    "PaSS Kontrollraum", "PaSS Frei","Phase Slit","Phasensonde",
+				    "PSYS", "Schältplane Accel", "Speisegeräte Accel",
+				    "TrimRods", "Vakuum", "Zyklotron allgemein", "Strahlweg", "SU",
+				    "Andere Ursache"]
+			 } 
+        },
+    
+       
+       "Sandkasten": {
+	     "url": "https://elog-gfa.psi.ch:443/Sandkasten",
+             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	     "Required" : {"Eintrag": ["Problem","Anregung"]}, 
+	     "Optional" : {"Status": ["","Offen", "Geschlossen"]}
+       }
+    },
+ 
+    "Elog":{
+        "useELOGenv": 0,
+        "host": "elog-gfa.psi.ch",
+	"book": "Proscan",
+	"url": "https://elog-gfa.psi.ch/Proscan",
+	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
+    },
+    "stdlog":{
+        "destination": "/tmp/"
+    },  
+    "screenshot": {
+        "destination": "/tmp/"
+    },
+    "url": {
+        "archiver"  : "https://data-ui.psi.ch/preselect?c1=proscan-archive/"
+	
+    },
+    "Shift":{
+        "type" :"ZORG:SHIFT-TYPE"
+    }, 
+    "header2" : ["G1","SH","G2","O2","PIF","G3"],
+    "header" : ["COMET","G1","SH","G2","O2","PIF","G3","MASTER"],
+
+    "COMET":{
+        "status": "MMAC3:STR:2",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1  gray)"
+    },
+ 
+    "MASTER":{
+        "status": "XPROSCAN:STAB:2",
+	"colorObj" : "Pk",
+	"color": "#00b7eb",
+	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #00b7eb)"
+    },
+
+    "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)"
+    },
+    "G1":{
+        "status": "BME1:STA:2",
+	"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"]
+    },
+    "SH":{
+        "status": "BMA1:STA:2",
+	"colorObj" : "Machine",
+	"color": "gray",
+	"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"]
+    },
+    "G2":{
+        "status": "BMB1:STA:2",
+	"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"]
+    },
+    "O2":{
+        "status": "BMC1:STA:2",
+	"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"]
+    },
+    "PIF":{
+        "status": "BMD1:STA:2",
+	"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"]
+    },
+    "G3":{
+        "status": "BMD2:STA:2",
+	"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"]
+    },
+    "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/config/style.json
+++ b/facility/proscan/config/style.json
@@ -0,0 +1 @@
+../../../common/config/style.json
--- a/facility/proscan/help/example_app/index.html
+++ b/facility/proscan/help/example_app/index.html
@@ -0,0 +1,25 @@
+<html><head><title>Lifetime Measurement</title></head>
+<body>
+
+<h5  style="color:gray;">Fall 2021, Andreas Streun, Jan Chrin</h5>
+<h4>Beam lifetime measurement</h4>
+<h2 style="color:blue;">About</h2>
+
+<p>This <b>Example Application</b> inherits from the SLSMainWindow base class.<br>  
+<p>information concerning this application, such as configuration parameters or other, may be entered, e.g., <a href="page1.html">here</a></p>
+
+<h2 style="color:blue;">The Panel</h2>
+
+<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>
+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 (automatic) import into PyQt4- and PyQt5-based applications:</p>
+
+<p>cd /afs/psi.ch/intranet/SF/Beamdynamics/common/qrc_resources</p>
+<p>./make_and_install.sh</>
+
+
+</body></html>
--- a/facility/proscan/help/example_app/page1.html
+++ b/facility/proscan/help/example_app/page1.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 1 of web help</b></p>
+<p>  <a href="page2.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/proscan/help/example_app/page2.html
+++ b/facility/proscan/help/example_app/page2.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 2 of web help</b></p>
+<p>  <a href="page3.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/proscan/help/example_app/page3.html
+++ b/facility/proscan/help/example_app/page3.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 3 of web help</b></p>
+<p>  <a href="page4.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/proscan/help/example_app/page4.html
+++ b/facility/proscan/help/example_app/page4.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 4 of web help</b></p>
+<p>  <a href="page5.html"> Next</a></p>
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/proscan/help/example_app/page5.html
+++ b/facility/proscan/help/example_app/page5.html
@@ -0,0 +1,7 @@
+<html><head><title>Web Help</title></head>
+<body>
+
+<p><b>Page 5 of web help</b></p>
+
+<p><b>etc...</b> etc...</p>
+</body></html>
--- a/facility/proscan/images
+++ b/facility/proscan/images
@@ -0,0 +1 @@
+../../common/images/
--- a/facility/proscan/makefile
+++ b/facility/proscan/makefile
@@ -0,0 +1 @@
+makefile-pyrcc5
--- a/facility/proscan/makefile-pyrcc5
+++ b/facility/proscan/makefile-pyrcc5
@@ -0,0 +1,10 @@
+compile:
+	pyrcc5 resources.qrc  > qrc_resources.py
+
+install:
+	mkdir -p pyrcc5
+	if [ ! -f qrc_resources.py ]; then echo "pyrcc5 compilation of resources.qrc failed"; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py-- ]; then cp pyrcc5/qrc_resources.py-- pyrcc5/qrc_resources.py---; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py- ]; then cp pyrcc5/qrc_resources.py- pyrcc5/qrc_resources.py--; fi
+	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py ]; then cp pyrcc5/qrc_resources.py pyrcc5/qrc_resources.py-; fi
+	if [ -f qrc_resources.py ]; then cp qrc_resources.py pyrcc5/qrc_resources.py; fi
--- 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
@@ -0,0 +1,56 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file alias="helpabout.png">images/helpabout.png</file>
+<file alias="filenew.png">images/filenew.png</file>
+<file alias="fileopen.png">images/fileopen.png</file>
+<file alias="filesave.png">images/filesave.png</file>
+<file alias="filesaveas.png">images/filesaveas.png</file>
+<file alias="fileprint.png">images/fileprint.png</file>
+<file alias="filequit.png">images/filequit.png</file>
+<file alias="fileelog.png">images/send.png</file>
+<file alias="filestdlog.png">images/filestdlog.png</file>
+<file alias="elog.png">images/EL.png</file>
+<file alias="epics.png">images/EPICS.png</file>
+<file alias="hdf.png">images/HDF_logo.png</file>
+<file alias="hdfS.png">images/HDF_logoS.png</file>
+<file alias="editinvert.png">images/editinvert.png</file>
+<file alias="editswap.png">images/editswap.png</file>
+<file alias="editzoom.png">images/editzoom.png</file>
+<file alias="editmirror.png">images/editmirror.png</file>
+<file alias="editunmirror.png">images/editunmirror.png</file>
+<file alias="editmirrorhoriz.png">images/editmirrorhoriz.png</file>
+<file alias="editmirrorvert.png">images/editmirrorvert.png</file>
+<file alias="forbidden.png">images/forbidden.png</file>
+<file alias="back.png">images/back.png</file>
+<file alias="home.png">images/home.png</file>
+<file alias="icon.png">images/icon.png</file>
+<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="remove.png">images/remove.png</file>
+<file alias="joint.png">images/joint.png</file>
+<file alias="play.png">images/play.png</file>
+<file alias="pause.png">images/pause.png</file>
+<file alias="bar.png">images/bar.png</file>
+<file alias="screenshot.png">images/screenshot.png</file>
+<file alias="viewclearlog.png">images/viewclearlog.png</file>
+<file alias="loading.gif">images/loading.gif</file>
+
+<file alias="up_arrow.png">images/up_arrow.png</file>
+<file alias="down_arrow.png">images/down_arrow.png</file>
+<file alias="spinup.png">images/spinup.png</file>
+<file alias="spindown.png">images/spindown.png</file>
+
+<file alias="acc.qss">config/acc.qss</file>
+<file alias="base.json">config/base.json</file>
+<file alias="style.json">config/style.json</file>
+
+<file>help/example_app/page5.html</file>
+<file>help/example_app/page4.html</file>
+<file>help/example_app/page3.html</file>
+<file>help/example_app/page2.html</file>
+<file>help/example_app/page1.html</file>
+<file>help/example_app/index.html</file>
+</qresource>
+</RCC>
+
--- a/facility/proscan_make.sh
+++ b/facility/proscan_make.sh
@@ -0,0 +1,4 @@
+cd proscan
+make -f makefile-pyrcc5 -s compile
+make -f makefile-pyrcc5 -s install
+cd ../
--- a/facility/sf/config/base.json
+++ b/facility/sf/config/base.json
@@ -16,20 +16,103 @@
    "ElogBooks": {
        "SwissFEL+commissioning": {
            "url": "https://elog-gfa.psi.ch:443/SwissFEL+commissioning",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+commissioning/"
+	    "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+commissioning/",
+	    "Required": {"Category": ["Access", "DCM Minutes", "Info", "Laser- & Gun-Perfromance Routine", "Measurement summary", "Pikett",
+				      "Problem", "Schicht-Übergabe", "Shift summary", "Tips & Tricks", "Überbrückung",  "Schicht-Auftrag",
+				      "RC exchange minutes", "Weekly reference settings"]},
+	    "Optional": {"System"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Feedbacks", "Insertion-devices", "Laser", 
+				      "Magnet Power Supplies", "Operation", "Photonics", "PLC", "RF", "Safety", "Timing & Sync", "Vacuum", 
+				      "Water cooling", "Other", "Unknown"],
+			 "Domain"  : ["","Global","Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos"],
+			 "Section" : [ [""],[""],
+				       ["","SINEG01", "SINBD01", "SINSB01", "SINSB02", "SINLH01", "SINLH02", "SINLH03", "SINSB03", "SINSB04", "SINSB05", "SINXB01", "SINBC01", "SINBC02", "SINDI01", "SINDI02"],
+				       ["","S10CB01", "S10CB02", "S10DI01", "S10BD01", "S10CB03", "S10CB04", "S10CB05", "S10CB06", "S10CB08", "S10CB09", "S10BC01", "S10BC02", "S10MA01"],
+				       ["","S20CB01", "S20CB02", "S20CB03", "S20CB04", "S20SY01", "S20SY02", "S20SY03"],
+				       ["","S30CB01", "S30CB02", "S30CB03", "S30CB04", "S30CB05", "S30CB06", "S30CB07", "S30CB08", "S30CB09", "S30CB10", "S30CB11", "S30CB12", "S30CB13", "S30CB14", "S30CB15", "S30CB16"],
+				       ["","SARCL01", "SARCL02", "SARMA01", "SARMA02", "SARUN01", "SARUN02", "SARUN03", "SARUN04", "SARUN05", "SARUN06", "SARUN07", "SARUN08", "SARUN09", "SARUN10", "SARUN11", "SARUN12", 
+					"SARUN13", "SARUN14", "SARUN15", "SARUN16", "SARUN17", "SARUN18", "SARUN19", "SARUN20", "SARBD01", "SARBD02"],
+				       ["","SARFE10 (Gas detector)", "SAROP11 (ESA / ALVRA)", "SAROP21 (ESB / Bernina)", "SAROP31 (ESC)"],
+				       ["","SATSY01", "SATSY02", "SATSY03", "SATCL01", "SATDI01", "SATCB01", "SATCB02", "SATMA01", "SATUN01", "SATUN02", "SATUN03", "SATUN04", "SATUN05", "SATUN06", "SATUN07", "SATUN08", 
+					"SATUN09", "SATUN10", "SATDI04", "SATUN11", "SATUN12", "SATUN13", "SATUN14", "SATUN15", "SATUN16", "SATUN17", "SATUN18", "SATUN19", "SATUN20", "SATUN21", "SATUN22", "SATBD01", "SATBD02"],
+				       ["","SATFE10", "SATOP1"]
+				     ],
+			 "Effect" : [""]
+			 }
        },
        "SwissFEL+commissioning+data": {
            "url": "https://elog-gfa.psi.ch:443/SwissFEL+commissioning+data",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+commissioning+data/"
+            "destination": "/sf/data/measurements/",
+	    "Required": {"Category": ["Info","Measurement"]},
+	    "Optional": {"System"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Insertion-devices", "Laser", 
+				      "Magnet Power Supplies", "Operation", "RF", "Safety", "Timing & Sync", "Vacuum", 
+				      "Water cooling", "Other", "Unknown"],
+			 "Domain"  : ["", "Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos"],
+			 "Section" : [ [""], 
+				       ["","SINEG01", "SINBD01", "SINSB01", "SINSB02", "SINLH01", "SINLH02", "SINLH03", "SINSB03", "SINSB04", "SINSB05", "SINXB01", "SINBC01", "SINBC02", "SINDI01", "SINDI02"],
+				       ["","S10CB01", "S10CB02", "S10DI01", "S10BD01", "S10CB03", "S10CB04", "S10CB05", "S10CB06", "S10CB08", "S10CB09", "S10BC01", "S10BC02", "S10MA01"],
+				       ["","S20CB01", "S20CB02", "S20CB03", "S20CB04", "S20SY01", "S20SY02", "S20SY03"],
+				       ["","S30CB01", "S30CB02", "S30CB03", "S30CB04", "S30CB05", "S30CB06", "S30CB07", "S30CB08", "S30CB09", "S30CB10", "S30CB11", "S30CB12", "S30CB13", "S30CB14", "S30CB15", "S30CB16"],
+				       ["","SARCL01", "SARCL02", "SARMA01", "SARMA02", "SARUN01", "SARUN02", "SARUN03", "SARUN04", "SARUN05", "SARUN06", "SARUN07", "SARUN08", "SARUN09", "SARUN10", "SARUN11", "SARUN12", 
+					"SARUN13", "SARUN14", "SARUN15", "SARUN16", "SARUN17", "SARUN18", "SARUN19", "SARUN20", "SARBD01", "SARBD02"],
+				       ["","SARFE10 (Gas detector)", "SAROP11 (ESA / ALVRA)", "SAROP21 (ESB / Bernina)", "SAROP31 (ESC)"],
+				       ["","SATSY01", "SATSY02", "SATSY03", "SATCL01", "SATDI01", "SATCB01", "SATCB02", "SATMA01", "SATUN01", "SATUN02", "SATUN03", "SATUN04", "SATUN05", "SATUN06", "SATUN07", "SATUN08", 
+					"SATUN09", "SATUN10", "SATDI04", "SATUN11", "SATUN12", "SATUN13", "SATUN14", "SATUN15", "SATUN16", "SATUN17", "SATUN18", "SATUN19", "SATUN20", "SATUN21", "SATUN22", "SATBD01", "SATBD02"],
+				       ["","SATFE10", "SATOP1"]
+				      ]
+			 }
+	   
        },
        "SwissFEL+test": {
            "url": "https://elog-gfa.psi.ch:443/SwissFEL+test",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+test/"
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+test/",
+	    "Optional": {"Category": ["Shift summary", "Measurement summary", "Procedures or Work-Arounds",
+				      "Problem", "Info", "Überbrückung",  "Pre-beam Check"],
+			 "System"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Feedbacks", "Insertion-devices", "Laser", 
+				      "Magnet Power Supplies", "Operation", "Photonics", "PLC", "RF", "Safety", "Timing & Sync", "Vacuum", 
+				      "Water cooling", "Other", "Unknown"],
+			 "Domain"  : ["","Injector","Linac1","Linac2","Linac3","Aramis","Athos"],
+			 "Section" : [ [""], 
+				       ["","SINEG01", "SINBD01", "SINSB01", "SINSB02", "SINLH01", "SINLH02", "SINLH03", "SINSB03", "SINSB04", "SINSB05", "SINXB01", "SINBC01", "SINBC02", "SINDI01", "SINDI02"],
+				       ["","S10CB01", "S10CB02", "S10DI01", "S10BD01", "S10CB03", "S10CB04", "S10CB05", "S10CB06", "S10CB08", "S10CB09", "S10BC01", "S10BC02", "S10MA01"],
+				       ["","S20CB01", "S20CB02", "S20CB03", "S20CB04", "S20SY01", "S20SY02", "S20SY03"],
+				       ["","S30CB01", "S30CB02", "S30CB03", "S30CB04", "S30CB05", "S30CB06", "S30CB07", "S30CB08", "S30CB09", "S30CB10", "S30CB11", "S30CB12", "S30CB13", "S30CB14", "S30CB15", "S30CB16"],
+				       ["","SARCL01", "SARCL02", "SARMA01", "SARMA02", "SARUN01", "SARUN02", "SARUN03", "SARUN04", "SARUN05", "SARUN06", "SARUN07", "SARUN08", "SARUN09", "SARUN10", "SARUN11", "SARUN12", 
+					"SARUN13", "SARUN14", "SARUN15", "SARUN16", "SARUN17", "SARUN18", "SARUN19", "SARUN20", "SARBD01", "SARBD02"],
+				       ["","SATSY01", "SATSY02", "SATSY03", "SATCL01", "SATDI01", "SATCB01", "SATCB02", "SATMA01", "SATUN01", "SATUN02", "SATUN03", "SATUN04", "SATUN05", "SATUN06", "SATUN07", "SATUN08", 
+					"SATUN09", "SATUN10", "SATDI04", "SATUN11", "SATUN12", "SATUN13", "SATUN14", "SATUN15", "SATUN16", "SATUN17", "SATUN18", "SATUN19", "SATUN20", "SATUN21", "SATUN22", "SATBD01", "SATBD02"],
+				       ["","SATFE10", "SATOP1"]
+				     ] 
+			 }
        },
        "SwissFEL+test+data": {
            "url": "https://elog-gfa.psi.ch:443/SwissFEL+test+data",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/SwissFEL+test+data/"
-        }
+            "destination": "/sf/data/measurements/",
+	    "Required": {"Category": ["Shift summary", "Measurement summary", "Procedures or Work-Arounds",
+				      "Problem", "Info", "Überbrückung",  "Pre-beam Check"]
+			},
+	    "Optional": {"System"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Feedbacks", "Insertion-devices", "Laser", 
+				      "Magnet Power Supplies", "Operation", "Photonics", "PLC", "RF", "Safety", "Timing & Sync", "Vacuum", 
+				      "Water cooling", "Other", "Unknown"],
+			 "Domain"  : ["","Injector","Linac1","Linac2","Linac3","Aramis","Athos"],
+			 "Section" : [ [""], 
+				       ["","SINEG01", "SINBD01", "SINSB01", "SINSB02", "SINLH01", "SINLH02", "SINLH03", "SINSB03", "SINSB04", "SINSB05", "SINXB01", "SINBC01", "SINBC02", "SINDI01", "SINDI02"],
+				       ["","S10CB01", "S10CB02", "S10DI01", "S10BD01", "S10CB03", "S10CB04", "S10CB05", "S10CB06", "S10CB08", "S10CB09", "S10BC01", "S10BC02", "S10MA01"],
+				       ["","S20CB01", "S20CB02", "S20CB03", "S20CB04", "S20SY01", "S20SY02", "S20SY03"],
+				       ["","S30CB01", "S30CB02", "S30CB03", "S30CB04", "S30CB05", "S30CB06", "S30CB07", "S30CB08", "S30CB09", "S30CB10", "S30CB11", "S30CB12", "S30CB13", "S30CB14", "S30CB15", "S30CB16"],
+				       ["","SARCL01", "SARCL02", "SARMA01", "SARMA02", "SARUN01", "SARUN02", "SARUN03", "SARUN04", "SARUN05", "SARUN06", "SARUN07", "SARUN08", "SARUN09", "SARUN10", "SARUN11", "SARUN12", 
+					"SARUN13", "SARUN14", "SARUN15", "SARUN16", "SARUN17", "SARUN18", "SARUN19", "SARUN20", "SARBD01", "SARBD02"],
+				       ["","SATSY01", "SATSY02", "SATSY03", "SATCL01", "SATDI01", "SATCB01", "SATCB02", "SATMA01", "SATUN01", "SATUN02", "SATUN03", "SATUN04", "SATUN05", "SATUN06", "SATUN07", "SATUN08", 
+					"SATUN09", "SATUN10", "SATDI04", "SATUN11", "SATUN12", "SATUN13", "SATUN14", "SATUN15", "SATUN16", "SATUN17", "SATUN18", "SATUN19", "SATUN20", "SATUN21", "SATUN22", "SATBD01", "SATBD02"],
+				       ["","SATFE10", "SATOP1"]
+				     ] 
+			}
+        },
+	"Sandkasten": {
+	     "url": "https://elog-gfa.psi.ch:443/Sandkasten",
+             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	     "Required" : {"Eintrag": ["Problem","Anregung"]}, 
+	     "Optional" : {"Status": ["","Offen", "Geschlossen"]}
+       }
    },
    "Elog": {
        "useELOGenv" : 0,
@@ -40,8 +123,8 @@
 	"category": ["Info","Measurement"],
 	"system"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Insertion-devices", "Laser", 
 		     "Magnet Power Supplies", "Operation", "RF", "Safety", "Vacuum", "Water cooling", "Other", "Unknown"],
-	"domain"  : ["","Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos"],
-	"section" : [ [""],
+	"domain"  : ["","Global","Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos"],
+	"section" : [ [""], [""],
 		      ["","SINEG01", "SINBD01", "SINSB01", "SINSB02", "SINLH01", "SINLH02", "SINLH03", "SINSB03", "SINSB04", "SINSB05", "SINXB01", "SINBC01", "SINBC02", "SINDI01", "SINDI02"],
 		      ["","S10CB01", "S10CB02", "S10DI01", "S10BD01", "S10CB03", "S10CB04", "S10CB05", "S10CB06", "S10CB08", "S10CB09", "S10BC01", "S10BC02", "S10MA01"],
 		      ["","S20CB01", "S20CB02", "S20CB03", "S20CB04", "S20SY01", "S20SY02", "S20SY03"],
@@ -61,8 +144,8 @@
        "destination": "/sf/data/applications/screenshot/"
    }, 
    "url": {
-        "archiver"  : "https://ui-data-api.psi.ch/prepare?channel=sf-archiverappliance/",
-	"databuffer": "https://ui-data-api.psi.ch/prepare?channel=sf-databuffer/"
+        "archiver"  : "https://data-ui.psi.ch/preselect?c1=sf-archiverappliance/",
+	"databuffer": "https://data-ui.psi.ch/preselect?c1=sf-databuffer/"
    },
    "OpMsg":{
        "pvDate1" :"SF-OP:CR-MSG:OP-DATE1",
@@ -77,7 +160,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 +176,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 +200,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 +209,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 +217,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
--- a/facility/sf/help/energy_loss_meas/page1.html
+++ b/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>./make_and_install.sh</>
+<p>cd /afs/psi.ch/project/pyqtacc/pyqtacc/qrc_resources/facility</p>
+<p>source make.sh</>



--- a/facility/sf/makefile-pyrcc5
+++ b/facility/sf/makefile-pyrcc5
@@ -2,8 +2,9 @@ compile:
 	pyrcc5 resources.qrc  > qrc_resources.py

 install:
+	mkdir -p pyrcc5
 	if [ ! -f qrc_resources.py ]; then echo "pyrcc5 compilation of resources.qrc failed"; fi
 	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py-- ]; then cp pyrcc5/qrc_resources.py-- pyrcc5/qrc_resources.py---; fi
 	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py- ]; then cp pyrcc5/qrc_resources.py- pyrcc5/qrc_resources.py--; fi
 	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py ]; then cp pyrcc5/qrc_resources.py pyrcc5/qrc_resources.py-; fi
-	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py ]; then cp qrc_resources.py pyrcc5/qrc_resources.py; fi
+	if [ -f qrc_resources.py ]; then cp qrc_resources.py pyrcc5/qrc_resources.py; fi
--- a/facility/sf/pyrcc5/pycache/qrc_resources.cpython-37.pyc
+++ b/facility/sf/pyrcc5/pycache/qrc_resources.cpython-37.pyc
--- a/facility/sf/pyrcc5/qrc_resources.py
+++ b/facility/sf/pyrcc5/qrc_resources.py
--- a/facility/sf/qrc_resources.py
+++ b/facility/sf/qrc_resources.py
--- a/facility/sf_make.sh
+++ b/facility/sf_make.sh
--- a/facility/sls/config/base.json
+++ b/facility/sls/config/base.json
@@ -9,26 +9,108 @@
   "ElogBooks": {
        "SLS+Development": {
            "url": "https://elog-gfa.psi.ch:443/SLS+Development",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/"
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	    "Required": {"Projekt": ["BBA", "Booster", "Coupling", "Emittance",
+				     "Filling Patterns", "IDs", "MBFM",
+				     "Optics", "low beam energy","low alpha",
+				     "Lifetime","RGM", "Photon Monitors",
+				     "Stability", "Beam transmissions",
+				     "Loss Factor Measurement",
+				     "beam size monitor", 
+				     "Insertion Device Alignment",
+				     "Beam loss monitors", "Single Turn BPM", 
+				     "Injection", "Charge Monitoring", 
+				     "Orbit Correction",
+				     "Bunch Length Measurements", 
+				     "Loss Measurement", "TRIBs", 
+				     "Robinson Stability", 
+				     "Injection Transient", 
+				     "TbT BPM measurement", "LINAC Optimizer"]
+			}
        },
        "SLS+Measurement+Data": {
            "url": "https://elog-gfa.psi.ch:443/SLS+Measurement+Data",
-            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/"
-        }
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	    "Required": {"Projekt": ["BBA", "Booster", "Coupling", "Emittance",
+				     "Filling Patterns", "IDs", "MBFM",
+				     "Optics", "low beam energy","low alpha",
+				     "Lifetime","RGM", "Photon Monitors",
+				     "Stability", "Beam transmissions",
+				     "Loss Factor Measurement",
+				     "beam size monitor", 
+				     "Insertion Device Alignment",
+				     "Beam loss monitors", "Single Turn BPM"]
+			}
+        },
+        "SLS": {
+            "url": "https://elog-gfa.psi.ch:443/SLS",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	    "Required": {"Eintrag": ["Problem", "Info", "Tuning", 
+				     "Betriebs-Wechsel", "Überbrückung", 
+				     "Pikett", "Status", "Meldung-AK3",
+				     "Tips & Tricks", "Schicht-Übergabe", 
+				     "Schicht-Auftrag"]},
+	    "Optional" : {"Effekt": [] , 
+			  "System":["","Beamdynamics","Feedbacks","Controls", "Diagnostik", 
+				    "Electroversorgung", "Frontends", "Insertion-devices", "HF", 
+				    "Timing", "Mag.Speisegeräte", "Operator", "SU", "PSYS", "Vakuum", 
+				    "Külung", "Andere", "Unbekannt"], 
+			  "auto": ["","yes", "no"]
+			 } 
+        },
+       "SLS2-test": {
+            "url": "https://elog-gfa.psi.ch:443/SLS2-test",
+            "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	    "Required": {"Eintrag": ["Problem", "Info", "Tuning", 
+				     "Betriebs-Wechsel", "Überbrückung", 
+				     "Pikett", "Status", "Meldung-AK3",
+				     "Tips & Tricks", "Schicht-Übergabe", 
+				     "Schicht-Auftrag"]},
+	    "Optional" : {"Effekt": [] , 
+			  "System":["","Beamdynamics","Feedbacks","Controls", "Diagnostik", 
+				    "Electroversorgung", "Frontends", "Insertion-devices", "HF", 
+				    "Timing", "Mag.Speisegeräte", "Operator", "SU", "PSYS", "Vakuum", 
+				    "Külung", "Andere", "Unbekannt"], 
+			  "auto": ["","yes", "no"]
+			 } 
+        }, 
+       "Sandkasten": {
+	     "url": "https://elog-gfa.psi.ch:443/Sandkasten",
+             "destination": "/afs/psi.ch/intranet/Controls/tmp/elog/ePic/sls/",
+	     "Required" : {"Eintrag": ["Problem","Anregung"]}, 
+	     "Optional" : {"Status": ["","Offen", "Geschlossen"]}
+       }
+    },
+    "ElogFields": {
+        "SLS": {
+	    "Required": {"Eintrag": ["Problem", "Info", "Tuning", 
+				     "Betriebs-Wechsel", "Überbrückung", 
+				     "Pikett", "Status", "Meldung-AK3",
+				     "Tips & Tricks", "Schicht-Übergabe", 
+				     "Schicht-Auftrag"]
+			},
+	    "Optional" : {"Effekt": [] , 
+			  "System":["", "Beamdynamics", "Feedbacks", "Controls", 
+				    "Diagnostik", "Electroversorgung", 
+				    "Frontends", "Insertion-devices", "HF", 
+				    "Timing", "Mag.Speisegeräte", "Operator", 
+				    "SU", "PSYS", "Vakuum", "Külung", "Andere", 
+				    "Unbekannt"], 
+			  "auto": ["","yes", "no"]
+			 } 
+	},
+	"SLS+Development" :  {"Required" : ["Projekt"], "Optional" : []  },
+	"SLS+Measurement+Data" :  {"Required" : ["Projekt"], "Optional" : [] },
+	"Sandkasten" :  {
+	    "Required" : {"Eintrag": ["Problem","Anregung"]}, "Optional" : {"Status": ["","Offen", "Geschlossen"] }
+	}
    },
    "Elog":{
        "useELOGenv": 0,
        "host": "elog-gfa.psi.ch",
-	"book": "SLS+Development",
-	"url": "https://elog-gfa.psi.ch/SLS+Development",
-	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/",
-	"category": ["Info","Measurement"],
-	"system"  : ["","Beamdynamics","Controls", "Diagnostics", "Electric supply", "Insertion-devices", "Laser", 
-		     "Magnet Power Supplies", "Operation", "RF", "Safety", "Vacuum", "Water cooling", "Other", "Unknown"],
-	"domain"  : ["","Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos","Athos Beamlines"],
-	"section" : [ [""],
-		      [""]
-		      ]
+	"book": "SLS-test2",
+	"url": "https://elog-gfa.psi.ch/SLS",
+	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
    },
    "stdlog":{
        "destination": "/tmp/"
--- a/facility/sls/makefile-pyrcc5
+++ b/facility/sls/makefile-pyrcc5
@@ -2,6 +2,7 @@ compile:
 	pyrcc5 resources.qrc  > qrc_resources.py

 install:
+	mkdir -p pyrcc5
 	if [ ! -f qrc_resources.py ]; then echo "pyrcc5 compilation of resources.qrc failed"; fi
 	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py-- ]; then cp pyrcc5/qrc_resources.py-- pyrcc5/qrc_resources.py---; fi
 	if [ -f qrc_resources.py -a -f pyrcc5/qrc_resources.py- ]; then cp pyrcc5/qrc_resources.py- pyrcc5/qrc_resources.py--; fi
--- 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
--- a/facility/sls_make.sh
+++ b/facility/sls_make.sh
@@ -0,0 +1,4 @@
+cd sls
+make -f makefile-pyrcc5 -s compile
+make -f makefile-pyrcc5 -s install
+cd ../
Author	SHA1	Message	Date
chrin	fafd64218f	proscan makefile added	2024-02-08 14:14:48 +01:00
chrin	646c4f7a7f	SLS2-test elogbook made default	2024-01-22 17:10:49 +01:00
chrin	ca40bf7da9	SLS2-test elogbook added	2024-01-22 17:07:36 +01:00
chrin	111612bf8d	added elog SLS2-test	2024-01-22 16:58:51 +01:00
chrin	f66b24b11f	qrc_resources.py	2023-08-21 15:44:17 +02:00
chrin	b4f6f26df2	sf base.json for elog options	2023-07-21 15:54:33 +02:00
chrin	4e2bf96ba0	robust makefiles	2023-07-17 15:58:46 +02:00
chrin	817a5bd161	new sf base.json for logbook	2023-07-17 13:59:18 +02:00
chrin	c09fd4b559	new base.json with logbook choices for sf	2023-07-17 10:26:43 +02:00
chrin	7282e10ac8	remove unconnevcted rf CI2IN device	2023-06-01 14:11:21 +02:00
chrin	36d7c3a641	add hipa; cgance to sf/config/base.py and sf_qrc_tresources	2023-05-01 09:50:24 +02:00
chrin	e2ae8cd87f	recompile qrc_resource.py	2023-02-21 15:22:30 +01:00
chrin	a56ba32403	update	2023-02-21 15:09:54 +01:00
chrin	80ee982a4a	update	2023-02-21 14:58:14 +01:00
chrin	652c86a200	qrc_resources.py	2023-01-06 14:49:17 +01:00
chrin	4e4a8e7156	base.json modified	2023-01-06 14:35:43 +01:00
chrin	001c78542e	new resource file and sls/config/base.json for sls elog options	2022-10-24 08:15:17 +02:00
chrin	4171df1bcc	updated acc.qss (Controller10pt object added) in qrc_resources.py	2022-10-18 12:08:26 +02:00
chrin	af4fa147e1	Font size 16px to 12pt for Buttons in acc.qss	2022-10-14 11:32:44 +02:00
chrin	c85a4049a2	v1.4.0	2022-10-06 08:29:48 +02:00
chrin	44f6c770e1	overdue	2022-09-15 08:51:01 +02:00