From ff9b4f433b435c380b912f96adbbcb9049e3f709 2020-07-28 21:00:22
From: jespinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2020-07-28 21:00:22
Subject: [PATCH] last changes

---

diff --git a/.env b/.env
index cf2fd7f..6411616 100644
--- a/.env
+++ b/.env
@@ -8,5 +8,5 @@ DB_PASSWORD=docker
 PGDATA=/var/lib/postgresql/data
 LC_ALL=C.UTF-8
 TZ=America/Lima
-DOCKER_DATA=/Volumes/dockers/radarsys/
+DOCKER_DATA=/data/dockers/radarsys/
 LOCAL_IP=192.168.1.128
diff --git a/apps/jars/views.py b/apps/jars/views.py
index 147fc54..7acfd93 100644
--- a/apps/jars/views.py
+++ b/apps/jars/views.py
@@ -74,15 +74,14 @@ def jars_conf_edit(request, id_conf):
         if filter_form.is_valid():
            jars_filter = filter_form.cleaned_data
            jars_filter['id'] = request.POST['filter_template']
+           if form.is_valid():
+               conf = form.save(commit=False)
+               conf.filter_parms = json.dumps(jars_filter)
+               conf.save()
+               return redirect('url_jars_conf', id_conf=conf.id)
         else:
            messages.error(request, filter_form.errors)
 
-        if form.is_valid():
-            conf = form.save(commit=False)
-            conf.filter_parms = json.dumps(jars_filter)
-            conf.save()
-            return redirect('url_jars_conf', id_conf=conf.id)
-
     kwargs = {}
 
     kwargs['id_dev'] = conf.id
diff --git a/apps/rc/forms.py b/apps/rc/forms.py
index afeaa17..768f870 100644
--- a/apps/rc/forms.py
+++ b/apps/rc/forms.py
@@ -105,6 +105,7 @@ class RCConfigurationForm(forms.ModelForm):
 class RCMixConfigurationForm(forms.Form):
 
     clock_in = forms.CharField(widget=forms.HiddenInput())
+    frequency = forms.CharField(widget=forms.HiddenInput())
     clock_divider = forms.CharField(widget=forms.HiddenInput())
     name = forms.CharField()
     experiment = forms.ChoiceField()
@@ -134,6 +135,7 @@ class RCMixConfigurationForm(forms.Form):
         self.fields['experiment'].choices = [(conf.pk, '{} | {}'.format(conf.pk, conf.name)) for conf in confs]
         self.fields['delay'].widget = KmUnitWidget(attrs = {'km2unit':km2unit})
         self.fields['clock_in'].initial = clock_in
+        self.fields['frequency'].initial = clock_in
         self.fields['clock_divider'].initial = clock_divider
 
 
@@ -415,4 +417,4 @@ class RCClockForm(forms.ModelForm):
             elif form_data['reference']==1 and not 60<=form_data['multiplier']<=90:
                 self.add_error('multiplier', 'For 10MHz, valid values are between 60 and 90')
         
-        return form_data
\ No newline at end of file
+        return form_data
diff --git a/apps/rc/models.py b/apps/rc/models.py
index 405c906..166bc28 100644
--- a/apps/rc/models.py
+++ b/apps/rc/models.py
@@ -553,14 +553,17 @@ class RCConfiguration(Configuration):
                 data = {'default': clock.frequency}
             else:
                 data = {'manual': [clock.multiplier, clock.divisor, clock.reference]}
-            payload = self.request('setfreq', 'post', data=json.dumps(data))
-            if payload['command'] <> 'ok':
-                self.message = 'RC write: {}'.format(payload['command'])
-            else:
-                self.message = payload['programming']
-                if payload['programming'] == 'fail':
-                    self.message = 'RC write: error programming CGS chip'
-        
+            try:
+                payload = self.request('setfreq', 'post', data=json.dumps(data))
+                if payload['command'] <> 'ok':
+                    self.message = 'RC write: {}'.format(payload['command'])
+                else:
+                    self.message = payload['programming']
+                    if payload['programming'] == 'fail':
+                        self.message = 'RC write: error programming CGS chip'
+            except Exception as e:
+                self.message = 'RC Write: No CGS found {}'.format(e)
+                # return False
         values = []
         for pulse, delay in zip(self.get_pulses(), self.get_delays()):
             while delay>65536:
@@ -867,7 +870,7 @@ class RCLine(models.Model):
             params = json.loads(self.params)
             n = ipp_u*ntx
             if params['invert'] in ('1', 1):
-                y = [(n-1, n)]
+                y = [(n-2, n)]
             else:
                 y = [(0, 1)]
 
@@ -927,7 +930,7 @@ class RCLine(models.Model):
                 if mask[self.channel] in ('0', '', ' '):
                     continue
                 Y = confs[i].get_lines(channel=self.channel)[0].pulses_as_array()
-                delay = float(delays[i])*km2unit
+                delay = int(float(delays[i])*km2unit)
 
                 if modes[i]=='P':
                     if delay>0:
@@ -1024,4 +1027,4 @@ class RCClock(models.Model):
     multiplier = models.PositiveIntegerField(default=60)
     divisor = models.PositiveIntegerField(default=10)
     reference = models.PositiveSmallIntegerField(default=1, choices=((0, 'Internal (25MHz)'), (1, 'External (10MHz)')))
-    frequency = models.FloatField(default=60.0)
\ No newline at end of file
+    frequency = models.FloatField(default=60.0)
diff --git a/apps/rc/views.py b/apps/rc/views.py
index 97ab66e..b59eb38 100644
--- a/apps/rc/views.py
+++ b/apps/rc/views.py
@@ -111,14 +111,19 @@ def conf_edit(request, conf_id):
 
             #update lines fields
             extras.sort()
+            xxs = {}
             for label in extras:
                 x, pk, name = label.split('|')
                 if pk not in line_data:
                     line_data[pk] = {}
                 if 'params' not in line_data[pk]:
                     line_data[pk]['params'] = []
-                if len(line_data[pk]['params'])<int(x)+1:
+                    xxs[pk] = []
+                if x not in xxs[pk]:
                     line_data[pk]['params'].append({})
+                    xxs[pk].append(x)
+            for label in extras:
+                x, pk, name = label.split('|')
                 line_data[pk]['params'][int(x)][name] = float(request.POST[label])
 
             for pk, params in line_data.items():
@@ -417,4 +422,4 @@ def plot_pulses2(request, conf_id):
 def conf_raw(request, conf_id):
     conf = get_object_or_404(RCConfiguration, pk=conf_id)
     raw = conf.write_device(raw=True)
-    return HttpResponse(raw, content_type='application/json')
\ No newline at end of file
+    return HttpResponse(raw, content_type='application/json')
diff --git a/docker-compose.yml b/docker-compose.yml
index 2186e2a..14675ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,42 +1,44 @@
 version: '2'
 services:
  # Django app
-  web:
-    container_name: 'radarsys'
-    build: .
-    restart: always
-    image: radarsys
-    command: gunicorn radarsys.wsgi:application -w 2 -b :8000
-    # command: python manage.py runserver 0.0.0.0:8030
-    # ports:
-    #   - 8030:8030
-    env_file: .env
+ # web:
+ #   container_name: 'radarsys'
+ #   build: .
+ #   restart: always
+ #   image: radarsys
+ #   command: gunicorn radarsys.wsgi:application -w 2 -b :8000
+ #   # command: python manage.py runserver 0.0.0.0:8030
+ #   # ports:
+ #   #   - 8030:8030
+ #   env_file: .env
 
-    links:
-      - redis
-      - postgres
-    volumes:
-      - './:/radarsys'
-      - '${DOCKER_DATA}/static:/radarsys/static'
-    depends_on:
-      - redis
-      - postgres
+ #   links:
+ #     - redis
+ #     - postgres
+ #   volumes:
+ #     - './:/radarsys'
+ #     - '${DOCKER_DATA}/static:/radarsys/static'
+ #   depends_on:
+ #     - redis
+ #     - postgres
 
   redis:
     container_name: 'radarsys-redis'
     image: 'redis:3.2-alpine'
     volumes:
       - '${DOCKER_DATA}/redis:/data'
+    ports:
+      - 6300:6379
 
   celery_worker:
     container_name: 'radarsys-celery'
     image: radarsys
     env_file: .env
     command: celery -A radarsys worker -l info
-    volumes_from:
-      - web
-    depends_on:
-      - web
+    # volumes_from:
+    #   - web
+    # depends_on:
+    #   - web
 
   # PostgreSQL
   postgres:
@@ -45,23 +47,23 @@ services:
     volumes:
       - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - pgdata:/var/lib/postgresql/data
-    # ports:
-    #   - 5432:5432
+    ports:
+      - 5400:5432
     env_file: .env      
 
   # Web Server
-  nginx:
-    container_name: 'radarsys-nginx'
-    restart: always
-    build: ./nginx/
-    ports:
-      - '8030:8030'
-    volumes_from:
-      - web
-    links:
-      - web:web
-    depends_on:
-      - web
+  # nginx:
+  #   container_name: 'radarsys-nginx'
+  #   restart: always
+  #   build: ./nginx/
+  #   ports:
+  #     - '8030:8030'
+  #   volumes_from:
+  #     - web
+  #   links:
+  #     - web:web
+  #   depends_on:
+  #     - web
 
 volumes:
   pgdata: