save Range (at least for CDG_GPIB)

anselm.py

@@ -305,6 +305,8 @@ class Anselm(System):
         auto_offset_tasks = []
         offset_tasks = []
         ind_tasks = []
+        range_offset_tasks = []
+        range_ind_tasks = []
 
         res = True
         for task in tasks:
@@ -325,7 +327,12 @@ class Anselm(System):
            
             if task_name.startswith('ind'):
                 ind_tasks.append(task)
-               
+            
+            if task_name.startswith('range_offset'):
+                range_offset_tasks.append(task)
+            
+            if task_name.startswith('range_ind'):
+                range_ind_tasks.append(task)
         
         for init_task in auto_init_tasks:
             sufix = init_task.get('TaskName').replace("auto_init_", "")
@@ -335,17 +342,24 @@ class Anselm(System):
                     offset_all_sequence.append(init_task) 
                     offset_all_sequence.append(offset_task)
 
-       
         self.aset("offset_all_sequence", line, offset_all_sequence)
         self.log.debug("offset_all_sequence is: {}".format(offset_all_sequence))
+       
         self.aset("auto_init_tasks", line, auto_init_tasks)
         self.log.debug("auto_init_sequence is: {}".format(offset_all_sequence))
 
         self.aset("offset_tasks", line, offset_tasks)
         self.log.debug("offset_tasks are: {}".format(offset_tasks))
+       
         self.aset("ind_tasks", line, ind_tasks)
         self.log.debug("ind_tasks: {}".format(ind_tasks))
-
+       
+        self.aset("range_offset_tasks", line, range_offset_tasks)
+        self.log.debug("range_offset_tasks: {}".format(range_offset_tasks))
+       
+        self.aset("range_ind_tasks", line, range_ind_tasks)
+        self.log.debug("range_ind_tasks: {}".format(range_ind_tasks))
+       
         return res
 
     def run_selected(self, combo, line):

bot.py

@@ -91,22 +91,20 @@ class Bot(System):
                 todo_dict = self.utils.extract_todo_pressure(doc)
                 todo_pressures_acc, todo_n_acc, unit =  self.utils.acc_pressure(todo_dict, todo_pressures_acc, todo_n_acc)
             
-            remaining_pressure_acc = []
-            remaining_n_acc = []
+            remaining_pressure_all = []
             for line in lines: 
                 cal_id = self.aget('cal_id', line)
                 doc = self.db.get_doc(cal_id)
                 target_dict = self.utils.extract_target_pressure(doc)
                
-                remaining_pressure, remaining_n, unit =  self.utils.remaining_pressure(target_dict, todo_pressures_acc, todo_n_acc)
-                remaining_dict = {'Value':remaining_pressure, 'N':remaining_n, 'Unit': unit}
-                remaining_pressure_acc, remaining_n_acc , unit = self.utils.acc_pressure(remaining_dict, remaining_pressure_acc, remaining_n_acc)
-            
-            
-            if len(remaining_pressure_acc) > 0:
-                self.post(channel, "There following target pressure(s) remain:".format(no=len(remaining_pressure_acc)))
-                for i, p in enumerate(remaining_pressure_acc):
-                    self.post(channel, "№ {no}:  {p} {unit} (N = {n})".format(no=i+1,p=p, unit=unit, n=remaining_n_acc[i]))
+                remaining_pressure, unit =  self.utils.remaining_pressure(target_dict, todo_pressures_acc, todo_n_acc)
+                if len(remaining_pressure) > len(remaining_pressure_all ):
+                    remaining_pressure_all  = remaining_pressure
+
+            if len(remaining_pressure_all) > 0:
+                self.post(channel, "There following target pressure(s) remain:".format(no=len(remaining_pressure_all)))
+                for i, p in enumerate(remaining_pressure_all):
+                    self.post(channel, "№ {no}:  {p} {unit}".format(no=i+1,p=p, unit=unit))
             else:
                 msg = "There are no remaining target pressures."
                 self.post(channel, msg )

srv.py

@@ -410,7 +410,12 @@ def offset():
                     if auto_init_task is not None:
                         seq_array.append("{}-{}".format(auto_init_task.get('TaskName'), line))
                         offset_sequence.append(auto_init_task)
-
+                        
+                    range_offset_task = select_task(target_value, s.dget('range_offset_tasks', line))
+                    if range_offset_task is not None:
+                        seq_array.append("{}-{}".format(range_offset_task.get('TaskName'), line))
+                        offset_sequence.append(range_offset_task)
+                   
                     offset_task = select_task(target_value,  s.dget('offset_tasks', line))
                     if offset_task is not None:
                         seq_array.append("{}-{}".format(offset_task.get('TaskName'), line))
@@ -467,6 +472,11 @@ def ind():
                     if auto_init_task is not None:
                         seq_array.append("{}-{}".format(auto_init_task.get('TaskName'), line))
                         ind_sequence.append(auto_init_task)
+     
+                    range_ind_task = select_task(target_value, s.dget('range_ind_tasks', line))
+                    if range_ind_task is not None:
+                        seq_array.append("{}-{}".format(range_ind_task.get('TaskName'), line))
+                        ind_sequence.append(range_ind_task)
 
                     ind_task = select_task(target_value, s.dget('ind_tasks', line))
                     if ind_task is not None: