radarsys Commit - r267:8b30609ce30a · Jicamarca Repository

Main files have been fixed...

Fiorella Quino -

r267:8b30609ce30a

parent child

Context file:

r267:8b30609ce30a

Collapse all files

apps/main/models.py +5 -3

                     return self
-                    def get_experiments_by_radar(self, radar=None):
+                def get_experiments_by_radar(self, radar=None):
                     ret = []
                     if radar:
                 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)
                     self.save()
-                 def export_to_file(self, format="json"):
+                def export_to_file(self, format="json"):
                     content_type = ''
                     return fields
-                 def import_from_file(self, fp):
+                def import_from_file(self, fp):
                     parms = {}

apps/main/templates/experiment_summary.html +18 -12

             {% for key in experiment_keys %}
             <tr><th>{{key|title}}</th><td>{{experiment|attr:key}}</td></tr>
             {% endfor %}
+            <tr><th>Lambda (m)</th><td>{{radar_lambda}}</td></tr>
             </table>
                     <h4 class="panel-title"><b> {{configuration}}</b></h4>
                     <br>
                 </div>
             	{% if configuration.device.device_type.name == 'dds' %}
             		<table class="table table-bordered">
             			<tr><th>Frequency A (Mhz)</th><td>{{configuration.frequencyA_Mhz}}</td></tr>
             			<tr><th>Multiplier</th><td>{{configuration.multiplier}}</td></tr>
             		</table>
             	{% endif %}
-            	{% if configuration.device.device_type.name == 'rc' %}
+              {% if configuration.device.device_type.name == 'rc' %}
             		<table class="table table-bordered">
             			<!--<h4 class="panel-title">  </h4>-->
             			<tr><th>NTXs</th><td>{{configuration.ntx}}</td></tr>
             			<tr><th>IPP(km)</th><td>{{configuration.ipp}}</td></tr>
+            			<tr><th>DC</th><td>{{duty_cycle}}%</td></tr>
             			{% for tx_line in configuration.tx_lines %}
             			    <tr><th colspan="2">{{tx_line.name}}</th></tr>
             			    <tr><th>Width(km)</th><td>{{tx_line.width}}</td></tr>
             			    <tr><th>Taus</th><td>{{tx_line.taus}}</td></tr>
-                            <tr><th>codes</th><td>{{tx_line.codes}}</td></tr>
+                      <tr><th>codes</th><td>{{tx_line.codes}}</td></tr>
-                            <tr><th>Sample Windows</th><td>{{tx_line.windows}}</td></tr>
+                      <tr><th>Sample Windows</th><td>{{tx_line.windows}}</td></tr>
             			{% endfor %}
             		</table>
             	{% endif %}
-            	{% if configuration.device.device_type.name == 'jars' %}
+              {% if configuration.device.device_type.name == 'jars' %}
             		<table class="table table-bordered">
             			<!--<h4 class="panel-title"> JARS </h4>-->
             			<tr><th>Acq Prof</th><td>{{configuration.acq_profiles}}</td></tr>
             			<tr><th>Prof x Block</th><td>{{configuration.profiles_block}}</td></tr>
             			<tr><th>Block x File</th><td>{{ configuration.raw_data_blocks }}</td></tr>
-            			<tr><th>Rate (MB/h)</th><td>{{ rate }}</td></tr>
+            			<tr><th>Time per Block (s)</th><td>{{ time_per_block }}</td></tr>
+            			<tr><th>Acqtime (s)</th><td>{{ acqtime }}</td></tr>
+            			<tr><th>Rate </th><td>{{ rate_bh }} || {{ rate_gh }}</td></tr>
+            			<tr><th>Va (m/s)</th><td>{{ va }}</td></tr>
+            			<tr><th>Vrange (m/s)</th><td>{{ vrange }}</td></tr>
             		</table>
             	{% endif %}

apps/main/views.py 0 -2

             @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:

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages