slic/sfbd
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status

Browse Source
This commit is contained in:
dijkstal_p
2026-09-23 23:49:07 +02:00
parent 6df4ebeaa6
commit 0f38e4e407
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/adaptiveorbit.py
+3 -2
View File
@@ -84,6 +84,7 @@ class AdaptiveOrbit:
print("Initializing BSstream")
bs = BSCache(1000,receive_timeout=1000) # 1000 second time out, capazity for 1000 second.
print("Getting Channels")
print(channels)
bs.get_vars(channels)
print("Done")
return bs
@@ -95,7 +96,7 @@ class AdaptiveOrbit:
con = [pv.wait_for_connection(timeout=0.2) for pv in pvs]
for i, val in enumerate(con):
if val is False:
name = pv[i].pvname
name = pvs[i].pvname
print("ERROR: PV-Channel %s is not available" % name)
return pvs
@@ -115,7 +116,7 @@ class AdaptiveOrbit:
con = [pv.wait_for_connection(timeout=0.2) for pv in pvs]
for i, val in enumerate(con):
if val is False:
name = pv[i].pvname
name = pvs[i].pvname
raise ValueError(f"PV-Channel {name} is not available")
return pvs
app/spectralanalysis.py
+2 -2
View File
@@ -10,9 +10,9 @@ channel_dict = {
'PSSS': ['SARFE10-PSSS059:SPECTRUM_Y', 'SARFE10-PSSS059:SPECTRUM_X'],
'PMOS Maloja': ['SATOP21-PMOS127-2D:SPECTRUM_Y', 'SATOP21-PMOS127-2D:SPECTRUM_X', athos_uncalibrated, athos_calibrated],
'PMOS Furka': ['SATOP31-PMOS132-2D:SPECTRUM_Y', 'SATOP31-PMOS132-2D:SPECTRUM_X', athos_uncalibrated, athos_calibrated],
'PSSS LB': ['SARFE10-PSSS059-LB:SPECTRUM_Y'],
'PSSS LB': ['SARFE10-PSSS059-LB:SPECTRUM_Y', 'SARFE10-PSSS059-LB:SPECTRUM_X'],
'PSSS incl gasd': ['SARFE10-PSSS059:SPECTRUM_Y', 'SARFE10-PSSS059:SPECTRUM_X', aramis_uncalibrated, aramis_calibrated],
'PSSS LB incl gasd': ['SARFE10-PSSS059-LB:SPECTRUM_Y', aramis_uncalibrated, aramis_calibrated],
'PSSS LB incl gasd': ['SARFE10-PSSS059-LB:SPECTRUM_Y', 'SARFE10-PSSS059-LB:SPECTRUM_X', aramis_uncalibrated, aramis_calibrated],
'PMOS Maloja EEHG': ['SATOP21-PMOS127-2D:SPECTRUM_Y', eehg_spectrometer],
'PMOS Furka EEHG': ['SATOP31-PMOS132-2D:SPECTRUM_Y', eehg_spectrometer],
'Maloja end station': ['SATES24-CAMS161-M1.projection_signal', athos_uncalibrated, athos_calibrated],