Changeset 33163

Timestamp:

Jan 26, 2012, 4:04:35 PM (14 years ago)

Author:

rhenders

Message:

slight method name change

File:

• trunk/ippToPsps/jython/dvo.py (modified) (5 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -39 +39 @@
         # create database object
         self.scratchDb = ScratchDb(logger, self.doc, 1)
-
-        # some log stuff
-        self.logger.infoPair("Started", "dvo")
 
         # decide if we are using the right DVO
@@ -206 +203 @@
     Returns the disk size of this region of data in DVO
     '''
-    def getSizeOfDvoRegion(self, files):
+    def getSizeOfDvoRegionFromFiles(self, files):
 
         size = 0.0
@@ -216 +213 @@
 
         return size
-       
+
     '''
     Returns (and reports to log) total size of DVO files ingested to the scratch Db
@@ -236 +233 @@
 
         files = self.getRegionFiles(minRa, maxRa, minDec, maxDec)
-        totalSize = self.getSizeOfDvoRegion(files)
+        totalSize = self.getSizeOfDvoRegionFromFiles(files)
         self.logger.infoPair("Total size of cpm/cpt files to ingest", self.getFileSizeStr(totalSize))
         count = 0
@@ -386 +383 @@
       return tableName
 
-
-'''
-Start of program.
-'''
-
-if len(sys.argv) > 1: CONFIG  = sys.argv[1]
-else:
-    print "** Usage: " + sys.argv[0] + " <configPath>"
-    sys.exit(1)
-
-# open config file
-configDoc = ElementTree(file=CONFIG)
-
-logging.setLoggerClass(PSLogger)
-logger = logging.getLogger("dvo")
-logger.setup(configDoc, "dvo", 0, 1)
-
-dvo = Dvo(logger, configDoc)
-dvo.isThisDvoCurrentlyIngested()
-#dvo.resetAllTables()
-#dvo.resetDetections()
-dvo.getSizeAlreadyIngested()
-dvo.loadImages()
-dvo.loadSkyTable()
-dvo.loadRegion(330, 330.1, 0.2, 0.4)
-#dvo.loadRegion()
-
-logger.infoPair("Program...", "complete")
-