Changeset 34441 for trunk

Timestamp:

Sep 14, 2012, 12:17:39 PM (14 years ago)

Author:

heather

Message:

changes for SA9 - mostly filling in empty columns and fixing known broken stuff

Location:

trunk/ippToPsps/jython

Files:

• objectbatch.py (modified) (4 diffs)
• scratchdb.py (modified) (1 diff)
• stackbatch.py (modified) (8 diffs)

trunk/ippToPsps/jython/objectbatch.py

@@ -124 +124 @@
                    ," + filter[1] + "StackPSFFlux = FLUX_PSF \
                    ," + filter[1] + "StackPSFFluxErr = FLUX_PSF_ERR \
-                   ," + filter[1] + "StackKronMag = -2.5 * log10(FLUX_KRON) -8.9 \
+                   ," + filter[1] + "StackKronMag = -2.5 * log10(FLUX_KRON) + 8.9 \
                    ," + filter[1] + "StackKronMagErr = FLUX_KRON_ERR / FLUX_KRON \
                    ," + filter[1] + "20pct = MAG_20/1000 \
                    ," + filter[1] + "80pct = MAG_80/1000 \
-                   "
+                   ," + filter[1] + "Flags = FLAGS "  
+                   
             
             self.scratchDb.execute(sql)
@@ -141 +142 @@
                    WHERE " + filter[1] + "MeanPSFMagErr > " + str(cut)
             self.scratchDb.execute(sql)
+
+        self.logger.infoPair("Setting to NULL all x20pct =", "32.767" ) 
+        for filter in filters:
+            sql  = "UPDATE Object \
+                   SET " + filter[1] + "20pct = null \
+                   WHERE " + filter[1] + "20pct > 32.766"
+            self.scratchDb.execute(sql)
+        self.logger.infoPair("Setting to NULL all x80pct =", "32.767" )
+        for filter in filters:
+            sql  = "UPDATE Object \
+                    SET " + filter[1] + "80pct = null \
+                    WHERE " + filter[1] + "80pct > 32.766"
+            self.scratchDb.execute(sql)
+
+
+
 
     '''
@@ -187 +204 @@
                ,decErr \
                ,nDetections \
+               ,extra \
+               ,sgSep \
                ,dataRelease \
                ) \
@@ -200 +219 @@
                ,DEC_ERR \
                ,NMEASURE \
+               ,PSF_QF_PERF \
+               ,STARGAL_SEP \
                , " + str(self.config.dataRelease) + "\
                FROM " + cptTableName

trunk/ippToPsps/jython/scratchdb.py

@@ -391 +391 @@
         except: 
             self.logger.error("Unable to create DVO detection database table")
-
+        self.makeColumnUnique("dvoDetection", "objID") 
 
     '''

trunk/ippToPsps/jython/stackbatch.py

@@ -374 +374 @@
                ,PSF_THETA \
                ,psfLikelihood(EXT_NSIGMA) \
-               ,FLAGS << 32 | FLAGS2 \
+               ,FLAGS2 << 32 | FLAGS \
                ,PSF_QF \
                ,MOMENTS_XX \
@@ -389 +389 @@
                ,KRON_FLUX / " + str(self.expTime) + " \
                ,KRON_FLUX_ERR / " + str(self.expTime) + " \
-               , NULL \
+               , MOMENTS_R1 * 2.5 \
                , NULL \
                ,N_FRAMES \
@@ -395 +395 @@
                ," + self.historyModNum + " \
                FROM SkyChip_psf"
-
-        self.scratchDb.execute(sql)
+        self.scratchDb.execute(sql)
+        
         #it is possible to drop some detections from dvo (that are present in the cmf). when that happens we get a 0 for objid
         #we drop those...
@@ -402 +402 @@
         self.scratchDb.execute(sql)
         self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")
-
+        
         self.scratchDb.updateAllRows("StackDetection", "surveyID", str(self.surveyID))
+        
         self.scratchDb.updateFilterID("StackDetection", self.filter)
+        
         self.scratchDb.updateAllRows("StackDetection", "dataRelease", str(self.config.dataRelease))
+        
         self.scratchDb.updateAllRows("StackDetection", "primaryF", "0")
+        
         self.scratchDb.updateAllRows("StackDetection", "activeFlag", "0")
+        
         self.updateStackMetaID("StackDetection")
+        
         self.updateStackTypeID("StackDetection")
+        
         self.updateDvoIDs("StackDetection")
+        
         sql = "ALTER IGNORE TABLE StackDetection ADD PRIMARY KEY (objID)"
+        
         self.scratchDb.execute(sql)
   
@@ -422 +431 @@
                    AND a.ippDetectID = b.IPP_IDET  \
                    AND b.PSF_INST_FLUX_SIG IS NOT NULL"
+            
             self.scratchDb.execute(sql)
             
+        
         self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "instFlux")
+        
         self.scratchDb.reportAndDeleteRowsWithNULLS("StackDetection", "objID")
+        
         sql="DELETE FROM StackDetection where objID = 0"
-        self.scratchDb.execute(sql)
-        self.logger.infoPair("Deleting", "entries with StackDetection.objID = 0")
-
+        
+        self.scratchDb.execute(sql)
+        self.logger.infoPair("Delleting", "entries with StackDetection.objID = 0")
+        
 
     '''
@@ -600 +614 @@
 
         self.logger.debug("Altering PSPS tables")
+        # heather uncommented the unique line -- well that no worky
         #self.scratchDb.makeColumnUnique("StackDetection", "objID")
         self.scratchDb.createIndex("StackDetection", "ippDetectID")
@@ -624 +639 @@
     '''
     def updateDvoIDs(self, table):
-
+        self.logger.infoPair("getting","imageID")
         imageID = self.scratchDb.getImageIDFromExternID(self.header['IMAGEID'])
+        self.logger.infoPair("obtained","imageID")
         self.logger.debug("Updating table '" + table + "' with DVO IDs...")
         sql = "UPDATE " + table + " AS a, " + self.scratchDb.dvoDetectionTable + " AS b SET \
@@ -633 +649 @@
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)
-        self.scratchDb.execute(sql)
-
+        
+        self.scratchDb.execute(sql)
+        
     '''
     Does the processing, i.e. pulling stuff from IPP tables into PSPS tables