Skip to content

Commit

Permalink
First pass update of webform options
Browse files Browse the repository at this point in the history
  • Loading branch information
ddobie committed Jan 28, 2025
1 parent 3d08182 commit 4a9c756
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
5 changes: 2 additions & 3 deletions vast_pipeline/config_template.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion vast_pipeline/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 3 additions & 3 deletions vast_pipeline/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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')
)

Expand Down
2 changes: 1 addition & 1 deletion webinterface/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 4a9c756

Please sign in to comment.