Changeset 35352 for branches/eam_branches/ipp-20130307/ippToPsps/jython/batch.py

Timestamp:

Apr 3, 2013, 12:52:33 PM (13 years ago)

Author:

eugene

Message:

changed dvoDetectionFull mysql engine to 'MEMORY' to improve ingest speed

handle errrors in calls to dvopsps (only in detectionbatch.py)

removed a lot of excess verbosity used for debugging / testing

determine the mysql major version number via mysql query

added test option -realgpc to use test ipptopsps databases with a real gpc1 dataset

add version-dependent call to 'set session old_alter_table' to allow
the ALTER IGNORE statements to work on mysql v5.5 machines (like our
desktops).

raise an exception in case the load infile operations fail

remove unneeded 'killLastConnectionID'

extend logging time to milliseconds

allow an exposure to be skipped without aborting loader

check that a P2 image exists in the dvoImage table (otherwise skip the chip)

change the mysql floating point types for the dvoDetection table to use FLOAT/DOUBLE instead of REAL/FLOAT

remove the old test for valid astrometry of a chip (NASTRO >= 50)

this test was crude and not really the right test. it was also used
to verify that an image should / should not be included. now we check
against dvoImages to see if the chip should be loaded or not (DVO
rejects input images for bad astrometry)

skip an exposure if too many detections have been rejected. this is a sign of a problem and should require more attention

File:

• branches/eam_branches/ipp-20130307/ippToPsps/jython/batch.py (modified) (4 diffs)

branches/eam_branches/ipp-20130307/ippToPsps/jython/batch.py

@@ -415 +415 @@
 
           # drop any previous tables before import
-          #self.scratchDb.dropTable(table.name)
+          self.scratchDb.dropTable(table.name)
 
           # IPP FITS files are littered with infinities, so remove these
@@ -426 +426 @@
           try:
               table.write(self.scratchDb.url + '#' + table.name)
-              # print "wrote to mysql ", table
-              self.scratchDb.killLastConnectionID()
+              # XXX this one is not needed
+              # self.scratchDb.killLastConnectionID()
               count = count + 1
           except:
@@ -454 +454 @@
            # get everything from table
            try:
+               print "reading table from mysql ", table
                _table = stilts.tread(self.scratchDb.url + '#SELECT * FROM ' + table)
                self.scratchDb.killLastConnectionID()
@@ -554 +555 @@
 
         if not self.populatePspsTables():
+            if self.skipBatch:
+                self.ippToPspsDb.updateProcessed(self.batchID, -1)
+                return True
+
             self.logger.errorPair("Aborting this batch", "unable to populate PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)