Changeset 34839 for branches/eam_branches/ipp-20121130/ippToPsps/jython/objectbatch.py

Timestamp:

Dec 18, 2012, 5:57:19 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/ippToPsps

Files:

• . (modified) (1 prop)
• jython/objectbatch.py (modified) (5 diffs)

branches/eam_branches/ipp-20121130/ippToPsps/jython/objectbatch.py

@@ -134 +134 @@
                    ," + filter[1] + "80pct = MAG_80/1000 \
                    ," + filter[1] + "Flags = (0x7fff & FLAGS) | ((FLAGS >> 11) & 0x2000) \
-                   ," + filter[1] + "StackDetectID = STACK_DETECT_ID + " + str(filterID)
+                   ," + filter[1] + "StackDetectID = STACK_DETECT_ID"
 
             #self.logger.info(sql)
@@ -236 +236 @@
                ,ippObjID \
                ,objInfoFlag \
-               ,varFlag \
+               ,qualityFlag \
                ,surveyID \
                ,ra \
@@ -246 +246 @@
                ,sgSep \
                ,dataRelease \
+               ,Random \
                ) \
                SELECT \
@@ -251 +252 @@
                ,CAT_ID*1000000000 + OBJ_ID \
                ,FLAGS \
-               ,0 \
+               ,FLAGS >> 24 & 0xFF \
                ," + str(self.surveyID) + " \
                ,RA \
@@ -257 +258 @@
                ,RA_ERR \
                ,DEC_ERR \
-               ,NMEASURE \
+               ,0 \
                ,PSF_QF_PERF \
                ,STARGAL_SEP \
                , " + str(self.config.dataRelease) + "\
+               , RAND() \
                FROM " + cptTableName