Index: trunk/ippToPsps/jython/setupScratchDb.py
===================================================================
--- trunk/ippToPsps/jython/setupScratchDb.py	(revision 33587)
+++ trunk/ippToPsps/jython/setupScratchDb.py	(revision 33588)
@@ -1,49 +1,56 @@
 #!/usr/bin/env jython
 
-import os.path
 import sys
-import time
 import stilts
 from java.lang import *
 from java.sql import *
-import logging.config
 
-from java.lang import Math
-from org.apache.commons.math.special import Erf
-from xml.etree.ElementTree import ElementTree, Element, tostring
 
-from pslogger import PSLogger
+from ipptopsps import IppToPsps
 from scratchdb import ScratchDb
 
 '''
-Start of program.
+SetupScratchDb class
 '''
+class SetupScratchDb(IppToPsps):
 
-if len(sys.argv) > 1: CONFIG = sys.argv[1]
-else:
-    print "** Usage: " + sys.argv[0] + " <configPath> [init]"
-    sys.exit(1)
+    '''
+    Constructor
+    '''
+    def __init__(self, argv):
+        super(SetupScratchDb, self).__init__(argv)
 
-# open config file
-configDoc = ElementTree(file=CONFIG)
+        if len(argv) < 3:
+            self.printUsage()
+            self.exitProgram("incorrect args")
 
-# set up logging
-logging.setLoggerClass(PSLogger)
-logger = logging.getLogger("setupScratchDb")
-logger.setup(configDoc, "setupScratchDb")
+        self.scratchDb = ScratchDb(self.logger, self.config, argv[2])
 
-scratchDb = ScratchDb(logger, configDoc)
 
-# install stored procedure
-logger.info("Installing psfLikelihood() stored procedure")
-scratchDb.createPsfLikelihoodFunction()
+    def run(self):
 
-# install IN tables
-logger.info("Installing initialization tables")
-tables = stilts.treads("../config/IN/tables.vot")
-for table in tables:
-    logger.debug("Creating IN table: " + table.name)
-    table.write(scratchDb.url + '#' + table.name)
+        # install stored procedure
+        self.logger.info("Installing psfLikelihood() stored procedure")
+        self.scratchDb.createPsfLikelihoodFunction()
 
-logger.info("Done")
+        # install IN tables
+        self.logger.info("Installing initialization tables")
+        tables = stilts.treads("../config/IN/tables.vot")
+        for table in tables:
+            self.logger.debug("Creating IN table: " + table.name)
+            table.write(self.scratchDb.url + '#' + table.name)
 
+    '''
+    Overrides base-class version
+    '''
+    def printUsage(self):
+        super(SetupScratchDb, self).printUsage("<scratchdb_name>")
+
+'''
+Program starts here
+'''
+setupScratchDb = SetupScratchDb(sys.argv)
+setupScratchDb.run()
+setupScratchDb.exitProgram("finished")
+
+