From 36e3dcd770ffa5c0db2e67ea8841c5e79f523446 Mon Sep 17 00:00:00 2001 From: SarthakJariwala Date: Mon, 6 May 2019 15:03:15 -0700 Subject: [PATCH] now adding oo params to saved data -- feature added --- .../OceanOptics_acquire/OceanOptics_acquire_plot.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PythonGUI_apps/OceanOptics_acquire/OceanOptics_acquire_plot.py b/PythonGUI_apps/OceanOptics_acquire/OceanOptics_acquire_plot.py index 4bff33c..8de85c0 100644 --- a/PythonGUI_apps/OceanOptics_acquire/OceanOptics_acquire_plot.py +++ b/PythonGUI_apps/OceanOptics_acquire/OceanOptics_acquire_plot.py @@ -205,11 +205,14 @@ def x_y_scan(self): self.pi_device.MVR(axes=self.axes, values=[-x_scan_size, y_step]) self.ui.status_textBrowser.append("Scan Complete!\nSaving Data...") - # TODO add ocean optics acquisition params to the save dict + save_dict = {"Wavelengths": self.spec.wavelengths(), "Intensities": data_array, "Scan Parameters":{"X scan start (um)": x_start, "Y scan start (um)": y_start, "X scan size (um)": x_scan_size, "Y scan size (um)": y_scan_size, - "X step size (um)": x_step, "Y step size (um)": y_step} + "X step size (um)": x_step, "Y step size (um)": y_step}, + "OceanOptics Parameters":{"Integration Time (ms)": self.ui.intg_time_spinBox.value(), + "Scans Averages": self.ui.scan_to_avg_spinBox.value(), + "Correct Dark Counts": self.ui.correct_dark_counts_checkBox.isChecked()} } pickle.dump(save_dict, open(self.save_folder+"/"+self.ui.lineEdit.text()+"_raw_PL_spectra_data.pkl", "wb"))