diff --git a/app/spectralanalysis.py b/app/spectralanalysis.py index a10a3eb..2165eef 100644 --- a/app/spectralanalysis.py +++ b/app/spectralanalysis.py @@ -14,10 +14,9 @@ channel_dict = { 'PSSS incl gasd': ['SARFE10-PSSS059:SPECTRUM_Y', aramis_uncalibrated, aramis_calibrated], 'PSSS LB incl gasd': ['SARFE10-PSSS059-LB:SPECTRUM_Y', aramis_uncalibrated, aramis_calibrated], 'PMOS Maloja EEHG': ['SATOP21-PMOS127-2D:SPECTRUM_Y', eehg_spectrometer], -# 'PMOS Maloja EEHG': ['SARFE10-PSSS059:SPECTRUM_Y', eehg_spectrometer], - 'PMOS Furka EEHG': ['SATOP21-PMOS127-2D:SPECTRUM_Y', eehg_spectrometer], + 'PMOS Furka EEHG': ['SATOP31-PMOS132-2D:SPECTRUM_Y', eehg_spectrometer], } -names = ['PSSS', 'PMOS Maloja', 'PMOS Furka', 'PSSS LB', 'PSSS incl gasd', 'PSSS LB incl gasd', 'PMOS Maloja EEHG','PMOS Furka EEHG' ] +names = ['PSSS', 'PMOS Maloja', 'PMOS Furka', 'PSSS LB', 'PSSS incl gasd', 'PSSS LB incl gasd', 'PMOS Maloja EEHG','PMOS Furka EEHG'] class SpectralAnalysis: def __init__(self): @@ -26,7 +25,7 @@ class SpectralAnalysis: self.channel = None self.channels = [channel_dict[x] for x in names] self.hasBStream=False - + def connect_name(self, name): index = names.index(name) self.connect(index)