Merge pull request #58 from AxFoundation/nuclear_logic

Maybe fix for nuclear timeout issues
AxFoundation · Jun 8, 2021 · eafe596 · eafe596
2 parents a1c0ab5 + 1c6b1ba
commit eafe596
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dispatcher/DAQController.py b/dispatcher/DAQController.py
@@ -278,8 +278,9 @@ def check_timeouts(self, detector, command=None):
                 self.hypervisor.tactical_nuclear_option()
                 self.last_nuke = now()
             else:
+                #self.control_detector(detector=detector, command='stop')
                 self.log.debug(f'Nuclear timeout at {int(dt)}/{self.hv_nuclear_timeout}')
-            return
+            #return
 
         if command is None: # not specified, we figure out it here
             command_times = [(cmd,doc[detector]) for cmd,doc in self.last_command.items()]
@@ -314,6 +315,7 @@ def check_timeouts(self, detector, command=None):
                             self.hypervisor.tactical_nuclear_option()
                             self.last_nuke = now()
                         else:
+                            self.control_detector(detector=detector, command='stop')
                             self.log.debug(f'Nuclear timeout at {int(dt)}/{self.hv_nuclear_timeout}')
                     self.error_stop_count[detector] = 0
                 else: