Changeset 37129 for branches/eam_branches/ipp-20140717/ippToPsps/jython/dvo.py

Timestamp:

Jul 28, 2014, 6:20:27 AM (12 years ago)

Author:

eugene

Message:

dropping options for stilts dvo import methods; fixing a number of previously ignored errors (eg, dropping non-existent tables); allowing queue questions to strip leading and trailing spaces (so we can read from an input file); echo back the response so input from a file is clearer; re-write big sql blocks with new sql utility code; updating names in MeanObject, ObjectThin to be more consistent; add a new test code program; update detection fields to match new schema; drop the code for the old now-unused tables (detecitonCalib, SkinnyObject, etc)

Location:

branches/eam_branches/ipp-20140717/ippToPsps

Files:

• . (modified) (1 prop)
• jython/dvo.py (modified) (4 diffs)

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

@@ -50 +50 @@
         self.regionsIngestedButOutOfDate = []
        
-        # we have (still) 3 modes of ingest from dvo cpt/cps/cpm files 
-        # 1) dvograbber (useFullTables == FALSE), 
+        # we USED TO have 3 modes of ingest from dvo cpt/cps/cpm files 
+        # 1) dvograbber (useStilts == TRUE, useFullTables == FALSE), 
         # 2) jython/stilts (useStilts == TRUE, useFullTables == TRUE)
-        # 3) dvopsps (useStilts == FALSE, useFullTables == TRUE)
+        # 3) dvopsps (useStilts == FALSE, useFullTables == FALSE)
         # my goal (EAM, 2013/01/31) is to migrate to only dvopsps
 
-        self.useStilts = 0
-        self.scratchDb.setUseFullTables(True)
+        self.scratchDb.setDvoTableNames()
 
         # decide if we are using the right DVO for this scratchDb
@@ -105 +104 @@
         if not self.correctDvo: return
 
+        if (self.skychunk.dvoLocation == 'none'):
+            print "do not load Photcodes for place-holder DVO " + self.skychunk.dvoLocation
+            return False
+
         # check if we have up-to-date version
         path = self.skychunk.dvoLocation + "/Photcodes.dat"
@@ -156 +159 @@
         if not self.correctDvo: return False
 
+        if (self.skychunk.dvoLocation == 'none'):
+            print "do not load SkyTable for place-holder DVO " + self.skychunk.dvoLocation
+            return False
+
         path =  self.skychunk.dvoLocation + "/SkyTable.fits"
         if self.scratchDb.alreadyImportedThisDvoTable(path): 
@@ -164 +171 @@
         self.logger.infoPair("DVO SkyTable.fits file", "NOT up-to-date")        
 
-        if self.useStilts:
-            self.importFits(
-                path,
-                "R_MIN R_MAX D_MIN D_MAX INDEX NAME",
-                self.scratchDb.dvoSkyTable)
-        else:
-            
-            # create dvoSkyTable 
-            sql = "drop TABLE dvoSkyTable"
-            try:
-                self.scratchDb.execute(sql)
-            except: pass
-
-            # create dvoSkyTable 
-            sql = "CREATE TABLE dvoSkyTable (R_MIN REAL, R_MAX REAL, D_MIN REAL, D_MAX REAL, INDEX_ INT, NAME CHAR(18))"
-            self.scratchDb.execute(sql)
-
-            # TODO path to DVO prog hardcoded temporarily
-            cmd = "dvopsps skytable"
-            cmd += " -dbhost " + self.scratchDb.dbHost
-            cmd += " -dbname " + self.scratchDb.dbName
-            cmd += " -dbuser " + self.scratchDb.dbUser
-            cmd += " -dbpass " + self.scratchDb.dbPass
-            cmd += " -D CATDIR " + self.skychunk.dvoLocation
-
-            self.logger.infoPair("Running dvopsps", cmd)
-            p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
-            p.wait()
-            if p.returncode != 0:
-                self.logger.errorPair("dvopsps failed on SkyTable.fits for ", self.skychunk.dvoLocation)
-                raise
+        # drop dvoSkyTable (if it exists)
+        sql = "drop TABLE dvoSkyTable"
+        try: self.scratchDb.execute(sql)
+        except: pass
+
+        # create dvoSkyTable 
+        sql = "CREATE TABLE dvoSkyTable (R_MIN REAL, R_MAX REAL, D_MIN REAL, D_MAX REAL, INDEX_ INT, NAME CHAR(18))"
+        self.scratchDb.execute(sql)
+
+        # TODO path to DVO prog hardcoded temporarily
+        cmd = "dvopsps skytable"
+        cmd += " -dbhost " + self.scratchDb.dbHost
+        cmd += " -dbname " + self.scratchDb.dbName
+        cmd += " -dbuser " + self.scratchDb.dbUser
+        cmd += " -dbpass " + self.scratchDb.dbPass
+        cmd += " -D CATDIR " + self.skychunk.dvoLocation
+
+        self.logger.infoPair("Running dvopsps", cmd)
+        p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE)
+        p.wait()
+        if p.returncode != 0:
+            self.logger.errorPair("dvopsps failed on SkyTable.fits for ", self.skychunk.dvoLocation)
+            raise
 
         self.logger.infoPair("Adding index to", self.scratchDb.dvoSkyTable)