Changeset 40294 for trunk

Timestamp:

Dec 13, 2017, 4:40:20 PM (9 years ago)

Author:

eugene

Message:

add infoFlag4

Location:

trunk/ippToPsps

Files:

• config/tables.ST.vot (modified) (5 diffs)
• jython/scratchdb.py (modified) (1 diff)
• jython/stackbatch.py (modified) (1 diff)

trunk/ippToPsps/config/tables.ST.vot

@@ -234 +234 @@
         <DESCRIPTION>Information flag bitmask indicating details of the g filter stack photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
       </FIELD>
+      <FIELD name="ginfoFlag4" arraysize="1" datatype="int" unit="dimensionless" default="0">
+        <DESCRIPTION>Information flag bitmask indicating details of the g filter stack photometry.  Values listed in ObjectFilterFlags.</DESCRIPTION>
+      </FIELD>
       <FIELD name="gnFrames" arraysize="1" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>Number of input frames/exposures contributing to the g filter stack detection.</DESCRIPTION>
@@ -290 +293 @@
         <DESCRIPTION>Information flag bitmask indicating details of the r filter stack photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
       </FIELD>
+      <FIELD name="rinfoFlag4" arraysize="1" datatype="int" unit="dimensionless" default="0">
+        <DESCRIPTION>Information flag bitmask indicating details of the r filter stack photometry.  Values listed in ObjectFilterFlags.</DESCRIPTION>
+      </FIELD>
       <FIELD name="rnFrames" arraysize="1" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>Number of input frames/exposures contributing to the r filter stack detection.</DESCRIPTION>
@@ -346 +352 @@
         <DESCRIPTION>Information flag bitmask indicating details of the i filter stack photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
       </FIELD>
+      <FIELD name="iinfoFlag4" arraysize="1" datatype="int" unit="dimensionless" default="0">
+        <DESCRIPTION>Information flag bitmask indicating details of the i filter stack photometry.  Values listed in ObjectFilterFlags.</DESCRIPTION>
+      </FIELD>
       <FIELD name="inFrames" arraysize="1" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>Number of input frames/exposures contributing to the i filter stack detection.</DESCRIPTION>
@@ -402 +411 @@
         <DESCRIPTION>Information flag bitmask indicating details of the z filter stack photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
       </FIELD>
+      <FIELD name="zinfoFlag4" arraysize="1" datatype="int" unit="dimensionless" default="0">
+        <DESCRIPTION>Information flag bitmask indicating details of the z filter stack photometry.  Values listed in ObjectFilterFlags.</DESCRIPTION>
+      </FIELD>
       <FIELD name="znFrames" arraysize="1" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>Number of input frames/exposures contributing to the z filter stack detection.</DESCRIPTION>
@@ -457 +469 @@
       <FIELD name="yinfoFlag3" arraysize="1" datatype="int" unit="dimensionless" default="0">
         <DESCRIPTION>Information flag bitmask indicating details of the y filter stack photometry.  Values listed in DetectionFlags3.</DESCRIPTION>
+      </FIELD>
+      <FIELD name="yinfoFlag4" arraysize="1" datatype="int" unit="dimensionless" default="0">
+        <DESCRIPTION>Information flag bitmask indicating details of the y filter stack photometry.  Values listed in ObjectFilterFlags.</DESCRIPTION>
       </FIELD>
       <FIELD name="ynFrames" arraysize="1" datatype="int" unit="dimensionless" default="-999">

trunk/ippToPsps/jython/scratchdb.py

@@ -655 +655 @@
                flags INT, \
                objflags INT, \
+               filtflags INT, \
                PRIMARY KEY (imageID, ippDetectID), \
                KEY (objID, detectID), \

trunk/ippToPsps/jython/stackbatch.py

@@ -443 +443 @@
           
             sqlLine.group("a."+filter+"infoFlag3",     "b.flags")
+            sqlLine.group("a."+filter+"infoFlag4",     "b.filtflags")
             sql = sqlLine.makeEquals("WHERE a.objID = b.objID AND a." + filter + "ippDetectID = b.ippDetectID AND b.imageID = " + str(imageID))