status
This commit is contained in:
@@ -7,7 +7,7 @@ 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'],
|
||||
'PSSS': ['SARFE10-PSSS059:SPECTRUM_Y', 'SARFE10-PSSS059:SPECTRUM_X'],
|
||||
'PMOS Maloja': ['SATOP21-PMOS127-2D:SPECTRUM_Y', 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'],
|
||||
@@ -62,7 +62,8 @@ class SpectralAnalysis(SpectralAnalysisBase):
|
||||
except ValueError:
|
||||
print('Cannot find requested channels in BS stream')
|
||||
self.hasBStream=False
|
||||
self.connect_x_axis()
|
||||
self.pv = None
|
||||
#self.connect_x_axis()
|
||||
|
||||
def terminate(self):
|
||||
print('Stopping BSStream Thread...')
|
||||
@@ -102,7 +103,8 @@ class SpectralAnalysis2(SpectralAnalysisBase):
|
||||
except ValueError:
|
||||
print('Cannot find requested channel %s in BS stream' % channels[1:])
|
||||
self.hasBStream=False
|
||||
self.connect_x_axis()
|
||||
self.pv = None
|
||||
#self.connect_x_axis()
|
||||
|
||||
def flush(self):
|
||||
for _bs in self.bs1, self.bs2:
|
||||
|
||||
Reference in New Issue
Block a user