##// END OF EJS Templates
radarsys
RSS
Fix Mix RC configurations...
Juan C. Espinoza -
r238:3478b6e05998
parent child
Show More
Show file before | Show file after | Hide comments
@@ -19,7 +19,7 from .forms import OperationSearchForm, FilterForm, ChangeIpForm
19 19
20 20 from .tasks import task_start, task_stop
21 21
22 from apps.rc.forms import RCConfigurationForm, RCLineCode
22 from apps.rc.forms import RCConfigurationForm, RCLineCode, RCMixConfigurationForm
23 23 from apps.dds.forms import DDSConfigurationForm
24 24 from apps.jars.forms import JARSConfigurationForm
25 25 from apps.cgs.forms import CGSConfigurationForm
@@ -734,16 +734,16 def experiment_mix(request, id_exp):
734 734 mix=True,
735 735 parameters='')
736 736 mix.save()
737
737
738 738 line_type = RCLineType.objects.get(name='mix')
739 739 for i in range(len(rc_confs[0].get_lines())):
740 740 line = RCLine(rc_configuration=mix, line_type=line_type, channel=i)
741 line.save()
741 line.save()
742 742
743 initial = {'name': mix.name,
744 'result': parse_mix_result(mix.parameters),
745 'delay': 0,
746 'mask': [0,1,2,3,4,5,6,7]
743 initial = {'name': mix.name,
744 'result': parse_mix_result(mix.parameters),
745 'delay': 0,
746 'mask': [0,1,2,3,4,5,6,7]
747 747 }
748 748
749 749 if request.method=='GET':
@@ -1122,7 +1122,7 def experiment_verify(request, id_exp):
1122 1122 return render(request, 'experiment_verify.html', kwargs)
1123 1123
1124 1124
1125 @user_passes_test(lambda u:u.is_staff)
1125 #@user_passes_test(lambda u:u.is_staff)
1126 1126 def parse_mix_result(s):
1127 1127
1128 1128 values = s.split('-')
Show file before | Show file after | Hide comments
@@ -906,6 +906,8 class RCLine(models.Model):
906 906 elif delay+len(Y)<len(y):
907 907 y_temp = np.zeros(len(y), dtype=np.int8)
908 908 y_temp[delay:delay+len(Y)] = Y
909 else:
910 y_temp = Y.copy()
909 911
910 912 if ops[i]=='OR':
911 913 y = y | y_temp
General Comments 0
You need to be logged in to leave comments. Login now