Merge pull request #32 from lsst-camera-dh/LSSTTD-1230

also catch java.lang.Exception in take_image try/except block
lsst-camera-dh · Feb 5, 2018 · b7df4ed · b7df4ed
2 parents da6a3d6 + 707b35a
commit b7df4ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/harnessed_jobs/rtm_aliveness_power_on/v0/ccs_rtm_aliveness_power_on.py b/harnessed_jobs/rtm_aliveness_power_on/v0/ccs_rtm_aliveness_power_on.py
@@ -95,7 +95,7 @@ def reb_power_on(ccs_sub, rebid, power_line, ccd_type, raise_exception=True):
     logger.info("Turn on REB clock and rail voltages.")
 
     # Load configurations
-    ccs_sub.ts8.synchCommand(10, "loadCategories Rafts RaftsLimits")
+    ccs_sub.ts8.synchCommand(10, "loadCategories Rafts: RaftsLimits: Limits:")
 
     # Run the powerOn CCS command (10.4.2.2, steps 11-13)
     try:

diff --git a/python/eo_acquisition.py b/python/eo_acquisition.py
@@ -7,6 +7,7 @@
 import time
 from collections import namedtuple
 import logging
+import java.lang
 from ccs_scripting_tools import CcsSubsystems, CCS
 from ts8_utils import set_ccd_info, write_REB_info
 
@@ -287,7 +288,7 @@ def take_image(self, seqno, exptime, openShutter, actuateXed,
             try:
                 result = self.sub.ts8.synchCommand(timeout, command).getResult()
                 return result
-            except StandardError as eobj:
+            except (StandardError, java.lang.Exception) as eobj:
                 self.logger.info("EOAcquisition.take_image: try %i failed",
                                  itry)
                 self.logger.info(str(eobj))

diff --git a/python/rebCurrentLimits.py b/python/rebCurrentLimits.py
@@ -42,6 +42,14 @@ def __init__(self, rebps, ts8):
         self['ClkLI'] = ChannelLimits('clocklo.IaftLDO', 32., 50., 25.)
         self['ODI'] = ChannelLimits('OD.IaftLDO', 7., 13., 10.)
         self['HtrI'] = ChannelLimits('heater.IaftLDO', 0., 15., 0.)
+#        #- new values and change to IbefLDO
+#        self['DigI'] = ChannelLimits('digital.IbefLDO', 450., 560., 100.)
+#        self['AnaI'] = ChannelLimits('analog.IbefLDO', 500., 660., 50.)
+#        #- setting ClkHI anomolously high for REB4 board on aliveness bench
+#        self['ClkHI'] = ChannelLimits('clockhi.IbefLDO', 90., 180., 25.)
+#        self['ClkLI'] = ChannelLimits('clocklo.IbefLDO', 35., 55., 25.)
+#        self['ODI'] = ChannelLimits('OD.IbefLDO', 7., 15.5, 10.)
+#        self['HtrI'] = ChannelLimits('heater.IbefLDO', 0., 15., 0.)
 
     def check_rebps_limits(self, rebid, enforce_lower_limits=True,
                            raise_exception=True):