diff --git a/apps/jars/models.py b/apps/jars/models.py index f8e8b11..26669b2 100644 --- a/apps/jars/models.py +++ b/apps/jars/models.py @@ -37,19 +37,24 @@ class JARSConfiguration(Configuration): rc = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE, null=True) exp_type = models.PositiveIntegerField(verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0) - cards_number = models.PositiveIntegerField(verbose_name='Number of Cards',validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1) - channels_number = models.PositiveIntegerField(verbose_name='Number of Channels',validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5) + cards_number = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1) + channels_number = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5) channels = models.CharField(verbose_name='Channels', max_length=15, default = '1,2,3,4,5') rd_directory = models.CharField(verbose_name='Raw Data Directory', max_length=40, default='', blank=True, null=True) - raw_data_blocks = models.PositiveIntegerField(verbose_name='Raw Data Blocks',validators=[MaxValueValidator(5000)], default=120) + raw_data_blocks = models.PositiveIntegerField(verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=120) data_type = models.PositiveIntegerField(verbose_name='Data Type', choices=DATA_TYPE, default=0) - acq_profiles = models.PositiveIntegerField(verbose_name='Acquired Profiles',validators=[MaxValueValidator(5000)], default=400) - profiles_block = models.PositiveIntegerField(verbose_name='Profiles Per Block',validators=[MaxValueValidator(5000)], default=400) + acq_profiles = models.PositiveIntegerField(verbose_name='Acquired Profiles', validators=[MaxValueValidator(5000)], default=400) + profiles_block = models.PositiveIntegerField(verbose_name='Profiles Per Block', validators=[MaxValueValidator(5000)], default=400) + fftpoints = models.PositiveIntegerField(verbose_name='FFT Points',default=16) + incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default = 30) filter = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True, blank=True) + spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], null=True, blank=True) + spectral = models.CharField(verbose_name='Combinations', max_length=15, default = '0,0|') create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True) include_expname = models.BooleanField(verbose_name='Experiment Name in Directory', default=True) acq_link = models.BooleanField(verbose_name='Acquisition Link', default=True) view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True) + save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True) class Meta: db_table = 'jars_configurations'