diff --git a/apps/main/models.py b/apps/main/models.py
index 97ac426..7456014 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -288,7 +288,7 @@ class Campaign(models.Model):
return self
- def get_experiments_by_radar(self, radar=None):
+ def get_experiments_by_radar(self, radar=None):
ret = []
if radar:
@@ -330,6 +330,7 @@ class Experiment(models.Model):
template = models.BooleanField(default=False)
name = models.CharField(max_length=40, default='', unique=True)
location = models.ForeignKey('Location', null=True, blank=True, on_delete=models.CASCADE)
+ freq = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
start_time = models.TimeField(default='00:00:00')
end_time = models.TimeField(default='23:59:59')
status = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
@@ -657,7 +658,8 @@ class Configuration(PolymorphicModel):
self.save()
- def export_to_file(self, format="json"):
+
+ def export_to_file(self, format="json"):
content_type = ''
@@ -683,7 +685,7 @@ class Configuration(PolymorphicModel):
return fields
- def import_from_file(self, fp):
+ def import_from_file(self, fp):
parms = {}
diff --git a/apps/main/templates/experiment_summary.html b/apps/main/templates/experiment_summary.html
index fdfea22..76b0cd8 100644
--- a/apps/main/templates/experiment_summary.html
+++ b/apps/main/templates/experiment_summary.html
@@ -17,6 +17,7 @@
{% for key in experiment_keys %}
{{key|title}} | {{experiment|attr:key}} |
{% endfor %}
+Lambda (m) | {{radar_lambda}} |
@@ -26,33 +27,34 @@
{{configuration}}
-
- {% if configuration.device.device_type.name == 'dds' %}
-
+
+ {% if configuration.device.device_type.name == 'dds' %}
+
Frequency A (Mhz) | {{configuration.frequencyA_Mhz}} |
- Multiplier | {{configuration.multiplier}} |
+ Multiplier | {{configuration.multiplier}} |
{% endif %}
- {% if configuration.device.device_type.name == 'rc' %}
+ {% if configuration.device.device_type.name == 'rc' %}
NTXs | {{configuration.ntx}} |
IPP(km) | {{configuration.ipp}} |
-
+ DC | {{duty_cycle}}% |
+
{% for tx_line in configuration.tx_lines %}
{{tx_line.name}} |
Width(km) | {{tx_line.width}} |
- Taus | {{tx_line.taus}} |
- codes | {{tx_line.codes}} |
- Sample Windows | {{tx_line.windows}} |
+ Taus | {{tx_line.taus}} |
+ codes | {{tx_line.codes}} |
+ Sample Windows | {{tx_line.windows}} |
{% endfor %}
-
+
{% endif %}
- {% if configuration.device.device_type.name == 'jars' %}
+ {% if configuration.device.device_type.name == 'jars' %}
@@ -67,7 +69,11 @@
Acq Prof | {{configuration.acq_profiles}} |
Prof x Block | {{configuration.profiles_block}} |
Block x File | {{ configuration.raw_data_blocks }} |
- Rate (MB/h) | {{ rate }} |
+ Time per Block (s) | {{ time_per_block }} |
+ Acqtime (s) | {{ acqtime }} |
+ Rate | {{ rate_bh }} || {{ rate_gh }} |
+ Va (m/s) | {{ va }} |
+ Vrange (m/s) | {{ vrange }} |
{% endif %}
diff --git a/apps/main/views.py b/apps/main/views.py
index a0d5d14..48abaa4 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -698,8 +698,6 @@ def experiment_import(request, id_exp):
@user_passes_test(lambda u:u.is_staff)
def experiment_start(request, id_exp):
- def experiment_start(request, id_exp):
-
exp = get_object_or_404(Experiment, pk=id_exp)
if exp.status == 2: