diff --git a/config/spectrum_config.yaml b/config/spectrum_config.yaml index 433f84e7eafc7a3a45b36d8f5da8993885f2dcae..a5971a8812dd67775fd12df8187818f1e20f4a6a 100644 --- a/config/spectrum_config.yaml +++ b/config/spectrum_config.yaml @@ -33,7 +33,10 @@ redP_to_rb: trigger_channel: *trigger_channel trigger_level: *trigger_level trigger_mode: 'norm' - + decimation_index: 0 + invert_channel1: 0 + invert_channel2: 0 + # Dict for simul_source.py simul_source: sample_time_ns: *sample_time_ns diff --git a/modules/__pycache__/filters.cpython-310.pyc b/modules/__pycache__/filters.cpython-310.pyc deleted file mode 100644 index 9aef4eb7f1388cf9ab8704995f557ad269652889..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/filters.cpython-310.pyc and /dev/null differ diff --git a/modules/__pycache__/filters.cpython-311.pyc b/modules/__pycache__/filters.cpython-311.pyc deleted file mode 100644 index cb6d48f582732eccf3eeb668b632970fc3d21180..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/filters.cpython-311.pyc and /dev/null differ diff --git a/modules/__pycache__/plot_histograms.cpython-310.pyc b/modules/__pycache__/plot_histograms.cpython-310.pyc deleted file mode 100644 index cf4bec83dff02352931ad37bd2a6f2832be03571..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/plot_histograms.cpython-310.pyc and /dev/null differ diff --git a/modules/__pycache__/plot_histograms.cpython-311.pyc b/modules/__pycache__/plot_histograms.cpython-311.pyc deleted file mode 100644 index 888023e5d33dc72af599714231aa19140b3b82eb..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/plot_histograms.cpython-311.pyc and /dev/null differ diff --git a/modules/__pycache__/plot_waveform.cpython-310.pyc b/modules/__pycache__/plot_waveform.cpython-310.pyc deleted file mode 100644 index e4803edcf405c5ab825674ee3fc3f085ebe0cf1e..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/plot_waveform.cpython-310.pyc and /dev/null differ diff --git a/modules/__pycache__/plot_waveform.cpython-311.pyc b/modules/__pycache__/plot_waveform.cpython-311.pyc deleted file mode 100644 index 13b544f98c384cbdc54a7eff10c19b584be60ad5..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/plot_waveform.cpython-311.pyc and /dev/null differ diff --git a/modules/__pycache__/save_files.cpython-310.pyc b/modules/__pycache__/save_files.cpython-310.pyc deleted file mode 100644 index d2288e065bf1d008f36656f6533fcbd3773e07f4..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/save_files.cpython-310.pyc and /dev/null differ diff --git a/modules/__pycache__/save_files.cpython-311.pyc b/modules/__pycache__/save_files.cpython-311.pyc deleted file mode 100644 index 8438319ec401b1a914fec694630618c82f38c344..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/save_files.cpython-311.pyc and /dev/null differ diff --git a/modules/__pycache__/spectrum_filter.cpython-310.pyc b/modules/__pycache__/spectrum_filter.cpython-310.pyc deleted file mode 100644 index 2654ba2c30ba1ff2f15a2e882c28db1786368ca7..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/spectrum_filter.cpython-310.pyc and /dev/null differ diff --git a/modules/__pycache__/spectrum_filter.cpython-311.pyc b/modules/__pycache__/spectrum_filter.cpython-311.pyc deleted file mode 100644 index cb8923dcc4ebbf21c4b01e74dd7460d7a7ed07df..0000000000000000000000000000000000000000 Binary files a/modules/__pycache__/spectrum_filter.cpython-311.pyc and /dev/null differ diff --git a/redPoscdaq.py b/redPoscdaq.py index a25b4ca1379d2fb523bf9f821f135332445ac762..64407bfcb77ced5dfcec37c308d12777a8d1dd16 100755 --- a/redPoscdaq.py +++ b/redPoscdaq.py @@ -169,6 +169,10 @@ class rpControl(QMainWindow, Ui_MCPHA): self.osc_daq.autoButton.setChecked(self.trigger_mode) self.osc_daq.ch2Button.setChecked(self.trigger_source) self.osc_daq.fallingButton.setChecked(self.trigger_slope) + self.rateValue.setCurrentIndex(self.decimation_index) + self.neg1Check.setChecked(self.invert1) + self.neg2Check.setChecked(self.invert2) + # automatically connect if self.ip_address is not None: self.addrValue.setText(self.ip_address) @@ -214,6 +218,9 @@ class rpControl(QMainWindow, Ui_MCPHA): self.trigger_mode = 0 if args.trigger_mode == 'norm' else 1 self.trigger_slope = 0 if args.trigger_slope == 'rising' else 1 # other parameters + self.invert1 = 0 + self.invert2 = 0 + self.decimation_index = 1 self.filename = args.file def parse_confd(self): @@ -231,6 +238,10 @@ class rpControl(QMainWindow, Ui_MCPHA): self.trigger_level = 500 if "trigger_level" not in self.confd else self.confd["trigger_level"] self.trigger_slope = 0 if "trigger_direction" not in self.confd else\ 0 if self.confd["trigger_direction"] == "rising" else 1 + self.decimation_index = 1 if "decimation_index" not in self.confd else \ + self.confd["decimation_index"] + self.invert1 = 0 if "invert_channel1" in self.confd else self.confd["invert_channel1"] + self.invert2 = 0 if "invert_channel2" in self.confd else self.confd["invert_channel2"] self.readInterval = 1000 # used to control update of oscilloscope display # other parameters self.filename = '' # file name for data export