qrc_resources.py

.gitignore

@@ -6,14 +6,17 @@ common/config/*.*~
 common/config/*.*-*
 facility/*.*~
 facility/sf/config/*.*-*
-facility/sf/help/BBA_Quad_BPM/*.*~
+facility/sf/pyrcc5/__pycache__/
-facility/sf/pyrcc5/
 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/
 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/*.*~

facility/hipa/config/base.json

@@ -16,10 +16,10 @@
                                      "Pikett", "Status", "Bestandes aufnahme", "Meldung-AK3",
                                      "Tips & Tricks", "Schicht-Übergabe", 
                                      "Schicht-Auftrag"]},
-	    "Optional" : {"Effekt": ["","Strahluntertbruch","reduzierter Strahl","anderer","keine"], 
+	    "Optional" : {"Effekt": ["","Strahluntertbruch","reduzierter Strahl","anderer","keiner"], 
 			  "System":["","nicht definiert","Beam dynamics application", "Controls", "Diagnostik", 
-				    "Electrostatische-Elemente", "Electrostatische-Speisegeräte", 
+				    "Elektrostatische-Elemente", "Elektrostatische-Speisegeräte", 
-				    "Electroversorgung", "Geplanter Unterbruch", "Hochfahr-Probleme",
+				    "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",
@@ -106,7 +106,7 @@
 	"colorObj" : "Machine",
 	"color": "gray",
 	"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 stop)",
-	"device" : ["CI1IN", "CI2IN", "CI3IN", "CI4IN","CR1IN", "CR2IN", "CR3IN", "CR4IN", "CR5IN"],
+	"device" : ["CI1IN", "CI3IN", "CI4IN","CR1IN", "CR2IN", "CR3IN", "CR4IN", "CR5IN"],
 	"attribute" : ["IST:2"]
     },
     "IP2":{

facility/hipa/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

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"],
+	"domain"  : ["","Global","Injector","Linac1","Linac2","Linac3","Aramis","Aramis Beamlines","Athos"],
-	"section" : [ [""],
+	"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"],

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

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