From 3478b6e059981b473f84f8f3f66b4ab9ac2a716a 2017-02-01 09:55:12
From: Juan C. Espinoza <juan.espinoza@jro.igp.gob.pe>
Date: 2017-02-01 09:55:12
Subject: [PATCH] Fix Mix RC configurations

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@263 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/main/views.py b/apps/main/views.py
index fae7226..8b2c742 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -19,7 +19,7 @@ from .forms import OperationSearchForm, FilterForm, ChangeIpForm
 
 from .tasks import task_start, task_stop
 
-from apps.rc.forms import RCConfigurationForm, RCLineCode
+from apps.rc.forms import RCConfigurationForm, RCLineCode, RCMixConfigurationForm
 from apps.dds.forms import DDSConfigurationForm
 from apps.jars.forms import JARSConfigurationForm
 from apps.cgs.forms import CGSConfigurationForm
@@ -734,16 +734,16 @@ def experiment_mix(request, id_exp):
                               mix=True,
                               parameters='')
         mix.save()
-
+        
         line_type = RCLineType.objects.get(name='mix')
         for i in range(len(rc_confs[0].get_lines())):
             line = RCLine(rc_configuration=mix, line_type=line_type, channel=i)
-            line.save()
+            line.save()    
 
-    initial = {'name': mix.name,
-               'result': parse_mix_result(mix.parameters),
-               'delay': 0,
-               'mask': [0,1,2,3,4,5,6,7]
+    initial = {'name': mix.name, 
+               'result': parse_mix_result(mix.parameters), 
+               'delay': 0, 
+               'mask': [0,1,2,3,4,5,6,7] 
                }
 
     if request.method=='GET':
@@ -1122,7 +1122,7 @@ def experiment_verify(request, id_exp):
     return render(request, 'experiment_verify.html', kwargs)
 
 
-@user_passes_test(lambda u:u.is_staff)
+#@user_passes_test(lambda u:u.is_staff)
 def parse_mix_result(s):
 
     values = s.split('-')
diff --git a/apps/rc/models.py b/apps/rc/models.py
index 4226397..4b0be9b 100644
--- a/apps/rc/models.py
+++ b/apps/rc/models.py
@@ -906,6 +906,8 @@ class RCLine(models.Model):
                         elif delay+len(Y)<len(y):
                             y_temp = np.zeros(len(y), dtype=np.int8)
                             y_temp[delay:delay+len(Y)] = Y
+                    else:
+                        y_temp = Y.copy()
 
                     if ops[i]=='OR':
                         y = y | y_temp