Index: trunk/ippToPsps/jython/gpc1db.py
===================================================================
--- trunk/ippToPsps/jython/gpc1db.py	(revision 39158)
+++ trunk/ippToPsps/jython/gpc1db.py	(revision 39165)
@@ -121,6 +121,5 @@
                    JOIN mergedvodbProcessed using (merge_id) \
                    JOIN diffInputSkyfile \
-                   ON (diff_id = stage_id AND diff_skyfile_id = stage_extra1 \
-                   AND stage = 'diff') \
+                   ON (diff_id = stage_id AND diff_skyfile_id = stage_extra1 AND stage = 'diff') \
                    JOIN skycell using (skycell_id, tess_id) \
                    JOIN warpRun on (warp1 = warp_id \
@@ -308,6 +307,5 @@
                    JOIN mergedvodbProcessed using (merge_id) \
                    JOIN diffInputSkyfile \
-                   ON (diff_id = stage_id AND diff_skyfile_id = stage_extra1 \
-                   AND stage = 'diff') \
+                   ON (diff_id = stage_id AND diff_skyfile_id = stage_extra1 AND stage = 'diff') \
                    JOIN skycell using (skycell_id, tess_id) \
                    JOIN warpRun on (warp1 = warp_id \
@@ -513,12 +511,31 @@
     get diff stage cmf name
     '''
-    def getDiffStagePathBase(self, dvoDb, diffSkyfileID):
+    def getDiffStagePathBase(self, diffSkyfileID):
+        sql = "SELECT DISTINCT diffSkyfile.path_base \
+               FROM diffInputSkyfile \
+               JOIN diffSkyfile using (diff_id, skycell_id) \
+               WHERE diff_skyfile_id = " + str(diffSkyfileID)
+
+        rs = self.executeQuery(sql)
+
+        if not rs.first():
+            self.logger.errorPair("missing cmf entry diff_skyfile_id:", str(diff_skyfile_id))
+            # self.logger.errorPair("no diff cmfs found for diff_skyfile_id = %d" %diff_skyfile_id)
+            return None
+
+        pathBase = rs.getString(1)
+        return pathBase
+
+    '''
+    get diff stage cmf name
+    XXX EAM 20151119 : this function does too much work: you have a diffSkyfileID, that matches to a unique path_base
+    '''
+    def getDiffStagePathBaseOldVersion(self, dvoDb, diffSkyfileID):
         print "got here, diffstagecmf"
         sql = "SELECT DISTINCT diffSkyfile.path_base \
                FROM mergedvodbRun join minidvodbRun using (minidvodb_id) \
                JOIN addRun using (minidvodb_name) \
-               JOIN diffInputSkyfile on (diff_skyfile_id = stage_extra1 \
-               AND diff_id = stage_id AND stage = 'diff') \
-               JOIN diffSkyfile using (diff_id, skycell_id, diff_skyfile_id) \
+               JOIN diffInputSkyfile on (diff_skyfile_id = stage_extra1 AND diff_id = stage_id AND stage = 'diff') \
+               JOIN diffSkyfile using (diff_id, skycell_id) \
                WHERE diff_skyfile_id = " + str(diffSkyfileID) + " \
                AND minidvodbRun.state = 'merged' \
@@ -561,4 +578,5 @@
     '''
     get diff stage cmf name
+    XXX EAM 20151119 This function is broken AND it does too much work
     '''
     def getDiffStageCmf(self, dvoDb, diffSkyfileID):