Changeset 35077 for branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py

Timestamp:

Jan 31, 2013, 5:47:48 PM (13 years ago)

Author:

eugene

Message:

track the boxes for which dvo detections have been ingested

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py (modified) (7 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/dvo.py

@@ -33 +33 @@
 
     '''
-    def __init__(self, logger, config, skychunk, scratchDbName=None):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDbName=None):
 
         # set up logging
@@ -39 +39 @@
         self.config = config
         self.skychunk = skychunk
+        self.ippToPspsDb = ippToPspsDb
 
         # set up empty lists
@@ -47 +48 @@
         self.regionsIngestedButOutOfDate = []
        
-        # XXX use Stilts for ingest in certain cases or not?
-        self.useStilts = 0
-
         # connect to the specified scratch database, if a name is given, otherwise use the first version
         try:
@@ -55 +53 @@
         except: raise
 
+        # we have (still) 3 modes of ingest from dvo cpt/cps/cpm files 
+        # 1) dvograbber (useFullTables == FALSE), 
+        # 2) jython/stilts (useStilts == TRUE, useFullTables == TRUE)
+        # 3) dvopsps (useStilts == FALSE, useFullTables == TRUE)
+        # my goal (EAM, 2013/01/31) is to migrate to only dvopsps
+
+        self.useStilts = 0
         self.scratchDb.setUseFullTables(True)
 
@@ -569 +574 @@
     includes purging detections outside sky area
     '''
-    def nativeIngestDetections(self, raCenter, decCenter, boxSize):
-
-        # XXX put the skychunk below in a separate method 
+    def nativeIngestDetections(self, boxId, raCenter, decCenter, boxSize):
+
+        # XXX put the chunk below in a separate method 
+        # blow away existing dvoDetection table
+
+        # clear the 'ingested' field for all boxes
+        self.ippToPspsDb.clearIngestedBoxes()
         
         # drop detections table
@@ -599 +608 @@
         self.loadImages()
 
-        # XXX blow away existing dvoDetection table?
-
         # dvopsps -D catdir CATDIR -region .... -dbhost xx -dbname xx -dbuser xx -dbpass xx
         halfSize = boxSize / 2.0
@@ -625 +632 @@
         p.wait()
 
+        self.ippToPspsDb.setIngestedBox(boxId)
+
         # update lists after attempted sync
         # self.printSummary()