Changeset 31811

Timestamp:

Jul 1, 2011, 9:03:28 AM (15 years ago)

Author:

rhenders

Message:

changes simiar to those in detectionbatch (see previous commit). this code is not finalised yet

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (8 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -7 +7 @@
 from java.lang import *
 from java.sql import *
+
+from xml.etree.ElementTree import ElementTree, Element, tostring
 
 from batch import Batch
@@ -25 +27 @@
     def __init__(self, 
                  logger, 
+                 configDoc,
                  gpc1Db,
                  ippToPspsDb,
-                 scratchDb,
                  skyID, 
                  inputFile, 
-                 stackType, 
-                 useFullTables=False):
+                 stackType):
 
        super(StackBatch, self).__init__(
                logger,
+               configDoc,
                gpc1Db,
                ippToPspsDb,
-               scratchDb,
                skyID,
                "stack", 
                inputFile, 
-               "MD04",
-               useFullTables) # TODO
+               "MD04") # TODO
 
        if not self.everythingOK: return
@@ -49 +49 @@
 
        self.logger.info("got exp time of %d" % self.expTime)
-
-       # meta data to the log
-       self.logger.info("New Stack Batch:")
-       self.logger.info("Sky ID:     %d" % self.id)
-       self.logger.info("File:       %s" % inputFile)
-       self.logger.info("Stack ID:   %d" % self.stackID)
-       self.logger.info("Stack type: %s" % self.stackType)
-       self.logger.info("Skycell:    %s" % self.skycell)
-       self.logger.info("Filter:     %s" % self.filter)
 
        # delete PSPS tables
@@ -73 +64 @@
 
        # set some constants
-       self.dataRelease = "1"
        self.historyModNum = "0"
 
@@ -82 +72 @@
        if not self.useFullTables:
            self.scratchDb.insertNewDvoImage(self.header['SOURCEID'], self.header['IMAGEID'])
+
+    '''
+    Prints metadata to the log
+    '''
+    def printMe(self):
+
+       super(StackBatch, self).printMe()
+
+       self.logger.info("Sky ID:     %d" % self.id)
+       self.logger.info("Stack ID:   %d" % self.stackID)
+       self.logger.info("Stack type: %s" % self.stackType)
+       self.logger.info("Skycell:    %s" % self.skycell)
+       self.logger.info("Filter:     %s" % self.filter)
+
 
     '''
@@ -627 +631 @@
         self.skycell = meta[1];
         self.skycell = self.skycell[8:]
+        self.analysisVer = meta[2];
 
         #return self.ippToPspsDb.alreadyProcessed("stack", "stack_id", self.stackID)
         return False # TODOI
 
-
-useFullTables=True
 
 logging.config.fileConfig("logging.conf")
@@ -641 +644 @@
 gpc1Db = Gpc1Db(logger)
 ippToPspsDb = IppToPspsDb(logger)
-scratchDb = ScratchDb(logger, useFullTables)
+
+configDoc = ElementTree(file="config.xml")
 
 #stackType = "NIGHTLY_STACK"
@@ -665 +669 @@
 
         stackBatch = StackBatch(logger,
+                                configDoc,
                                 gpc1Db,
                                 ippToPspsDb,
-                                scratchDb,
                                 skyID, 
                                 file, 
-                                stackType, 
-                                useFullTables)
+                                stackType)
 
         stackBatch.run()