Changeset 35076 for branches/eam_branches/ipp-20121219/ippToPsps/jython/loader.py

Timestamp:

Jan 31, 2013, 4:13:09 PM (13 years ago)

Author:

eugene

Message:

split out config (static info) and skychunk (area being processed)

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/loader.py (modified) (11 diffs)

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

@@ -34 +34 @@
         super(Loader, self).__init__(argv, 1, 1)
 
-        if self.config.parallel:
+        if self.skychunk.parallel:
             print "PARALLEL dvo"
         else: 
@@ -57 +57 @@
        
         # create Datastore objects
-        self.datastore = Datastore(self.logger, self.config, self.ippToPspsDb)
+        self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
 
         # if an IN batch is requested, create and quit
@@ -65 +65 @@
                batch = InitBatch(self.logger, 
                        self.config, 
+                       self.skychunk, 
                        self.gpc1Db, 
                        self.ippToPspsDb, 
@@ -77 +78 @@
     
 
-        # if an IN batch is requested, create and quit
+        # if the 'once' option is passed, we do not loop multiple times in 'run'
         self.onePassOnly = 0
         if len(sys.argv) > 2 and sys.argv[2] == "once":
@@ -85 +86 @@
         self.parsePollTimeArg("0.0166")
 
-        self.config.printAll()
+        self.skychunk.printAll()
 
     '''
     Overrides base-class version so we can ensure our scratch Db is using the right DVO Db
     '''
-    def refreshConfig(self):
-
-        ret = super(Loader, self).refreshConfig()
+    def refreshSkychunk(self):
+
+        ret = super(Loader, self).refreshSkychunk()
         try: self.scratchDb
         except: return ret
            
-        self.dvoDetections = DvoDetections(self.logger, self.config, self.scratchDb.dbName)
+        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.scratchDb.dbName)
 
         return ret
 
     '''
-    Overrides base_class version so we can break out of processing loops if the config changes
+    Overrides base_class version so we can break out of processing loops if the skychunk changes
     '''
     def checkClientStatus(self):
 
-        oldConfigName = self.config.name
+        oldSkychunkName = self.skychunk.name
         super(Loader, self).checkClientStatus()
-        if oldConfigName != self.config.name:
-            self.logger.infoPair("Config changed",  "from '" + oldConfigName + "' to '" + self.config.name + "'")
-            self.config.printAll()
+        if oldSkychunkName != self.skychunk.name:
+            self.logger.infoPair("Skychunk changed",  "from '" + oldSkychunkName + "' to '" + self.skychunk.name + "'")
+            self.skychunk.printAll()
             return False
 
@@ -125 +126 @@
 
             abort = False
-            for batchType in self.config.batchTypes:
+            for batchType in self.skychunk.batchTypes:
 
                 # get a stripe's worth of box IDs
@@ -161 +162 @@
                     self.logger.infoPair("Box dimensions", "%.1f / %.1f / %.1f" % (boxDim['RA'], boxDim['DEC'], boxDim['SIDE']))
                     self.logger.infoPair(batchType + " items found in this box", "%d" % len(ids))
-                    boxSizeWithBorder = boxDim['SIDE'] + (self.config.BORDER * 2)
+                    boxSizeWithBorder = boxDim['SIDE'] + (self.skychunk.BORDER * 2)
                     boxSizeSansBorder = boxDim['SIDE']
                     self.logger.infoPair("got here", "ok")
@@ -179 +180 @@
 
                             # should do we pre-ingest stuff from DVO?
-                            # NOTE EAM : this chunk loads the dvo detections into the mysql db
+                            # NOTE EAM : this skychunk loads the dvo detections into the mysql db
                             # XXXX EAM : this should happen for both P2 and Stack detection
                             # XXXX EAM : in parallel model, this should happen for all P2 & Stack batches
@@ -250 +251 @@
                     batch = DetectionBatch(self.logger,
                             self.config,
+                            self.skychunk,
                             self.gpc1Db,
                             self.ippToPspsDb,
@@ -259 +261 @@
                     batch = StackBatch(self.logger,
                             self.config,
+                            self.skychunk,
                             self.gpc1Db,
                             self.ippToPspsDb,
@@ -269 +272 @@
                     batch = ObjectBatch(self.logger,
                             self.config,
+                            self.skychunk,
                             self.gpc1Db,
                             self.ippToPspsDb,