From 2a0c5cf049d12ed7e38f673d9ac381e57c220661 Mon Sep 17 00:00:00 2001 From: reiche Date: Fri, 7 Feb 2025 17:29:59 +0100 Subject: [PATCH] Added functionality to read also the seed laser spectrum --- app/spectralanalysis.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/spectralanalysis.py b/app/spectralanalysis.py index 3b461a6..a10a3eb 100644 --- a/app/spectralanalysis.py +++ b/app/spectralanalysis.py @@ -5,6 +5,7 @@ athos_uncalibrated = 'SATFE10-PEPG046-EVR0:CALCI' athos_calibrated = 'SATFE10-PEPG046:FCUP-INTENSITY-CAL' aramis_uncalibrated = 'SARFE10-PBIG050-EVR0:CALCI' aramis_calibrated = 'SARFE10-PBPG050:HAMP-INTENSITY-CAL' +eehg_spectrometer = 'SSL2-CPCW-SPEC01:SPECTRUM' channel_dict = { 'PSSS': ['SARFE10-PSSS059:SPECTRUM_Y'], 'PMOS Maloja': ['SATOP21-PMOS127-2D:SPECTRUM_Y', athos_uncalibrated, athos_calibrated], @@ -12,8 +13,11 @@ channel_dict = { 'PSSS LB': ['SARFE10-PSSS059-LB:SPECTRUM_Y'], '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], } -names = ['PSSS', 'PMOS Maloja', 'PMOS Furka', 'PSSS LB', 'PSSS incl gasd', 'PSSS LB incl gasd'] +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): @@ -22,7 +26,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) @@ -38,7 +42,7 @@ class SpectralAnalysis: self.bs.get_vars(self.channel) # this starts the stream into the cache except ValueError: print('Cannot find requested channels in BS stream') - self.hasBStream=False + self.hasBStream=False self.pv = PV(self.channel[0].replace('_Y','_X')) def terminate(self):