hipa_apps4ops/tina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added peak search parameters to expert panel

Browse Source
This commit is contained in:
chrin
2025-01-07 12:01:05 +01:00
parent 28dcba8651
commit 2f2af40855
7 changed files with 125 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -15,5 +15,5 @@ help/*.*~
help/*.*-*
help/*.*+*
*.html

78
src/analysis.py
View File

@@ -75,7 +75,7 @@ class AnalysisProcedure(QObject):
self.ring_cyclotron = self.parent.ring_cyclotron
# Declare input parameters
self.input_parameters = self.parent.input_parameters
self.input_data = None
self.debug = False
self.log_level = logging.INFO
@@ -93,6 +93,9 @@ class AnalysisProcedure(QObject):
self.t_interval = math.ceil(self.pulse_stepsize/self.t_stepsize)
self.correlation_peak_diff = 0.0
self.signal_min_peak_height = 50
self.signal_min_peak_distance = 10
self.correlation_min_peak_diff = 0.01
self.dt_cable = 44 # ns
self.dn_pickup = -1
@@ -125,12 +128,18 @@ class AnalysisProcedure(QObject):
#########INITIALIZE THE INPUTS FOM THE GUI#######################
def initialize_input_parameters(self, input_data: dict):
def initialize_input_parameters(self, input_data: dict, reanalysis=False):
self.input_data = input_data
self.all_data['Input data'] = self.input_data
print(self.input_data)
print(f'init input parameters {self.input_data}')
if reanalysis:
self.loglevel = self.input_parameters['loggingLevel']
else:
self.loglevel = self.input_data['loggingLevel']
self.logger.setLevel(self.logging.getLevelName(self.loglevel))
if 'debug' in self.input_data.keys():
self.debug = self.input_data['debug']
@@ -139,7 +148,6 @@ class AnalysisProcedure(QObject):
self.logger.debug(f'INPUT DATA to LOG:{self.input_data}')
self.simulation = bool(self.input_data['simulation'])
self.rf_freq = float(self.input_data['freqrf'])
# 2.5 MHz if oscilloscpe
@@ -166,9 +174,6 @@ class AnalysisProcedure(QObject):
self.duty_cycle = float(
self.input_data[self.accelerator]['dutycycle']) # * 0.01
self.loglevel = self.input_data['loggingLevel']
self.logger.setLevel(self.logging.getLevelName(self.loglevel))
self.logger.info('INPUT PARAMETERS')
self.logger.info(f'Accelerator: {self.accelerator}')
@@ -186,6 +191,41 @@ class AnalysisProcedure(QObject):
except ValueError as ex:
self.logger.error(f'ValueError {ex}')
try:
self.correlation_min_peak_diff = float(
self.input_data[self.accelerator]['correlationPeakDifference'])
self.signal_min_peak_height = round(
self.input_data[self.accelerator]['peakHeight'])
self.signal_min_peak_distance = round(
self.input_data[self.accelerator]['peakDistance'])
except KeyError as ex:
self.logger.error(f'KeyError {ex}')
except ValueError as ex:
self.logger.error(f'ValueError {ex}')
#Overide peak search parameters with those given in gui
if reanalysis:
self.correlation_min_peak_diff = float(self.input_parameters[
self.accelerator]['correlationPeakDifference'])
self.signal_min_peak_height = int(
self.input_parameters[self.accelerator]['peakHeight'])
self.signal_min_peak_distance = int(
self.input_parameters[self.accelerator]['peakDistance'])
print(f'self.input_parameters={self.input_parameters}')
print((f'Reanalysis: self.correlation_min_peak_diff= ' + \
'{self.correlation_min_peak_diff}'))
self.logger.info(f'Corr Min Peak Diff {self.correlation_min_peak_diff}')
self.logger.info(f'Min Peak Height {self.signal_min_peak_height}')
self.logger.info(f'Min Peak Distance {self.signal_min_peak_distance}')
def measure_and_analyze(self, input_data=None):
'''This method is initiated by the START button in Procedure panel
'''
@@ -197,6 +237,11 @@ class AnalysisProcedure(QObject):
# Read the input parameters from the GUI
self.initialize_input_parameters(input_data)
self.logger.info(
f'Corr Min Peak Diff {self.correlation_min_peak_diff}')
self.logger.info(f'Min Peak Height {self.signal_min_peak_height}')
self.logger.info(
f'Min Peak Distance {self.signal_min_peak_distance}')
# Step 1 - Collect ambient data relate to the machine
self.all_data['Ambient data'] = self.collect_ambient_data()
@@ -232,11 +277,12 @@ class AnalysisProcedure(QObject):
'''Reanalysis
'''
print('Reanalyze', flush=True)
print(all_data)
print(all_data, flush=True)
input_data = all_data['Input_data']
# Read the input parameters
self.initialize_input_parameters(input_data)
self.initialize_input_parameters(input_data=input_data, reanalysis=True)
ambient_data = all_data['Ambient_data']
self.raw_data = all_data['Raw_data']
@@ -302,8 +348,6 @@ class AnalysisProcedure(QObject):
self.trigger_progressbar.emit(PROGRESS_THREAD_ERROR)
return {}
pv_list = []
for key, value in self.settings.data['PV'][self.accelerator].items():
@@ -329,8 +373,6 @@ class AnalysisProcedure(QObject):
self.check_status_list(_pymodule, 'getScalarList',
pv_list, status_list, utils.line_no())
# Retrieve
pv_entry_current = self.settings.data['PV'][self.accelerator]['IEntry']
@@ -653,6 +695,9 @@ class AnalysisProcedure(QObject):
print('rf freq', self.rf_freq, flush=True)
print('harmonic', self.harmonic_no, flush=True)
print('dN pickup', self.dn_pickup, flush=True)
print(f'Correlation Peak Diff {self.correlation_peak_diff}')
print(f'Min Peak Height {self.signal_min_peak_height}')
print(f'Min Peak Distance {self.signal_min_peak_distance}')
self.n_turns = (
((self.delay-self.dt_cable*10**(-9))*self.rf_freq*10**6)
@@ -674,7 +719,10 @@ class AnalysisProcedure(QObject):
'lag': self.lag_full,
'delay': self.delay,
'nturns': self.n_turns,
'peak_diff': self.correlation_peak_diff
'correlation_peak_diff': self.correlation_peak_diff,
'correlation_min_peak_diff': self.correlation_min_peak_diff,
'min_peak_height': self.signal_min_peak_height,
'min_peak_distance': self.signal_min_peak_distance
}
return proc_data
@@ -683,7 +731,7 @@ class AnalysisProcedure(QObject):
''' Figure construction with matplotlib
'''
is_suspect = True if self.correlation_peak_diff < \
self.parent.correlation_peak_diff_min_value else False
self.correlation_min_peak_diff else False
if is_suspect:
fontweight_main='normal'

30
src/gui.py
View File

@@ -40,13 +40,13 @@ class AppGui(QWidget):
self.input_labels = self.parent.input_labels
self.expert_parameters = self.parent.expert_parameters
self.gui_frame.expert_parameters_group.setFixedWidth(310)
self.gui_frame.expert_parameters_group.setFixedHeight(130)
self.gui_frame.expert_parameters_group.setFixedHeight(340)
self.gui_frame.operator_parameters_group.setFixedWidth(260)
self.gui_frame.operator_parameters_group.setFixedHeight(380)
self.gui_frame.measurement_tab_wgt.setFixedWidth(496)
self.gui_frame.measurement_tab_wgt.setFixedHeight(460)
self.gui_frame.operator_wgt.setFixedHeight(640)
self.gui_frame.expert_wgt.setFixedHeight(240)
#self.gui_frame.expert_wgt.setFixedHeight(240)
#DAQ
self.daq_wgt = self.daq_group_qtabwidget(widget_type='QStackedWidget')
@@ -65,14 +65,38 @@ class AppGui(QWidget):
self.current_wgt.setCurrentIndex(self.parent.default_idx)
self.current_wgt.currentChanged.emit(self.parent.default_idx)
choice_wgt = self.gui_frame.line_sender_dict['signalPeakSearch']
choice_wgt.name = "Expert"
self.gui_frame.line_sender_dict['signalSearch'] = choice_wgt
choice_wgt = self.gui_frame.line_sender_dict['accelerator']
choice_wgt.name = "Operator"
self.gui_frame.line_sender_dict['accelerator'] = choice_wgt
#On change Injector/Cyclotron
self.gui_frame.line_sender_dict[
'accelerator'].currentChanged.connect(self.cb_accelerator)
self.gui_frame.line_sender_dict[
'signalPeakSearch'].currentChanged.connect(self.cb_accelerator)
def cb_accelerator(self, idx):
self.daq_wgt.setCurrentIndex(idx)
self.current_wgt.setCurrentIndex(idx)
_sender = self.sender().name
#print(_sender, flush=True)
if "Expert" in _sender:
self.gui_frame.line_sender_dict[
'signalPeakSearch'].blockSignals(True)
self.gui_frame.line_sender_dict['accelerator'].setCurrentIndex(idx)
self.gui_frame.line_sender_dict[
'signalPeakSearch'].blockSignals(False)
else:
self.gui_frame.line_sender_dict[
'accelerator'].blockSignals(True)
self.gui_frame.line_sender_dict[
'signalPeakSearch'].setCurrentIndex(idx)
self.gui_frame.line_sender_dict[
'accelerator'].blockSignals(False)
def daq_group_qtabwidget(self, widget_type='QStackedWidget'):
accel_wgt_dict = {}

19
tina.json
View File

@@ -49,9 +49,21 @@
"deltaNpickup" : {"data":{ "widget": "QLineEdit", "text" : "dN Pickup:", "value": -1 }}
}
},
"QTabSignalPeakSearch":{
"Injector": {
"peakHeight": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 50 }},
"peakDistance": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak distance: ", "value" : 10 }},
"correlationPeakDifference": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min d(corr):", "value" : 0.01}}
},
"Cyclotron": {
"peakHeight": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 50 }},
"peakDistance": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak distance: ", "value" : 10 }},
"correlationPeakDifference": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min d(corr):", "value" : 0.01 }}
}
},
"Parameters":{
"facility": {"flag": 0, "data" : {"widget": "QComboBox", "text" : "Facility:",
"link": ["HIPA"],"layout" : "Horizontal"}},
"freqrf" : {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"RF Freq (10^6/s):", "value" : 50.6328 }},
"freqsampling" : {"flag": 1, "data":{ "widget": "QLineRead", "text" :"Sampling Freq (GHz):", "value" : 3.0 }},
@@ -63,6 +75,9 @@
},
"Expert":{
"signalPeakSearch" : {"flag" : 1, "data":{ "widget": "QTabWidget", "text" : "Accelerator: ",
"link" : "QTabSignalPeakSearch", "value" : 1,
"color" : ["#008b8b", "#0047ab" ]}},
"debug": {"flag" : 1, "data":{ "widget": "None", "text" : "Debug", "value" : 0}},
"simulation": {"flag" : 1, "data":{ "widget": "None", "text" : "Oscilloscope", "value" : 0}}
},

8
tina.py
View File

@@ -63,7 +63,6 @@ class StartMain(BaseWindow):
self.injector_2
# self.from_hdf = False in base class
self.message = ''
self.correlation_peak_diff_min_value = 0.010
self.gui = AppGui(self)
@@ -74,7 +73,8 @@ class StartMain(BaseWindow):
self.no_turns = self.all_data['Processed data']['nturns']
lag_full = self.all_data['Processed data']['lag']
delay = self.all_data['Processed data']['delay']
self.peak_diff = self.all_data['Processed data']['peak_diff']
self.correlation_peak_diff = self.all_data['Processed data']['correlation_peak_diff']
self.correlation_min_peak_diff = self.all_data['Processed data']['correlation_min_peak_diff']
except KeyError:
self.message = ''
self.message_elog = ''
@@ -324,11 +324,11 @@ class StartMain(BaseWindow):
QApplication.processEvents()
return False
if self.peak_diff < self.correlation_peak_diff_min_value:
if self.correlation_peak_diff < self.correlation_min_peak_diff:
mess = (f'Measurement is suspect as difference in top two peak \n' +
'values of ' +
f'{self.peak_diff:0.3f} is less than accepted minimum ' +
f'of {self.correlation_peak_diff_min_value:0.3f}. \n' +
f'of {self.correlation_min_peak_diff:0.3f}. \n' +
f'Analysis result is not saved to EPICS!')
QMessageBox.information(self, 'EPICS', mess, QMessageBox.Ok)

4
tina.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash
cd /hipa/bd/applications/tina/devl
cd /hipa/bd/applications/tina/0.0.2
# For use if script is sourced rather than executed
appNameDefault="tina.sh"
@@ -24,7 +24,7 @@ _EPICS_BASE=base-7.0.8
# Select Python Version here. Currently one of 3.5, 3.7, 3.8 and 3.10
PYTHON_VERSION=3.10
#cafe-1.20.0-gcc-7.5.0
PYTHON_PATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0-0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0
PYTHON_PATH=.:/opt/gfa/cafe/python/pycafe/cafe-1.21.0/lib/${_EPICS_HOST_ARCH}:/hipa/bd/applications/deps/apps4ops/v1.12.0
if [ "$1" ]; then

2
tina_office.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash
cd /hipa/bd/applications/tina/devl
cd /hipa/bd/applications/tina/0.0.2
# For use if script is sourced rather than executed
appNameDefault="tina.sh"