Changeset 37246 for trunk/ippToPsps/config/tables.P2.vot

Timestamp:

Aug 12, 2014, 4:10:18 PM (12 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/ipp-20140717

File:

• trunk/ippToPsps/config/tables.P2.vot (modified) (5 diffs)

trunk/ippToPsps/config/tables.P2.vot

@@ -229 +229 @@
         <DESCRIPTION> model PSF parameters at chip center</DESCRIPTION>
       </FIELD>
-      <FIELD name="momentXX" arraysize="1" datatype="float" unit="pixels" default="-999">
-        <DESCRIPTION> moment XX</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentXY" arraysize="1" datatype="float" unit="pixels" default="-999">
-        <DESCRIPTION> moment XY</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentYY" arraysize="1" datatype="float" unit="pixels" default="-999">
-        <DESCRIPTION> moment YY</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentM3C" arraysize="1" datatype="float" unit="pixels squared" default="-999">
-        <DESCRIPTION> moment M3C</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentM3S" arraysize="1" datatype="float" unit="pixels squared" default="-999">
-        <DESCRIPTION> moment M3S</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentM4C" arraysize="1" datatype="float" unit="pixels squared" default="-999">
-        <DESCRIPTION> moment M4C</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentM4S" arraysize="1" datatype="float" unit="pixels squared" default="-999">
-        <DESCRIPTION> moment M4S</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentR1" arraysize="1" datatype="float" unit="pixels" default="-999">
-        <DESCRIPTION> moment R1</DESCRIPTION>
-      </FIELD>
-      <FIELD name="momentRH" arraysize="1" datatype="float" unit="sqrt pixels" default="-999">
-        <DESCRIPTION> moment RH</DESCRIPTION>
+      <FIELD name="momentMajor" arraysize="1" datatype="float" unit="pixels" default="-999">
+        <DESCRIPTION> PSF major axis sigma from 2nd moments </DESCRIPTION>
+      </FIELD>
+      <FIELD name="momentMinor" arraysize="1" datatype="float" unit="pixels" default="-999">
+        <DESCRIPTION> PSF minor axis sigma from 2nd moments</DESCRIPTION>
+      </FIELD>
+      <FIELD name="momentM2C" arraysize="1" datatype="float" unit="pixels squared" default="-999">
+        <DESCRIPTION> moment M2C</DESCRIPTION>
+      </FIELD>
+      <FIELD name="momentM2S" arraysize="1" datatype="float" unit="pixels squared" default="-999">
+        <DESCRIPTION> moment M2S</DESCRIPTION>
+      </FIELD>
+      <FIELD name="momentM3" arraysize="1" datatype="float" unit="pixels squared" default="-999">
+        <DESCRIPTION> moment M3</DESCRIPTION>
+      </FIELD>
+      <FIELD name="momentM4" arraysize="1" datatype="float" unit="pixels squared" default="-999">
+        <DESCRIPTION> moment M4</DESCRIPTION>
       </FIELD>
       <FIELD name="apResid" arraysize="1" datatype="float" unit="magnitude" default="-999">
@@ -392 +383 @@
         <DESCRIPTION>ODM object identifier</DESCRIPTION>
       </FIELD>
-      <FIELD name="gcobjID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
-        <DESCRIPTION>galactic coordinates ODM object identifier</DESCRIPTION>
-      </FIELD>
       <FIELD name="detectID" arraysize="1" datatype="long" unit="dimensionless" default="NA">
         <DESCRIPTION>ODM detection identifier</DESCRIPTION>
@@ -530 +518 @@
         <DESCRIPTION> Aperture fill factor</DESCRIPTION>
       </FIELD>
+      <FIELD name="apRadius" arraysize="1" datatype="float" unit="arcsec" default="-999">
+        <DESCRIPTION> Aperture radius</DESCRIPTION>
+      </FIELD>
       <FIELD name="kronFlux" arraysize="1" datatype="float" unit="adu/seconds" default="-999">
         <DESCRIPTION> Kron flux</DESCRIPTION>
@@ -539 +530 @@
         <DESCRIPTION> Kron radius</DESCRIPTION>
       </FIELD>
-      <FIELD name="kronRadErr" arraysize="1" datatype="float" unit="raw pixels" default="-999">
-        <DESCRIPTION> Kron radius error</DESCRIPTION>
-      </FIELD>
       <FIELD name="sky" arraysize="1" datatype="float" unit="adu/sec/pixel" default="-999">
         <DESCRIPTION> PSF sky level at source</DESCRIPTION>
@@ -548 +536 @@
         <DESCRIPTION> estimated error in sky</DESCRIPTION>
       </FIELD>
-      <FIELD name="infoFlag" arraysize="1" datatype="long" unit="dimensionless" default="-999">
+      <FIELD name="infoFlag" arraysize="1" datatype="int" unit="dimensionless" default="-999">
+        <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
+      </FIELD>
+      <FIELD name="infoFlag2" arraysize="1" datatype="int" unit="dimensionless" default="-999">
         <DESCRIPTION>flag indicating provenance information</DESCRIPTION>
       </FIELD>