Changeset 34735 for branches/eam_branches/ipp-20120905/ippToPsps/jython/scratchdb.py

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippToPsps/jython/scratchdb.py (modified) (3 diffs)

branches/eam_branches/ipp-20120905/ippToPsps/jython/scratchdb.py

@@ -68 +68 @@
                DECLARE t REAL; \
                DECLARE z REAL; \
+               DECLARE s INT; \
+               SET s= SIGN(x); \
                SET x = ABS(x) / 1.4142135623731; \
                SET z=ABS(x); \
@@ -75 +77 @@
                SET ans = 2.0 - ans; \
                END IF; \
+               SET ans = ans * s; \
                RETURN ans; \
                END"
@@ -385 +388 @@
                objID BIGINT, \
                flags INT, \
+               zp REAL, \
+               zpErr REAL, \
+               airMass REAL, \
+               expTime REAL, \
+               ra FLOAT, \
+               dec_ FLOAT, \
+               raErr REAL, \
+               decErr REAL, \
                PRIMARY KEY (imageID, ippDetectID) \
                )"