recompile qrc_resource.py

.gitignore

@@ -7,11 +7,13 @@ 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/*.*~

common/config/acc.qss

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

common/config/style.json

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

facility/sf/images

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

facility/sls/config/base.json

@@ -9,26 +9,93 @@
    "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"]
+			 } 
+        },
+       
+       "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",
+	"url": "https://elog-gfa.psi.ch/SLS",
+	"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
     },
     "stdlog":{
         "destination": "/tmp/"

facility/sls_make.sh

@@ -0,0 +1,4 @@
+cd sls
+make -f makefile-pyrcc5 -s compile
+make -f makefile-pyrcc5 -s install
+cd ../