Changeset 35738

Timestamp:

Jul 2, 2013, 4:59:43 PM (13 years ago)

Author:

heather

Message:

added primaryF to be properly inserted

File:

• trunk/ippToPsps/jython/stackbatch.py (modified) (7 diffs)

trunk/ippToPsps/jython/stackbatch.py

@@ -455 +455 @@
                ,psfQf \
                ,psfQfPerfect \
+               ,psfChiSq \
                ,momentXX \
                ,momentXY \
@@ -469 +470 @@
                ,kronFluxErr \
                ,kronRad \
-               ,psfChiSq \
                ,nFrames \
                ,assocDate \
@@ -495 +495 @@
                ,PSF_QF \
                ,PSF_QF_PERFECT \
+               ,PSF_CHISQ / PSF_NDOF \
                ,MOMENTS_XX \
                ,MOMENTS_XY \
@@ -509 +510 @@
                ,KRON_FLUX_ERR / " + str(self.expTime) + " \
                ,MOMENTS_R1 * 2.5 \
-               ,PSF_CHISQ / PSF_NDOF \
                ,N_FRAMES \
                , '" + self.dateStr + "' \
@@ -543 +543 @@
         
         self.scratchDb.updateAllRows("StackDetection", "dataRelease", str(self.skychunk.dataRelease))
-        
+        #set primary F to 0
         self.scratchDb.updateAllRows("StackDetection", "primaryF", "0")
         
@@ -553 +553 @@
         
         self.updateDvoIDsAndFlags("StackDetection")
+        #this now updates primary F as well
         # response = raw_input("updated dvo ")
         
@@ -943 +944 @@
                a.objID = b.objID, \
                a.infoFlag = b.flags << 45 | a.infoFlag \
+               a.primaryF = b.flags & 0x10000 \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)