Changeset 34926

Timestamp:

Jan 15, 2013, 5:53:39 AM (14 years ago)

Author:

eugene

Message:

added some comments, clarified others

Location:

branches/eam_branches/ipp-20121219/ippToPsps/jython

Files:

• batch.py (modified) (1 diff)
• detectionbatch.py (modified) (3 diffs)
• loader.py (modified) (3 diffs)

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

@@ -64 +64 @@
             # now check that the fits header is readable
             if not self.header: 
-                logger.errorPair("Could not read FITS for id", "%d" % id)
+                logger.errorPair("Could not read FITS PHU for id", "%d" % id)
                 raise
 

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

@@ -89 +89 @@
        #self.endY = 8
 
-       # get a fre primary header values. if in test mode, then use defaults
+       # get a few primary header values. if in test mode, then use defaults
        if self.safeDictionaryAccessWithDefault(self.header, 'MJD-OBS', "1") == "NULL":
            self.logger.errorPair("Could not get", "MJD-OBS")
@@ -234 +234 @@
         except: pass
 
-        # insert all detections into table
+        # insert image metadata into table
         sql = "INSERT INTO " + tableName + " ( \
                frameID \
@@ -386 +386 @@
         except: pass
        
-        # delete all detections with PSF_INST_MAG < 17.5, as decreed by Gene
+        # delete all detections with PSF_INST_MAG < -17.5, as decreed by Gene
         BEFORE = self.scratchDb.getRowCount(ippTableName)
         #don't do this anymore

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

@@ -141 +141 @@
                     ids = self.ippToPspsDb.getPendingIdsForThisBox(boxId, batchType)
                 
+                    # ids are the stage_ids for items to be processed (eg, stack_id for a stack CMF, cam_id for P2 smf)
+
                     if len(ids) < 1: 
                         self.logger.debugPair("No " + batchType + " items found in this box", "skipping")
@@ -162 +164 @@
                         self.logger.infoPair("DVO to be ingested", "%.1f GB" % sizeToBeIngested)
                         self.logger.infoPair("smfs-per-GB", "%.1f" % smfsPerGB)
+
                         # should do we pre-ingest stuff from DVO?
+                        # NOTE EAM : this chunk 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
                         if batchType == 'P2' and smfsPerGB > 30:
                             if not self.dvoDetections.sync():
@@ -170 +176 @@
                             useFullTables = 1
                 
+                    '''
+                    NOTE EAM : "TheseItems" refers to each of the stack CMFs, camera SMFs, or object batches
+                    '''
                     self.logger.infoBool("Using pre-ingested DVO data?", useFullTables)
                     if not self.processTheseItems(batchType, ids, useFullTables):