6 Commits

Author SHA1 Message Date
19f3d90351 hush 2024-02-15 16:30:15 +01:00
cf7f4c7257 devl 2024-02-15 16:12:11 +01:00
fafd64218f proscan makefile added 2024-02-08 14:14:48 +01:00
646c4f7a7f SLS2-test elogbook made default 2024-01-22 17:10:49 +01:00
ca40bf7da9 SLS2-test elogbook added 2024-01-22 17:07:36 +01:00
111612bf8d added elog SLS2-test 2024-01-22 16:58:51 +01:00
20 changed files with 71364 additions and 10077 deletions

BIN
common/images/Hush.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

View File

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

View File

@@ -0,0 +1,201 @@
{
"menuFlags":{
"hasFile": 0,
"loadInitFile": 0,
"hasDaq": 0,
"hasH5" : 0,
"hasEpics" : 0
},
"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"
},
"headerMagnetSector" : ["G1","SH","G2","O2","PIF","G3"],
"header" : ["COMET","BMA1","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)"
},
"B1B2":{
"status": "PRO-HUSH:SHIFT-TYPE",
"colorObj" : "Machine",
"color": "#9888b6",
"qlingrad": "qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ffffff, stop: 1 #9888b6)",
"device" : ["QMA1", "QMA2", "QMA3", "QMA4", "QMA5"],
"attribute" : ["SOL:2", "IST:2", "PWR:2"],
"standby": [-9.155, 9.155, -6.867, -6.867, 6.867],
"ref" : [-91.464, 102.359, -97.096, -44.269, 37.113],
"pwrref" : [9.065, 5.142, 4.061, 0.867, 0.597],
"iocDevice" : ["QMA1", "QMA2", "QMA5"]
},
"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"],
"standby": [-6.867, 6.867, 9.155, 6.867, 6.867, 9.155, 6.867, -6.867, 6.867, -6.867],
"ref" : [-43.813, 43.177, 157.28, 20.017, 30.544, 157,79, 42.203, -42.467, 52.179, -77.032],
"pwrref" : [0.789, 0.764, 17.341, 0.164, 0.366, 17.482, 0.737, 0.736, 1.096, 2.464],
"iocDevice" : ["AME1", "AME2", "QME10"]
},
"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"],
"standby": [-6.8, 6.8, 6.8, -6.8, 6.8, 6.8, -6.8, -6.8,
6.8, 0],
"ref" : [-34.048, 26.68, 26.68, -34.05, 87.764, 37.424, -47.207, -38.156,
36.977, 87.642],
"pwrref" : [0.504, 0.292, 0.289, 0.498, 5.434, 0.577, 0.912, 0.608,
0.578, 3.712],
"iocDevice" : ["QMA7", "AMA2", "QMA12"]
},
"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"],
"standby" : [-6.867, 6.867, -6.867, 6.867, -6.867, -7.553, 7.553, -7.553,
7.553, 7.553, -7.553, 10.758, 10.758, 23.804],
"ref": [-41.056, 36.548, -30.490, 52.433, -27.636, -37.412, 41.966, -37.296,
51.200, 53.657, -41.966, 109.543, 109.405, 251.492],
"pwrref" : [0.699, 0.545, 0.389, 1.152, 0.323, 0.374, 0.467, 0.378,
0.700, 0.772, 0.464, 7.114, 7.112, 21.727],
"iocDevice" : ["QMB2", "QMB4", "AMF1"]
},
"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"],
"standby": [-6.867, 6.867, 6.867, -6.867, 9.155, 6.867, -6.867, 6.867,
-6.867, 6.867],
"ref" : [-40.85, 26.974, 26.974, -40.851, 45.988, 30.890, -29.542, 33.742,
-45.960, 20.165],
"pwrref" : [0.681, 0.297, 0.295, 0.677, 1.013, 0.401, 0.363, 0.475,
0.887, 0.169],
"iocDevice" : ["QMC2", "AMC1", "QMC7"]
},
"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"],
"standby": [-6.800, 6.800, 6.800, -6.800, 6.800, 6.800, -6.800, 6.800,
-6.800, 6.800],
"ref" : [-36.159, 34.434, 42.277, -43, 135, 61, -62, 37,
-55, 30],
"pwrref" : [0.16, 0.16, 0.28, 0.31, 3.7, 0.6, 0.73, 0.25,
0.59, 0.145],
"iocDevice" : ["QMD2", "AMD1", "QMD9"]
},
"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"],
"standby": [-6.800, 6.800, -6.800],
"ref" : [-40.388, 68.393, -34.805],
"pwrref" : [0.64, 1.8, 0.46],
"iocDevice" : ["QMD10", "QMD11", "QMD12"]
},
"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"]
}
}

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/proscan/images Symbolic link
View File

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

1
facility/proscan/makefile Symbolic link
View File

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

View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

57
facility/proscan/resources.qrc Executable file
View File

@@ -0,0 +1,57 @@
<!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="Hush.jpg">images/Hush.jpg</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/proscan_make.sh Normal file
View File

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

View File

@@ -58,7 +58,22 @@
"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/",
@@ -93,7 +108,7 @@
"Elog":{
"useELOGenv": 0,
"host": "elog-gfa.psi.ch",
"book": "SLS",
"book": "SLS-test2",
"url": "https://elog-gfa.psi.ch/SLS",
"destination": "/afs/psi.ch/intranet/Controls/tmp/bdbase/ePic/"
},

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff