Merge pull request #29 from lsst-camera-dh/develop

Develop

Author: tony-johnson

bot-data.py

@@ -7,6 +7,7 @@
 from ccs import aliases
 from ccs import proxies
 from ccs import versions
+from ccs import configs
 from java.time import Duration
 
 # Temporary work around for problems with CCS responsiveness
@@ -36,6 +37,9 @@
   fp = CCS.attachProxy('focal-plane')
   time.sleep(10.0)
   versions.write_versions(fp)
+  configs.write_config(fp, ['Sequencer', 'Rafts'])
+
+
 
 import config
 

lib/ccs/configs.py

@@ -0,0 +1,13 @@
+#!/usr/bin/env ccs-script
+from org.lsst.ccs.scripting import CCS
+from ccs import proxies
+from java.util import HashSet
+import time
+
+def write_config(fp, categories):
+   args = HashSet()
+   for c in categories:
+      args.add(c)
+   config = fp.printConfigurationParameters(args)
+   with open("ccs_config.txt", "w") as file:
+      file.write(config)

lib/fp.py

@@ -10,7 +10,7 @@
 
 fp = CCS.attachProxy("focal-plane") # this will be override by CCS.aliases
 agentName = fp.getAgentProperty("agentName")
-if  agentName != "focal-plane":
+if agentName != "focal-plane":
    fp = CCS.attachProxy(agentName) # re-attach to ccs subsystem
 autoSave = True
 imageTimeout = Duration.ofSeconds(60)
@@ -33,7 +33,6 @@ def sanityCheck():
 def clear(n=1):
    if n == 0:
       return
-   endIdleFlush()
    print "Clearing CCDs (%d)" % n
    fp.clear(n)
    fp.waitForSequencer(Duration.ofSeconds(2))
@@ -48,7 +47,7 @@ def takeExposure(exposeCommand=None, fitsHeaderData=None, annotation=None, locat
    sanityCheck()
    print "Setting FITS headers %s" % fitsHeaderData
    fp.setHeaderKeywords(fitsHeaderData)
-   imageName = fp.allocateImageName() 
+   imageName = fp.allocateImageName()
    print "Image name: %s" % imageName
 
    # Horrible fix for using "fast" gpfs disk at SLAC