Changeset 32000

Timestamp:

Aug 3, 2011, 12:37:30 PM (15 years ago)

Author:

rhenders

Message:

now passing config path into constructors

Location:

trunk/ippToPsps/jython

Files:

• detectionbatch.py (modified) (2 diffs)
• initbatch.py (modified) (6 diffs)
• ipptopsps.py (modified) (3 diffs)
• stackbatch.py (modified) (2 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -30 +30 @@
     def __init__(self, 
                  logger,
+                 configPath,
                  configDoc,
                  gpc1Db,
@@ -37 +38 @@
        super(DetectionBatch, self).__init__(
                logger,
+               configPath,
                configDoc,
                gpc1Db,

trunk/ippToPsps/jython/initbatch.py

@@ -1 +1 @@
 #!/usr/bin/env jython
 
+import sys
 import stilts
 import logging
@@ -16 +17 @@
 from detectionbatch import DetectionBatch
 
-
-
 '''
 Class encapsulating the init batch type (IN)
@@ -26 +25 @@
     Constructor
     '''
-    def __init__(self, logger, configDoc, gpc1Db, ippToPspsDb):
-       super(InitBatch, self).__init__(logger, configDoc, gpc1Db, ippToPspsDb, 0, "init", None)
+    def __init__(self, 
+            logger, 
+            configPath,
+            configDoc,
+            gpc1Db, 
+            ippToPspsDb):
+       super(InitBatch, self).__init__(logger, 
+               configPath, 
+               configDoc, 
+               gpc1Db, 
+               ippToPspsDb, 
+               0, 
+               "init", 
+               None)
 
        self.outputFitsFile = "00000000.FITS";
@@ -33 +44 @@
 
 
+'''
+Start of program.
+'''
+
+if len(sys.argv) > 1: CONFIG  = sys.argv[1]
+else:
+    print "** Usage: " + sys.argv[0] + " <configPath>"
+    sys.exit(1)
 
 
@@ -42 +61 @@
 
 # open config file
-configDoc = ElementTree(file="config.xml")
+configDoc = ElementTree(file=CONFIG)
 
 # create database objects
@@ -48 +67 @@
 ippToPspsDb = IppToPspsDb(logger, configDoc)
 
-
-initBatch = InitBatch(logger, configDoc, gpc1Db, ippToPspsDb)
+initBatch = InitBatch(logger, CONFIG, configDoc, gpc1Db, ippToPspsDb)
 initBatch.createEmptyPspsTables()
 initBatch.exportPspsTablesToFits()

trunk/ippToPsps/jython/ipptopsps.py

@@ -31 +31 @@
     # if not in TEST mode, then only queue un-processed items
     else:
-        processedIDs = ippToPspsDb.getProcessedIDsForThisStage(batchType, EPOCH)
+        processedIDs = ippToPspsDb.getProcessedIDsForThisStage(batchType, EPOCH, DVOGPC1LABEL)
         logger.infoPair("Processed %s items" % batchType, "%d" % len(processedIDs))
         ids = list(set(allIDs) - set(processedIDs))
@@ -45 +45 @@
         if batchType == "P2":
             batch = DetectionBatch(logger,
+                    CONFIG,
                     configDoc,
                     gpc1Db,
@@ -51 +52 @@
         elif batchType == "ST":
             batch = StackBatch(logger,
+                    CONFIG,
                     configDoc,
                     gpc1Db,

trunk/ippToPsps/jython/stackbatch.py

@@ -27 +27 @@
     def __init__(self, 
                  logger, 
+                 configPath,
                  configDoc,
                  gpc1Db,
@@ -34 +35 @@
        super(StackBatch, self).__init__(
                logger,
+               configPath,
                configDoc,
                gpc1Db,