Merge branch 'main' of github.com:praiteri/pycek_public

marimo/bomb_calorimetry.py

@@ -47,7 +47,7 @@ def _(lab, mo):
     student_ID = mo.ui.text(value="", label="Student ID:", on_change=set_ID)
 
     def set_fname(value):
-        lab._set_filename(value)
+        lab.output_file = value
 
     exp_ID = mo.ui.text(value="Automatic", label="Output file:", on_change=set_fname)
 
@@ -92,7 +92,9 @@ def _(cek, lab, mo, reset_button, run_button, sample_selector):
         data = lab.create_data_for_lab()
         file_content = lab.write_data_to_string()
 
-        fname = lab.filename_gen.random
+        fname = lab.output_file
+        if not fname:
+            fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k, v in lab.metadata.items():
             message += f"####{k} = {v}\n"

marimo/crystal_violet.py

@@ -52,7 +52,7 @@ def _(lab, mo):
     student_ID = mo.ui.text(value="", label="Student ID:", on_change=set_ID)
 
     def set_fname(value):
-        lab._set_filename(value)
+        lab.output_file = value
 
     exp_ID = mo.ui.text(value="Automatic", label="Output file:", on_change=set_fname)
 
@@ -135,7 +135,9 @@ def _(
         data = lab.create_data_for_lab()
         file_content = lab.write_data_to_string()
 
-        fname = lab.filename_gen.random
+        fname = lab.output_file
+        if not fname:
+            fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k, v in lab.metadata.items():
             message += f"####{k} = {v}\n"

marimo/surface_adsorption.py

@@ -93,7 +93,9 @@ def _(cek, lab, mo, reset_button, run_button, student_ID, temperature):
         data = lab.create_data_for_lab()
         file_content = lab.write_data_to_string()
 
-        fname = lab.filename_gen.random
+        fname = lab.output_file
+        if not fname:
+            fname = lab.filename_gen.random
         message = f"### Running Experiment\n"
         for k, v in lab.metadata.items():
             message += f"####{k} = {v}\n"

src/pycek_public/crystal_violet.py

@@ -15,7 +15,7 @@ class crystal_violet(cek.cek_labs):
 
         self.expt_time = 1000
         self.number_of_values = 501
-        self.noise_level = 0.1
+        self.noise_level = 0.05
         self.precision = 6
         self.background = 0.01