From 4a9c756b62ef131215af1e5874a39fcce7e1e393 Mon Sep 17 00:00:00 2001
From: Dougal Dobie <ddobie@swin.edu.au>
Date: Tue, 28 Jan 2025 12:23:47 +1100
Subject: [PATCH] First pass update of webform options

---
 vast_pipeline/config_template.yaml.j2 | 5 ++---
 vast_pipeline/forms.py                | 2 +-
 vast_pipeline/views.py                | 6 +++---
 webinterface/settings.py              | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/vast_pipeline/config_template.yaml.j2 b/vast_pipeline/config_template.yaml.j2
index eb6eae09..a42f95cc 100644
--- a/vast_pipeline/config_template.yaml.j2
+++ b/vast_pipeline/config_template.yaml.j2
@@ -135,9 +135,8 @@ measurements:
   # 0.05 = 5% error, 0 = no minimum error.
   flux_fractional_error: {{ flux_perc_error }}
 
-  # Create 'measurements.parquet' and 'measurement_pairs.parquet' files at the end of
-  # a successful run.
-  write_parquet_files: {{ create_measurements_parquet_files }}
+  # Create the 'measurements.parquet' file at the end of a successful run.
+  write_measurements_parquet: {{ create_measurements_parquet }}
 
   # Replace the selavy errors with Condon (1997) errors.
   # Only applied to NEW images that are not already present in the database.
diff --git a/vast_pipeline/forms.py b/vast_pipeline/forms.py
index da57f5a0..f50f0786 100644
--- a/vast_pipeline/forms.py
+++ b/vast_pipeline/forms.py
@@ -37,7 +37,7 @@ class PipelineRunForm(forms.Form):
     max_partition_mb = forms.IntegerField()
     pair_metrics = forms.BooleanField(required=False)
     use_condon_errors = forms.BooleanField(required=False)
-    create_measurements_parquet_files = forms.BooleanField(required=False)
+    create_measurements_parquet = forms.BooleanField(required=False)
     suppress_astropy_warnings = forms.BooleanField(required=False)
 
 
diff --git a/vast_pipeline/views.py b/vast_pipeline/views.py
index 61d6943c..e98f133b 100644
--- a/vast_pipeline/views.py
+++ b/vast_pipeline/views.py
@@ -559,7 +559,7 @@ def genparquet(
         if p_run.status != "END":
             msg = (
                 f'{p_run.name} has not completed successfully.'
-                ' The parquet files can only be generated after the run is'
+                ' The measurements parquet can only be generated after the run is'
                 ' successful.'
             )
             messages.error(
@@ -580,7 +580,7 @@ def genparquet(
             )
 
             msg = mark_safe(
-                f'Generate the parquet files for <b>{p_run.name}</b> successfully requested!<br><br>'
+                f'Generate the measurements parquet for <b>{p_run.name}</b> successfully requested!<br><br>'
                 ' Refresh the page and check the generate parquet log output for the status of the process.'
             )
             messages.success(
@@ -645,7 +645,7 @@ def RunDetail(request, id):
     genparquet_log_files = [os.path.basename(i) for i in genparquet_log_files[::-1]]
 
     # Detect whether parquet files are present
-    p_run['parquet_files'] = os.path.isfile(
+    p_run['measurements_parquet'] = os.path.isfile(
         os.path.join(p_run['path'], 'measurements.parquet')
     )
 
diff --git a/webinterface/settings.py b/webinterface/settings.py
index dc046c19..4fea0856 100644
--- a/webinterface/settings.py
+++ b/webinterface/settings.py
@@ -342,7 +342,7 @@
     'flux_perc_error': 0,
     'use_condon_errors': True,
     'selavy_local_rms_zero_fill_value': 0.2,
-    'create_measurements_parquet_files': False,
+    'create_measurements_parquet': False,
     'suppress_astropy_warnings': True,
     'pair_metrics': True,
     'source_aggregate_pair_metrics_min_abs_vs': 4.3,