Changeset 39015 for trunk/ippToPsps/jython/gpc1db.py

Timestamp:

Oct 30, 2015, 5:01:15 PM (11 years ago)

Author:

watersc1

Message:

Updates to make DF batches work. Test suite changes to implement that. There are still a few issues with header keywords not being respected completely, but I'm not fully sure if that's due to the simulated data or not. Change to fulltest.sh to move dbuser/pass into variables that can be changed easily.

File:

• trunk/ippToPsps/jython/gpc1db.py (modified) (3 diffs)

trunk/ippToPsps/jython/gpc1db.py

@@ -433 +433 @@
     def getDiffStageMeta(self, diffSkyfileID):
 
-        self.logger.debug("Querying GPC1 for stack meta data")
+        self.logger.debug("Querying GPC1 for diff meta data")
 
         meta = []
@@ -528 +528 @@
                JOIN diffInputSkyfile on (diff_skyfile_id = stage_extra1 \
                AND diff_id = stage_id AND stage = 'diff') \
-               JOIN diffSkyfile using (diff_id, skycell_id) \
+               JOIN diffSkyfile using (diff_id, skycell_id, diff_skyfile_id) \
                WHERE diff_skyfile_id = " + str(diffSkyfileID) + " \
                AND minidvodbRun.state = 'merged' \
@@ -557 +557 @@
                 files.append(i.rstrip())
                 print "append"
-        print i
+# No clue what this is here for, but it breaks things.                
+#        print i
+        else:
+            files = glob.glob(pathBase + ".cmf")
+
         if len(files) < 1: return None
         fits = Fits(self.logger, self.config, files[0])