9 Commits

Author SHA1 Message Date
36d7c3a641 add hipa; cgance to sf/config/base.py and sf_qrc_tresources 2023-05-01 09:50:24 +02:00
e2ae8cd87f recompile qrc_resource.py 2023-02-21 15:22:30 +01:00
a56ba32403 update 2023-02-21 15:09:54 +01:00
80ee982a4a update 2023-02-21 14:58:14 +01:00
652c86a200 qrc_resources.py 2023-01-06 14:49:17 +01:00
4e4a8e7156 base.json modified 2023-01-06 14:35:43 +01:00
001c78542e new resource file and sls/config/base.json for sls elog options 2022-10-24 08:15:17 +02:00
4171df1bcc updated acc.qss (Controller10pt object added) in qrc_resources.py 2022-10-18 12:08:26 +02:00
af4fa147e1 Font size 16px to 12pt for Buttons in acc.qss 2022-10-14 11:32:44 +02:00
27 changed files with 33096 additions and 33627 deletions

6
.gitignore vendored
View File

@@ -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/*.*~

View File

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

View File

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

View File

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

View File

@@ -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","keine"],
"System":["","nicht definiert","Beam dynamics application", "Controls", "Diagnostik",
"Electrostatische-Elemente", "Electrostatische-Speisegeräte",
"Electroversorgung", "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", "CI2IN", "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"]
}
}

View File

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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

1
facility/hipa/images Symbolic link
View File

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

1
facility/hipa/makefile Symbolic link
View File

@@ -0,0 +1 @@
makefile-pyrcc5

View File

@@ -0,0 +1,9 @@
compile:
pyrcc5 resources.qrc > qrc_resources.py
install:
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

56
facility/hipa/resources.qrc Executable file
View File

@@ -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>

4
facility/hipa_make.sh Normal file
View File

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

View File

@@ -61,8 +61,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",

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -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/"

File diff suppressed because it is too large Load Diff

4
facility/sls_make.sh Normal file
View File

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