Index: trunk/ippToPsps/jython/batch.py
===================================================================
--- trunk/ippToPsps/jython/batch.py	(revision 31182)
+++ trunk/ippToPsps/jython/batch.py	(revision 31183)
@@ -6,5 +6,5 @@
 import sys
 
-from gpc1 import Gpc1
+from gpc1db import Gpc1Db
 
 from java.lang import *
@@ -47,5 +47,5 @@
 
         # create Gpc1 object
-        self.gpc1 = Gpc1()
+        self.gpc1Db = Gpc1Db()
 
         # set up JDBC connection to gpc1 Db
Index: trunk/ippToPsps/jython/gpc1.py
===================================================================
--- trunk/ippToPsps/jython/gpc1.py	(revision 31182)
+++ 	(revision )
@@ -1,81 +1,0 @@
-#!/usr/bin/env jython
-
-import re
-import sys
-import glob
-import subprocess
-import os
-
-from java.lang import *
-from java.sql import *
-from xml.etree.ElementTree import ElementTree
-
-
-'''
-Class for GPC1 database connectivity
-'''
-class Gpc1(object):
-
-    driverName="com.mysql.jdbc.Driver"
-
-    '''
-    Constructor
-
-    '''
-    def __init__(self):
-
-        # open config
-        doc = ElementTree(file="config.xml")
-
-        # set up JDBC connection
-        dbName = doc.find("gpc1database/name").text
-        dbHost = doc.find("gpc1database/host").text
-        dbUser = doc.find("gpc1database/user").text
-        dbPass = doc.find("gpc1database/password").text
-        self.url = "jdbc:mysql://"+dbHost+"/"+dbName+"?user="+dbUser+"&password="+dbPass
-        self.con = DriverManager.getConnection(self.url)
-        self.stmt = self.con.createStatement()
-
-    '''
-    Destructor
-    '''
-    def __del__(self):
-
-        print "Gpc1 destructor"
-        self.stmt.close()
-        self.con.close()
-
-
-    '''
-    Gets all cmf files for this sky_id. handles both absolute paths and neb paths
-    '''
-    def getStackStageCmfs(self, skyID):
-        sql = "SELECT path_base, num_inputs \
-               FROM staticskyResult \
-               WHERE sky_id = %d" % skyID
-        try:
-            rs = self.stmt.executeQuery(sql)
-            rs.first()
-        except:
-            print "No worky"
-
-        # get path to base dir of cmf files
-        path = rs.getString(1)
-        index = path.rfind("/")
-        path = path[0:index]
-
-       
-        # list all cmf files if a neb path
-        files = []
-        if path.startswith("neb"):
-
-            f=os.popen("neb-ls -p "+path+"/%cmf")
-            for i in f.readlines():
-                files.append(i.rstrip())
-
-        # or not a neb path
-        else:
-            files = glob.glob(path + "/*.cmf")
-
-        return files
-
Index: trunk/ippToPsps/jython/gpc1db.py
===================================================================
--- trunk/ippToPsps/jython/gpc1db.py	(revision 31183)
+++ trunk/ippToPsps/jython/gpc1db.py	(revision 31183)
@@ -0,0 +1,81 @@
+#!/usr/bin/env jython
+
+import re
+import sys
+import glob
+import subprocess
+import os
+
+from java.lang import *
+from java.sql import *
+from xml.etree.ElementTree import ElementTree
+
+
+'''
+Class for GPC1 database connectivity
+'''
+class Gpc1Db(object):
+
+    driverName="com.mysql.jdbc.Driver"
+
+    '''
+    Constructor
+
+    '''
+    def __init__(self):
+
+        # open config
+        doc = ElementTree(file="config.xml")
+
+        # set up JDBC connection
+        dbName = doc.find("gpc1database/name").text
+        dbHost = doc.find("gpc1database/host").text
+        dbUser = doc.find("gpc1database/user").text
+        dbPass = doc.find("gpc1database/password").text
+        self.url = "jdbc:mysql://"+dbHost+"/"+dbName+"?user="+dbUser+"&password="+dbPass
+        self.con = DriverManager.getConnection(self.url)
+        self.stmt = self.con.createStatement()
+
+    '''
+    Destructor
+    '''
+    def __del__(self):
+
+        print "Gpc1Db destructor"
+        self.stmt.close()
+        self.con.close()
+
+
+    '''
+    Gets all cmf files for this sky_id. handles both absolute paths and neb paths
+    '''
+    def getStackStageCmfs(self, skyID):
+        sql = "SELECT path_base, num_inputs \
+               FROM staticskyResult \
+               WHERE sky_id = %d" % skyID
+        try:
+            rs = self.stmt.executeQuery(sql)
+            rs.first()
+        except:
+            print "No worky"
+
+        # get path to base dir of cmf files
+        path = rs.getString(1)
+        index = path.rfind("/")
+        path = path[0:index]
+
+       
+        # list all cmf files if a neb path
+        files = []
+        if path.startswith("neb"):
+
+            f=os.popen("neb-ls -p "+path+"/%cmf")
+            for i in f.readlines():
+                files.append(i.rstrip())
+
+        # or not a neb path
+        else:
+            files = glob.glob(path + "/*.cmf")
+
+        return files
+
Index: trunk/ippToPsps/jython/stackbatch.py
===================================================================
--- trunk/ippToPsps/jython/stackbatch.py	(revision 31182)
+++ trunk/ippToPsps/jython/stackbatch.py	(revision 31183)
@@ -5,5 +5,5 @@
 from java.sql import *
 
-from gpc1 import Gpc1
+from gpc1db import Gpc1Db
 from batch import Batch
 
@@ -398,6 +398,6 @@
 
 sky_id = 299
-gpc1 = Gpc1()
-cmfFiles = gpc1.getStackStageCmfs(sky_id)
+gpc1Db = Gpc1Db()
+cmfFiles = gpc1Db.getStackStageCmfs(sky_id)
 
 i = 0
@@ -406,5 +406,5 @@
     stackBatch = StackBatch(sky_id, file)
     stackBatch.createEmptyPspsTables()
-    stackBatch.importIppTables(".*psf")
+    stackBatch.importIppTables("")
     stackBatch.populatePspsTables()
     stackBatch.reportNullsInAllPspsTables(False)