Changeset 33675

Timestamp:

Apr 3, 2012, 4:29:08 PM (14 years ago)

Author:

rhenders

Message:

simplified overriden ingestRegion() method

File:

• trunk/ippToPsps/jython/dvoobjects.py (modified) (1 diff)

trunk/ippToPsps/jython/dvoobjects.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, scratchDbName):
+    def __init__(self, logger, config, scratchDbName=None):
 
         super(DvoObjects, self).__init__(logger, config, scratchDbName)
-        self.ingestFileTypes = ['cps','cpt']
+
+        # declare DVO file types of interest
+        self.ingestFileTypes = ['cpt', 'cps']
+        self.loadPhotcodes()
 
     '''
-    Ingests detections for this region
+    Ingests object files for this region
     '''
     def ingestRegion(self, region):
 
-       cpsPath = self.config.dvoLocation + "/" + region + ".cps"
-       cptPath = self.config.dvoLocation + "/" + region + ".cpt"
+       self.logger.infoPair("Ingesting objects for", region)
 
-       cpsTableName = self.scratchDb.getDbFriendlyTableName(region + ".cps")
-       cptTableName = self.scratchDb.getDbFriendlyTableName(region + ".cpt")
+       for fileType in self.ingestFileTypes:
 
-       self.importFits(cpsPath, "*", cpsTableName)
-       self.importFits(cptPath, "*", cptTableName)
+           path = self.config.dvoLocation + "/" + region + "." + fileType
+           tableName = self.scratchDb.getDbFriendlyTableName(region + "." + fileType)
 
-       # we can now report that we have imported this table
-       self.scratchDb.setImportedThisDvoTable(cpsPath, region)
-       self.scratchDb.setImportedThisDvoTable(cptPath, region)
+           self.importFits(path, "*", tableName)
 
-       #self.logger.infoPair("Dropping tables", "%s and %s" % (cpsTableName, cptTableName))
-       #self.scratchDb.dropTable(cpsTableName)
-       #self.scratchDb.dropTable(cptTableName)
+           self.scratchDb.setImportedThisDvoTable(path, region)
 
        return True