diff --git a/app/adaptiveorbit.py b/app/adaptiveorbit.py index 3c2ff7c..eec44dc 100644 --- a/app/adaptiveorbit.py +++ b/app/adaptiveorbit.py @@ -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 diff --git a/app/spectralanalysis.py b/app/spectralanalysis.py index b2e1839..4c84f09 100644 --- a/app/spectralanalysis.py +++ b/app/spectralanalysis.py @@ -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],