Changeset 35748 for branches/eam_branches/ipp-20130509/ippToPsps/jython/stackbatch.py

Timestamp:

Jul 3, 2013, 1:44:20 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130509/ippToPsps

Files:

• . (modified) (1 prop)
• jython/stackbatch.py (modified) (9 diffs)

branches/eam_branches/ipp-20130509/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 \
@@ -504 +505 @@
                ,MOMENTS_R1 \
                ,MOMENTS_RH \
-               ,AP_FLUX / " + str(self.expTime) + " \
+               ,POW(10.0, -0.4*AP_MAG) / " + str(self.expTime) + " \
                ,NULL \
                ,KRON_FLUX / " + str(self.expTime) + " \
                ,KRON_FLUX_ERR / " + str(self.expTime) + " \
                ,MOMENTS_R1 * 2.5 \
-               ,PSF_CHISQ / PSF_NDOF \
                ,N_FRAMES \
                , '" + self.dateStr + "' \
@@ -520 +520 @@
 #               ,POW(10.0, -0.4*AP_MAG) / " + str(self.expTime) + " 
 
+# I need a way to choose the sql above based on the cmf version: V3 (LAP.PV1) does not have AP_FLUX
+#               ,AP_FLUX / " + str(self.expTime) + " 
+
         # print "sql: ", sql
         # response = raw_input("ready to insert stack det ")
@@ -540 +543 @@
         
         self.scratchDb.updateAllRows("StackDetection", "dataRelease", str(self.skychunk.dataRelease))
-        
+        #set primary F to 0
         self.scratchDb.updateAllRows("StackDetection", "primaryF", "0")
         
@@ -550 +553 @@
         
         self.updateDvoIDsAndFlags("StackDetection")
+        #this now updates primary F as well
         # response = raw_input("updated dvo ")
         
@@ -725 +729 @@
 
         # now update StackMeta with correct number of inputs
-        sql = "UPDATE StackMeta SET nP2Images = (SELECT COUNT(*) FROM StackToImage)"
+        sql = "UPDATE StackMeta SET nP2Images = (SELECT COUNT(distinct(floor(imageID/100))) FROM StackToImage)"
         self.scratchDb.execute(sql)
 
@@ -940 +944 @@
                a.objID = b.objID, \
                a.infoFlag = b.flags << 45 | a.infoFlag \
+               a.primaryF = ((b.flags & 0x10000) >> 16 ) \
                WHERE a.ippDetectID = b.ippDetectID \
                AND b.imageID = " + str(imageID)