SW-13: fix various bugs

LCU/StationTest/rspctlprobe.py

@@ -12,7 +12,11 @@ import shutil
 import time
 import socket
 
-logger = logging.getLogger(__name__)
+import traceback
+
+name = __name__ if __name__ != '__main__' else 'rspctlprobe'
+logger = logging.getLogger(name)
+
 
 
 # --------------------------------NICE PRINTOUT
@@ -199,7 +203,7 @@ class RCUBoard:
             self.xcsub_bands)
 
     def __getitem__(self, item):
-        getattr(self, item)
+        return getattr(self, item)
 
 
 # -------RCU mode
@@ -488,7 +492,7 @@ def execute_xcstatistics_mode(parameters):
     :return:
     :rtype:
     """
-    logger.info("Executing xcstatistics with these parameters {}")
+    logger.info("Executing xcstatistics with these parameters %s", parameters)
     cmd_list = [] 
 
     if 'xcangle' in parameters:
@@ -549,16 +553,15 @@ def query_status():
         logger.error("error querying spectral inversion: %s", e.message)
         raise Exception('Error querying spectral inversion')
 
-    rcus = {}
     for k in rcu.keys():
         rcu_i = rcu[k]
         rcu_i.sub_bands = sub_bands[k]
         rcu_i.xcsub_bands = xcsub_bands[k]
 
-    res = {"rcus": rcus, "clock": clock, "boards-spinv": boards_spinv}
+    res = {"rcus": rcu, "clock": clock, "boards-spinv": boards_spinv}
 
-    rcus_mode = [rcus[i]["mode"] for i in rcus]
-    rcus_xcsub_band = [rcus[i]["xcsub-band"] for i in rcus]
+    rcus_mode = [rcu[i]["mode"] for i in rcu]
+    rcus_xcsub_band = [rcu[i]["xcsub_bands"] for i in rcu]
 
     res["mode"] = list_mode(rcus_mode)
     res["xcsub_band"] = list_mode(rcus_xcsub_band)
@@ -601,7 +604,7 @@ def query_xcstatistics(options):
 
     filename = "_mode_%s_xst_sb%0.3d.dat" % (mode, subband)
 
-    temporary_output_directory = tempfile.mkdtemp()
+    temporary_output_directory = tempfile.mkdtemp(prefix="rspctlprobe_tmp")
 
     options['directory'] = temporary_output_directory
     integration = options['integration']
@@ -624,7 +627,7 @@ def query_xcstatistics(options):
     shutil.rmtree(temporary_output_directory)
 
     rcus = res["rcus"]
-    header = ["RCUID", "delay", "att", "mode", "state", "xcsub-band"]
+    header = ["RCUID", "delay", "attenuation", "mode", "status", "xcsub_bands"]
     ids = [[header[0]] + map(str, rcus.keys())]  # Create the id column of the file
     table = [[key] + [str(rcus[i][key]) for i in rcus] for key in header[1:]]
     table = ids + table
@@ -644,6 +647,15 @@ def query_xcstatistics(options):
     return res
 
 
+def query_most_common_mode():
+    """
+    Return the most frequent mode that the RCUs have
+    :return: the mode
+    """
+    rcus_mode = query_rcu_mode()
+    rcus_mode = [rcus_mode[rcu] for rcu in rcus_mode]
+    return int(list_mode(map(lambda x: x['mode'], rcus_mode)))
+
 def set_mode(mode):
     """
     Set the mode on all the rsp boards
@@ -651,14 +663,17 @@ def set_mode(mode):
     :param mode: the mode to be set
     :type mode: int
     """
+
+    if mode == query_most_common_mode():
+        return True
+
     logger.info('switching rcu mode to %d', mode)
     issue_rspctl_command(["--mode={}".format(mode)])
     logger.info('mode change command issued')
+
     for i in range(10):
         time.sleep(3)
-        rcus_mode = query_rcu_mode()
-        rcus_mode = [rcus_mode[rcu] for rcu in rcus_mode]
-        outmode = int(list_mode(map(lambda x: x['mode'], rcus_mode)))
+        outmode = query_most_common_mode()
         logger.info('current rsp mode is {}'.format(outmode))
         if mode == outmode:
             logger.info('mode changed correctly to {}'.format(outmode))
@@ -696,7 +711,7 @@ def produce_xcstatistics(integration_time=1, duration=1, add_options=None, outpu
     :param output_directory:
     :return:
     """
-    if not add_options():
+    if not add_options:
         add_options = {}
 
     add_options["integration"] = integration_time
@@ -733,7 +748,7 @@ def batch_produce_xcstatistics(integration_time,
     if not add_options:
         add_options = {}
 
-    if mode:
+    if mode != -2:
         set_mode(mode)
 
     for ind, (i, d, w) in enumerate(zip(integration_time, duration, wait_time)):
@@ -777,7 +792,7 @@ def setup_command_argument_parser():
     parser.add_argument('--wait', type=int, default=[0], nargs='+')
     parser.add_argument('--xcsubband', type=str, default="")
     parser.add_argument('--loops', type=int, default=1)
-    parser.add_argument('--mode', type=int, default=None)
+    parser.add_argument('--mode', type=int, default=-2)
     return parser
     
 
@@ -797,7 +812,7 @@ def parse_and_execute_command_arguments():
         try:
             if program_arguments.xcsubband:
                 start, end, step = map(int, program_arguments.xcsubband.split(":"))
-                xcsub_bands = [i for i in range(start, end, step)]
+                xcsub_bands = [i for i in range(start, end+step, step)]
 
                 for i in range(program_arguments.loops):
                     batch_produce_xcstatistics(program_arguments.integration,
@@ -818,6 +833,7 @@ def parse_and_execute_command_arguments():
                                                output_directory=program_arguments.directory)
         except Exception as e:
             logger.error('error executing rspctl : %s', e)
+            logger.error('traceback \n%s',traceback.format_exc())
             raise e