Index: trunk/ippToPsps/jython/gpc1db.py
===================================================================
--- trunk/ippToPsps/jython/gpc1db.py	(revision 38090)
+++ trunk/ippToPsps/jython/gpc1db.py	(revision 38358)
@@ -255,4 +255,103 @@
 
 
+    '''
+    Gets a list of add ids for a given stage id (distinct fullforce stage id
+    is what is queued in the batch
+    '''
+
+    def getListOfForcedWarpIdsForForcedWarpBatch(self, dvoDb, stageID):
+
+        self.logger.debug("Querying GPC1 for add IDs for ff_id: " + str(stageID))
+
+        sql = "SELECT add_id FROM fullForceInput \
+              JOIN addRun ON(fullForceInput.ff_id = addRun.stage_id \
+              AND fullForceInput.warp_id = addRun.stage_extra1) \
+              JOIN minidvodbRun USING(minidvodb_name) \
+              JOIN minidvodbProcessed USING(minidvodb_id)\
+              JOIN mergedvodbRun USING(minidvodb_id) \
+              JOIN mergedvodbProcessed USING (merge_id) \
+              JOIN fullForceRun USING(ff_id) \
+              JOIN skycalRun using (skycal_id) \
+              JOIN stackRun USING(stack_id) \
+              JOIN stackSumSkyfile using (stack_id) \
+              JOIN skycell USING(skycell_id) \
+              WHERE mergedvodbRun.mergedvodb = '"+ dvoDb + "'\
+              AND minidvodbRun.state = 'merged' \
+              AND minidvodbProcessed.fault = 0 \
+              AND mergedvodbRun.state = 'full' \
+              AND mergedvodbProcessed.fault = 0 \
+              AND addRun.stage = 'fullforce' \
+              AND addRun.state = 'full'\
+              AND stage_id = " + str(stageID)
+
+        try:
+            rs = self.executeQuery(sql)
+        except:
+            self.logger.exception("Can't query for addIDs using :" + sql )
+
+        addIDs = []
+        while (rs.next()):
+            addIDs.append(rs.getString(1))
+        rs.close()
+
+        return addIDs
+
+
+
+    '''
+    Gets a list of add ids for a given stage id (distinct fullforce stage id
+    is what is queued in the batch
+    '''
+
+    def getListOfDiffSkyFileIdsForDiffBatch(self, dvoDb, stageID):
+
+        self.logger.debug("Querying GPC1 for add IDs for ff_id: " + str(stageID))
+        stage = "diff"
+        sql = "SELECT diff_skyfile_id \
+                   FROM addRun \
+                   JOIN addProcessedExp using (add_id) \
+                   JOIN minidvodbRun using (minidvodb_name) \
+                   JOIN minidvodbProcessed using (minidvodb_id)  \
+                   JOIN mergedvodbRun using (minidvodb_id) \
+                   JOIN mergedvodbProcessed using (merge_id) \
+                   JOIN diffInputSkyfile \
+                   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 \
+                   AND diffInputSkyfile.skycell_id = skycell_id) \
+                   JOIN fakeRun using (fake_id) \
+                   JOIN camRun using (cam_id) \
+                   JOIN chipRun using (chip_id)  \
+                   JOIN rawExp using (exp_id) \
+                   WHERE  mergedvodbRun.mergedvodb = '" + dvoDb + "' \
+                   AND minidvodbRun.state = 'merged' \
+                   AND minidvodbProcessed.fault = 0 \
+                   AND mergedvodbRun.state = 'full' \
+                   AND mergedvodbProcessed.fault = 0 \
+                   AND addRun.stage = '" + stage + "' \
+                   AND addRun.state = 'full' \
+                   AND stage_id = " + str(stageID)                               
+
+
+
+        try:
+            rs = self.executeQuery(sql)
+        except:
+            self.logger.exception("Can't query for addIDs using :" + sql )
+
+        addIDs = []
+        while (rs.next()):
+            addIDs.append(rs.getString(1))
+        rs.close()
+
+        return addIDs
+
+
+
+
+
+
+
 
     '''
@@ -348,5 +447,6 @@
                diffRun.software_ver, \
                exp_time, \
-               (to_days(dateobs)-678941 + time_to_sec(dateobs)/86400.) \
+               (to_days(dateobs)-678941 + time_to_sec(dateobs)/86400.), \
+               diffInputSkyfile.tess_id \
                FROM diffRun join diffInputSkyfile using (diff_id) \
                JOIN warpRun on (warp1=warp_id) \
@@ -373,4 +473,6 @@
             meta.append(rs.getString(7))
             meta.append(rs.getString(8))
+            meta.append(rs.getString(9))
+
         except:
             self.logger.errorPair("getDiffStageMeta()", "empty meta data")