radarsys Commit - r181:ea9394e8ace0 · Jicamarca Repository

Task #714: Modulo Web ABS...

Fiorella Quino -

r181:ea9394e8ace0

parent child

Context file:

r181:ea9394e8ace0

Collapse all files

apps/abs/models.py +175 -38

                  return pos
+             def fromBinary2Char(binary_string):
+                 number = int(binary_string, 2)
+                 #Plus 33 to avoid more than 1 characters values such as: '\x01'-'\x1f'
+                 number = number + 33
+                 char = chr(number)
+                 return char
+             def fromChar2Binary(char):
+                 number = ord(char) - 33
+                 #Minus 33 to get the real value
+                 bits = bin(number)[2:]
+                 #To ensure we have a string with 6bits
+                 if len(bits) < 6:
+                     bits = bits.zfill(6)
+                 return bits
              def change_beam_for_multiprocessing(module):
              	for i in range (1,50):
                      return parameters
+                 def get_beams(self, **kwargs):
+                     '''
+                     This function returns ABS Configuration beams
+                     '''
+                     return ABSBeam.objects.filter(abs_conf=self.pk, **kwargs)
+                 def clone(self, **kwargs):
+                     beams = self.get_beams()
+                     self.pk = None
+                     self.id = None
+                     for attr, value in kwargs.items():
+                         setattr(self, attr, value)
+                     self.save()
+                     for beam in beams:
+                         beam.clone(abs_conf=self)
+                     return self
                  def module_conf(self, module_num, beams):
                      """
                      header = 'JROABSCeCnModCnMod01000108SNDFexperimento1.ab1'
                      module = 'ABS_'+str(module_num)
-                     bs  = {}
+                     bs  = '' #{}
                      i=1
                      #beams  = {1: '001000', 2: '010001', 3: '010010', 4: '000011', 5: '101100', 6: '101101',
                      #       7: '110110', 8: '111111', 9: '000000', 10: '001001', 11: '010010', 12: '011011'}
                      for beam in beams:
-                         bs[i] = beam.module_6bits(module_num)
+                         #bs[i] = fromBinary2Char(beam.module_6bits(module_num))
+                         bs = bs + fromBinary2Char(beam.module_6bits(module_num))
                          i=i+1
                      beams = bs
                      parameters = {}
                      parameters['header'] = header
                      parameters['module'] = module
-                     parameters['beams']  = json.dumps(beams)
+                     parameters['beams']  = beams #json.dumps(beams)
+                     print parameters['beams']
                      answer = ''
                      try:
                          return 0
                      return 1
                  def read_module(self, module):
                      """
                      try:
                          r_write = requests.get(read_route, timeout=0.7)
                          answer  = r_write.json()
-                         message = answer['message']
+                         self.message = answer['message']
                          module_bits    = answer['allbits']
                      except:
-                         message = "Could not read ABS parameters"
+                         #message = "Could not read ABS parameters"
                          return 0
                      return module_bits
                  def write_device(self):
                      """
                      This function sends the beams list to every abs module.
+                     It needs 'module_conf' function
                      """
-                     beams_list    = ast.literal_eval(self.beams)
-                     beams = []
-                     for bl in range(1,len(beams_list)+1):
-                         b = ABSBeam.objects.get(pk=beams_list['beam'+str(bl)])
-                         beams.append(b)
+                     ###beams_list    = ast.literal_eval(self.beams)
+                     ###beams = []
+                     beams = ABSBeam.objects.filter(abs_conf=self)
+                     ###for bl in range(1,len(beams_list)+1):
+                     ###    b = ABSBeam.objects.get(pk=beams_list['beam'+str(bl)])
+                     ###    beams.append(b)
                      #---Write each abs module---
-                     beams_status = ast.literal_eval(self.module_status)
-                     for i in range(62,65):
-                         try:
-                             self.module_conf(i, beams)
-                             beams_status[str(i)] = 1
-                             self.module_status = json.dumps(beams_status)
-                             self.save()
-                         #self.module_conf(63,beams)
-                         #beams_status[str(63)] = 1
-                         #self.module_status = json.dumps(beams_status)
-                         except:
-                             beams_status[str(i)] = 0
-                             self.module_status = json.dumps(beams_status)
-                             self.save()
-                             #return 0
+                     if beams:
+                         beams_status = ast.literal_eval(self.module_status)
+                         for i in range(62,65): #(62,65)
+                             try:
+                                 answer = self.module_conf(i, beams)
+                                 beams_status[str(i)] = 1
+                                 self.module_status = json.dumps(beams_status)
+                                 self.save()
+                             #self.module_conf(63,beams)
+                             #beams_status[str(63)] = 1
+                             #self.module_status = json.dumps(beams_status)
+                             except:
+                                 beams_status[str(i)] = 0
+                                 self.module_status = json.dumps(beams_status)
+                                 self.save()
+                                 answer = 0
+                                 return 0
+                     else:
+                         self.message = "ABS Configuration does not have beams"
+                         return 0
                      #self.device.status = 1
+                     ##
+                     if answer==1:
+                         self.message = "ABS Beams List have been sent to ABS Modules"
+                     else:
+                         self.message = "Could not read ABS parameters"
+                     ##
                      self.save()
                      return 1
                  def test1(self):
                      t1 = time.time()
                      t2 = 0
-                     while (t2-t1)<300:
+                     while (t2-t1)<100:#300
                          t2 = time.time()
-                         self.send_beam_num(1)
-                         time.sleep(0.04)
                          self.send_beam_num(2)
                          time.sleep(0.04)
+                         self.send_beam_num(1)
+                         time.sleep(0.04)
                      return
                  def change_procs_test1(self, module):
-                 	for i in range (1,300):
-                 	    beam_pos = 0
+                 	for i in range (1,300):#300
+                 	    beam_pos = 1
                  	    module_address = ('192.168.1.'+str(module), 5500)
                  	    header   = 'JROABSCeCnModCnMod0100000'
                  	    numbers  = len(str(beam_pos))
                  	    sock = None
-                 	    time.sleep(0.2)
+                 	    time.sleep(0.04)
-                 	    beam_pos = 1
+                 	    beam_pos = 0
                  	    numbers  = len(str(beam_pos))
                  	    message_tx = header+str(numbers)+function+str(beam_pos)+'0'
                  	    sock.close()
                  	    sock = None
-                 	    time.sleep(0.2)
+                 	    time.sleep(0.04)
                  def multi_procs_test1(self):
+                     """
+                     This function sends the beam number to all abs modules using multiprocessing.
+                     """
                      #if __name__ == "__main__":
                      size = 10000000   # Number of random numbers to add
-                     procs =  65 # (Number-1) of processes to create
+                     procs =  65 # (Number-1) of processes to create (absmodule)
                      # Create a list of jobs and then iterate through
                      # the number of processes appending each process to
                      # the job list
                      jobs = []
-                     for i in range(62, procs):
+                     for i in range(1, procs):
                          process = multiprocessing.Process(target=self.change_procs_test1,args=(i,))
                          jobs.append(process)
                      return 1
+                 def multi_procs_test2(self):
+                     """
+                     This function use multiprocessing python library. Importing Pool we can select
+                     the number of cores we want to use
+                     After 'nproc' linux command, we know how many cores computer has.
+                     NOT WORKING
+                     """
+                     import multiprocessing
+                     pool = multiprocessing.Pool(3) # cores
+                     tasks = []
+                     procs = 65
+                     for i in range(62, procs):
+                         tasks.append( (i,))
+                     #print tasks
+                     #pool.apply_async(self.change_procs_test1, 62)
+                     results = [pool.apply( self.change_procs_test1, t ) for t in tasks]
+                     #for result in results:
+                         #result.get()
+                         #(plotNum, plotFilename) = result.get()
+                         #print("Result: plot %d written to %s" % (plotNum, plotFilename) )
+                     return 1
+                 def multi_procs_test3(self):
+                     """
+                     This function use multiprocessing python library. Importing Pool we can select
+                     the number of cores we want to use
+                     After 'nproc' linux command, we know how many cores computer has.
+                     """
+                     from multiprocessing import Pool
+                     import time
+                     def f(x):
+                         return x*x
+                     tasks = []
+                     procs = 65
+                     pool = Pool(processes=4)
+                     #for i in range(62, procs):
+                     #result = pool.map(f, range(62,65))
+                     it = pool.imap(self.change_procs_test1, range(62,65))
+                     #result.get(timeout=5)
+                     return 1
+                 def f(x):
+                     print x
+                     return
+                 def multi_procs_test4(self):
+                     import multiprocessing as mp
+                     num_workers = mp.cpu_count()
+                     pool = mp.Pool(num_workers)
+                     procs = 65
+                     for i in range(62, procs):
+                     #for task in tasks:
+                         pool.apply_async(self.f, args = (i,))
+                     pool.close()
+                     pool.join()
+                     return 1
                  def status_device(self):
                      return 1
                      return parameters
+                 def clone(self, **kwargs):
+                     self.pk = None
+                     self.id = None
+                     for attr, value in kwargs.items():
+                         setattr(self, attr, value)
+                     self.save()
+                     return self
                  def change_beam(self, beam_pos=0):

apps/abs/templates/abs_conf.html +2 -2

              {% block extra-menu-actions %}
              <li><a href="{{ dev_conf.get_absolute_url_plot }}" target="_blank"><span class="glyphicon glyphicon-picture" aria-hidden="true"></span> View Patterns </a></li>
-             <li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li>
+             <!--<li><a href="{{ dev_conf.get_absolute_url_write }}"><span class="glyphicon glyphicon-download" aria-hidden="true"></span> Write</a></li>-->
              {% endblock %}
              {% block extra-content %}
              </style>
              <h4>Beams:</h4>
-             {% if beams_id %}
+             {% if beams %}
              <div class="container">
                <ul class="nav nav-pills">

apps/abs/views.py +18 -15

              def abs_conf(request, id_conf):
                  conf     = get_object_or_404(ABSConfiguration, pk=id_conf)
+                 beams = ABSBeam.objects.filter(abs_conf=conf)
+                 #beams_dict = ast.literal_eval(conf.beams)
+                 #beams = []
+                 #for beam_id in range(1,len(beams_dict)+1):
+                 #    beam = ABSBeam.objects.get(pk=beams_dict['beam'+str(beam_id)])
+                 #    beams.append(beam)
-                 beams_dict = ast.literal_eval(conf.beams)
-                 beams = []
-                 for beam_id in range(1,len(beams_dict)+1):
-                     beam = ABSBeam.objects.get(pk=beams_dict['beam'+str(beam_id)])
-                     beams.append(beam)
-                 beams_id    = ast.literal_eval(conf.beams)
+                 #beams_id    = ast.literal_eval(conf.beams)
                  ip=conf.device.ip_address
                  port=conf.device.port_address
                  kwargs['button'] = 'Edit Configuration'
                  #kwargs['no_play'] = True
-                 kwargs['beams_id'] = beams_id
+                 #kwargs['beams_id'] = beams_id
                  kwargs['beams']    = beams
                  kwargs['beam_selector'] = 0
                  #kwargs['my_data'] =  simplejson.dumps(beams)
              def abs_conf_edit(request, id_conf):
                  conf     = get_object_or_404(ABSConfiguration, pk=id_conf)
-                 beams_list = ast.literal_eval(conf.beams)
-                 i = 1
-                 beams = []
-                 for b in beams_list:
-                     beam = ABSBeam.objects.get(pk=beams_list['beam'+str(i)])
-                     beams.append(beam)
-                     i=i+1
+                 #beams_list = ast.literal_eval(conf.beams)
+                 #i = 1
+                 #beams = []
+                 #for b in beams_list:
+                 #    beam = ABSBeam.objects.get(pk=beams_list['beam'+str(i)])
+                 #    beams.append(beam)
+                 #    i=i+1
+                 beams = ABSBeam.objects.filter(abs_conf=conf)
+                 print beams
                  if request.method=='GET':
                      form = ABSConfigurationForm(instance=conf)

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