From 73b08bc0eeca56203d9699c8a6e8113bc5d1073f Mon Sep 17 00:00:00 2001 From: Bryan Hilbert Date: Fri, 30 Aug 2024 11:17:19 -0400 Subject: [PATCH 1/3] Fix bad parens in arrayfields of charfields --- .../apps/jwql/monitor_models/dark_current.py | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/jwql/website/apps/jwql/monitor_models/dark_current.py b/jwql/website/apps/jwql/monitor_models/dark_current.py index 0783d66d8..bb9620761 100644 --- a/jwql/website/apps/jwql/monitor_models/dark_current.py +++ b/jwql/website/apps/jwql/monitor_models/dark_current.py @@ -48,8 +48,8 @@ class FGSDarkDarkCurrent(models.Model): readpattern = models.CharField(max_length=MAX_LEN_READPATTERN, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -80,8 +80,8 @@ class FGSDarkPixelStats(models.Model): x_coord = ArrayField(models.IntegerField()) y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -117,8 +117,8 @@ class MIRIDarkDarkCurrent(models.Model): readpattern = models.CharField(max_length=MAX_LEN_READPATTERN, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -149,8 +149,8 @@ class MIRIDarkPixelStats(models.Model): x_coord = ArrayField(models.IntegerField()) y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -186,8 +186,8 @@ class NIRCamDarkDarkCurrent(models.Model): readpattern = models.CharField(max_length=MAX_LEN_READPATTERN, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -218,8 +218,8 @@ class NIRCamDarkPixelStats(models.Model): x_coord = ArrayField(models.IntegerField()) y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -255,8 +255,8 @@ class NIRISSDarkDarkCurrent(models.Model): readpattern = models.CharField(max_length=MAX_LEN_READPATTERN, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -287,8 +287,8 @@ class NIRISSDarkPixelStats(models.Model): x_coord = ArrayField(models.IntegerField()) y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -324,8 +324,8 @@ class NIRSpecDarkDarkCurrent(models.Model): readpattern = models.CharField(max_length=MAX_LEN_READPATTERN, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -356,8 +356,8 @@ class NIRSpecDarkPixelStats(models.Model): x_coord = ArrayField(models.IntegerField()) y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) - source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names", - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True)) + source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) From 4d508fef09f2769779b4191dbfd77b574da6d9f4 Mon Sep 17 00:00:00 2001 From: Bryan Hilbert Date: Fri, 30 Aug 2024 11:19:23 -0400 Subject: [PATCH 2/3] Add new migration file --- ...r_fgsdarkdarkcurrent_amplifier_and_more.py | 744 ++++++++++++++++++ 1 file changed, 744 insertions(+) create mode 100644 jwql/website/apps/jwql/migrations/0026_alter_fgsdarkdarkcurrent_amplifier_and_more.py diff --git a/jwql/website/apps/jwql/migrations/0026_alter_fgsdarkdarkcurrent_amplifier_and_more.py b/jwql/website/apps/jwql/migrations/0026_alter_fgsdarkdarkcurrent_amplifier_and_more.py new file mode 100644 index 000000000..25d6b921b --- /dev/null +++ b/jwql/website/apps/jwql/migrations/0026_alter_fgsdarkdarkcurrent_amplifier_and_more.py @@ -0,0 +1,744 @@ +# Generated by Django 5.0.7 on 2024-08-30 15:18 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('jwql', '0025_rootfileinfo_comment_rootfileinfo_exp_comment'), + ] + + operations = [ + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='amplifier', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_amplitude1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_amplitude2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_peak1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_peak2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_width1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='double_gauss_width2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='gauss_amplitude', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='gauss_peak', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='gauss_width', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='hist_amplitudes', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='hist_dark_values', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='mean', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='fgsdarkdarkcurrent', + name='stdev', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='fgsdarkpixelstats', + name='baseline_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='fgsdarkpixelstats', + name='detector', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkpixelstats', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='fgsdarkpixelstats', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='fgsdarkpixelstats', + name='type', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkqueryhistory', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='fgsdarkqueryhistory', + name='files_found', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='fgsdarkqueryhistory', + name='instrument', + field=models.CharField(blank=True, default='empty', max_length=7, null=True), + ), + migrations.AlterField( + model_name='fgsdarkqueryhistory', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='amplifier', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_amplitude1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_amplitude2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_peak1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_peak2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_width1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='double_gauss_width2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='gauss_amplitude', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='gauss_peak', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='gauss_width', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='hist_amplitudes', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='hist_dark_values', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='mean', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='miridarkdarkcurrent', + name='stdev', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='miridarkpixelstats', + name='baseline_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='miridarkpixelstats', + name='detector', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkpixelstats', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='miridarkpixelstats', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='miridarkpixelstats', + name='type', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkqueryhistory', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='miridarkqueryhistory', + name='files_found', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='miridarkqueryhistory', + name='instrument', + field=models.CharField(blank=True, default='empty', max_length=7, null=True), + ), + migrations.AlterField( + model_name='miridarkqueryhistory', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='amplifier', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_amplitude1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_amplitude2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_peak1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_peak2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_width1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='double_gauss_width2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='gauss_amplitude', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='gauss_peak', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='gauss_width', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='hist_amplitudes', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='hist_dark_values', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='mean', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nircamdarkdarkcurrent', + name='stdev', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nircamdarkpixelstats', + name='baseline_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nircamdarkpixelstats', + name='detector', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkpixelstats', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nircamdarkpixelstats', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nircamdarkpixelstats', + name='type', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkqueryhistory', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nircamdarkqueryhistory', + name='files_found', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='nircamdarkqueryhistory', + name='instrument', + field=models.CharField(blank=True, default='empty', max_length=7, null=True), + ), + migrations.AlterField( + model_name='nircamdarkqueryhistory', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='amplifier', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_amplitude1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_amplitude2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_peak1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_peak2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_width1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='double_gauss_width2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='gauss_amplitude', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='gauss_peak', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='gauss_width', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='hist_amplitudes', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='hist_dark_values', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='mean', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nirissdarkdarkcurrent', + name='stdev', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirissdarkpixelstats', + name='baseline_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirissdarkpixelstats', + name='detector', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkpixelstats', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirissdarkpixelstats', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nirissdarkpixelstats', + name='type', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkqueryhistory', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirissdarkqueryhistory', + name='files_found', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='nirissdarkqueryhistory', + name='instrument', + field=models.CharField(blank=True, default='empty', max_length=7, null=True), + ), + migrations.AlterField( + model_name='nirissdarkqueryhistory', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='amplifier', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_amplitude1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_amplitude2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_peak1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_peak2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_width1', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='double_gauss_width2', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='gauss_amplitude', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='gauss_chisq', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='gauss_peak', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='gauss_width', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='hist_amplitudes', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='hist_dark_values', + field=django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(default=0.0), size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='mean', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nirspecdarkdarkcurrent', + name='stdev', + field=models.FloatField(blank=True, default=0.0, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkpixelstats', + name='baseline_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkpixelstats', + name='detector', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkpixelstats', + name='mean_dark_image_file', + field=models.CharField(default='empty', max_length=1000, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkpixelstats', + name='source_files', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(help_text='source file names', max_length=1000), blank=True, default='empty', null=True, size=None), + ), + migrations.AlterField( + model_name='nirspecdarkpixelstats', + name='type', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkqueryhistory', + name='aperture', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkqueryhistory', + name='files_found', + field=models.IntegerField(blank=True, default=0, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkqueryhistory', + name='instrument', + field=models.CharField(blank=True, default='empty', max_length=7, null=True), + ), + migrations.AlterField( + model_name='nirspecdarkqueryhistory', + name='readpattern', + field=models.CharField(blank=True, default='empty', max_length=40, null=True), + ), + migrations.AlterField( + model_name='rootfileinfo', + name='exp_comment', + field=models.TextField(blank=True, default='', help_text='Anomaly Comment Field'), + ), + ] From 58b37d4cc2f98f4a76f26dfb8478324d3222510d Mon Sep 17 00:00:00 2001 From: Bryan Hilbert Date: Fri, 30 Aug 2024 11:25:04 -0400 Subject: [PATCH 3/3] pep8 --- .../apps/jwql/monitor_models/dark_current.py | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jwql/website/apps/jwql/monitor_models/dark_current.py b/jwql/website/apps/jwql/monitor_models/dark_current.py index bb9620761..ff3153843 100644 --- a/jwql/website/apps/jwql/monitor_models/dark_current.py +++ b/jwql/website/apps/jwql/monitor_models/dark_current.py @@ -49,7 +49,7 @@ class FGSDarkDarkCurrent(models.Model): mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -81,7 +81,7 @@ class FGSDarkPixelStats(models.Model): y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -118,7 +118,7 @@ class MIRIDarkDarkCurrent(models.Model): mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -150,7 +150,7 @@ class MIRIDarkPixelStats(models.Model): y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -187,7 +187,7 @@ class NIRCamDarkDarkCurrent(models.Model): mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -219,7 +219,7 @@ class NIRCamDarkPixelStats(models.Model): y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -256,7 +256,7 @@ class NIRISSDarkDarkCurrent(models.Model): mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -288,7 +288,7 @@ class NIRISSDarkPixelStats(models.Model): y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -325,7 +325,7 @@ class NIRSpecDarkDarkCurrent(models.Model): mean = models.FloatField(default=0., blank=True, null=True) stdev = models.FloatField(default=0., blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True) @@ -357,7 +357,7 @@ class NIRSpecDarkPixelStats(models.Model): y_coord = ArrayField(models.IntegerField()) type = models.CharField(max_length=MAX_LEN_TYPE, default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) source_files = ArrayField(models.CharField(max_length=MAX_LEN_FILENAME, help_text="source file names"), - default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) + default=DEFAULT_MODEL_CHARFIELD, blank=True, null=True) obs_start_time = models.DateTimeField(blank=True, null=True) obs_mid_time = models.DateTimeField(blank=True, null=True) obs_end_time = models.DateTimeField(blank=True, null=True)