Changeset 28549

Timestamp:

Jun 29, 2010, 1:57:54 PM (16 years ago)

Author:

rhenders

Message:

Updating with recent PSPS schema changes (moments and detectorID)

Location:

trunk/ippToPsps

Files:

• config/detection/tables.xml (modified) (2 diffs)
• src/ippToPspsDetEnums.h (modified) (2 diffs)

trunk/ippToPsps/config/detection/tables.xml

@@ -79 +79 @@
     <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
     <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" average PSF parameters from moments (unit = arcsec)"></column>
-    <column name="momentTheta" type="TFLOAT" default="-999" comment=" average PSF parametets from moments (unit = deg)"></column>
     <column name="apResid" type="TFLOAT" default="-999" comment="corrected aperture residual"></column>
     <column name="dapResid" type="TFLOAT" default="-999" comment="scatter of aperture corrections"></column>
-    <column name="detectorID" type="TSHORT" default="-999" comment="identifier for actual CCD chip"></column>
+    <column name="detectorID" type="TSTRING" default=" " comment="identifier for actual CCD chip"></column>
     <column name="qaFlags" type="TLONGLONG" default="-999" comment="Q/A flags for this OTA"></column>
     <column name="detrend1" type="TSTRING" default=" " comment="identifier of detrend image 1"></column>
@@ -144 +143 @@
     <column name="psfLikelihood" type="TFLOAT" default="-999" comment="PSF likelihood"></column>
     <column name="psfCf" type="TFLOAT" default="-999" comment="PSF coverage factor"></column>
-    <column name="momentWidMajor" type="TFLOAT" default="-999" comment=" PSF width in major axis from moments (unit = arcsec)"></column>
-    <column name="momentWidMinor" type="TFLOAT" default="-999" comment=" PSF width in minot axis from moments (unit = arcsec)"></column>
-    <column name="momentTheta" type="TFLOAT" default="-999" comment=" PSF orientation angle from moments (unit = deg)"></column>
+    <column name="momentXX" type="TFLOAT" default="-999" comment=" moment XX (unit = arcsec)"></column>
+    <column name="momentXY" type="TFLOAT" default="-999" comment=" moment XY (unit = arcsec)"></column>
+    <column name="momentYY" type="TFLOAT" default="-999" comment=" momeny YY (unit = arcsec)"></column>
     <column name="crLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is a cosmic ray"></column>
     <column name="extendedLikelihood" type="TFLOAT" default="-999" comment="Likelihood the source is extended"></column>

trunk/ippToPsps/src/ippToPspsDetEnums.h

@@ -81 +81 @@
   IMAGEMETA_MOMENTWIDMAJOR = 25,
   IMAGEMETA_MOMENTWIDMINOR = 26,
-  IMAGEMETA_MOMENTTHETA = 27,
-  IMAGEMETA_APRESID = 28,
-  IMAGEMETA_DAPRESID = 29,
-  IMAGEMETA_DETECTORID = 30,
-  IMAGEMETA_QAFLAGS = 31,
-  IMAGEMETA_DETREND1 = 32,
-  IMAGEMETA_DETREND2 = 33,
-  IMAGEMETA_DETREND3 = 34,
-  IMAGEMETA_DETREND4 = 35,
-  IMAGEMETA_DETREND5 = 36,
-  IMAGEMETA_DETREND6 = 37,
-  IMAGEMETA_DETREND7 = 38,
-  IMAGEMETA_DETREND8 = 39,
-  IMAGEMETA_PHOTOZERO = 40,
-  IMAGEMETA_CTYPE1 = 41,
-  IMAGEMETA_CTYPE2 = 42,
-  IMAGEMETA_CRVAL1 = 43,
-  IMAGEMETA_CRVAL2 = 44,
-  IMAGEMETA_CRPIX1 = 45,
-  IMAGEMETA_CRPIX2 = 46,
-  IMAGEMETA_CDELT1 = 47,
-  IMAGEMETA_CDELT2 = 48,
-  IMAGEMETA_PC001001 = 49,
-  IMAGEMETA_PC001002 = 50,
-  IMAGEMETA_PC002001 = 51,
-  IMAGEMETA_PC002002 = 52,
-  IMAGEMETA_POLYORDER = 53,
-  IMAGEMETA_PCA1X3Y0 = 54,
-  IMAGEMETA_PCA1X2Y1 = 55,
-  IMAGEMETA_PCA1X1Y2 = 56,
-  IMAGEMETA_PCA1X0Y3 = 57,
-  IMAGEMETA_PCA1X2Y0 = 58,
-  IMAGEMETA_PCA1X1Y1 = 59,
-  IMAGEMETA_PCA1X0Y2 = 60,
-  IMAGEMETA_PCA2X3Y0 = 61,
-  IMAGEMETA_PCA2X2Y1 = 62,
-  IMAGEMETA_PCA2X1Y2 = 63,
-  IMAGEMETA_PCA2X0Y3 = 64,
-  IMAGEMETA_PCA2X2Y0 = 65,
-  IMAGEMETA_PCA2X1Y1 = 66,
-  IMAGEMETA_PCA2X0Y2 = 67,
-  IMAGEMETA_CALIBMODNUM = 68,
-  IMAGEMETA_DATARELEASE = 69,
+  IMAGEMETA_APRESID = 27,
+  IMAGEMETA_DAPRESID = 28,
+  IMAGEMETA_DETECTORID = 29,
+  IMAGEMETA_QAFLAGS = 30,
+  IMAGEMETA_DETREND1 = 31,
+  IMAGEMETA_DETREND2 = 32,
+  IMAGEMETA_DETREND3 = 33,
+  IMAGEMETA_DETREND4 = 34,
+  IMAGEMETA_DETREND5 = 35,
+  IMAGEMETA_DETREND6 = 36,
+  IMAGEMETA_DETREND7 = 37,
+  IMAGEMETA_DETREND8 = 38,
+  IMAGEMETA_PHOTOZERO = 39,
+  IMAGEMETA_CTYPE1 = 40,
+  IMAGEMETA_CTYPE2 = 41,
+  IMAGEMETA_CRVAL1 = 42,
+  IMAGEMETA_CRVAL2 = 43,
+  IMAGEMETA_CRPIX1 = 44,
+  IMAGEMETA_CRPIX2 = 45,
+  IMAGEMETA_CDELT1 = 46,
+  IMAGEMETA_CDELT2 = 47,
+  IMAGEMETA_PC001001 = 48,
+  IMAGEMETA_PC001002 = 49,
+  IMAGEMETA_PC002001 = 50,
+  IMAGEMETA_PC002002 = 51,
+  IMAGEMETA_POLYORDER = 52,
+  IMAGEMETA_PCA1X3Y0 = 53,
+  IMAGEMETA_PCA1X2Y1 = 54,
+  IMAGEMETA_PCA1X1Y2 = 55,
+  IMAGEMETA_PCA1X0Y3 = 56,
+  IMAGEMETA_PCA1X2Y0 = 57,
+  IMAGEMETA_PCA1X1Y1 = 58,
+  IMAGEMETA_PCA1X0Y2 = 59,
+  IMAGEMETA_PCA2X3Y0 = 60,
+  IMAGEMETA_PCA2X2Y1 = 61,
+  IMAGEMETA_PCA2X1Y2 = 62,
+  IMAGEMETA_PCA2X0Y3 = 63,
+  IMAGEMETA_PCA2X2Y0 = 64,
+  IMAGEMETA_PCA2X1Y1 = 65,
+  IMAGEMETA_PCA2X0Y2 = 66,
+  IMAGEMETA_CALIBMODNUM = 67,
+  IMAGEMETA_DATARELEASE = 68,
 } ImageMeta;
 
@@ -147 +146 @@
   DETECTION_PSFLIKELIHOOD = 19,
   DETECTION_PSFCF = 20,
-  DETECTION_MOMENTWIDMAJOR = 21,
-  DETECTION_MOMENTWIDMINOR = 22,
-  DETECTION_MOMENTTHETA = 23,
+  DETECTION_MOMENTXX = 21,
+  DETECTION_MOMENTXY = 22,
+  DETECTION_MOMENTYY = 23,
   DETECTION_CRLIKELIHOOD = 24,
   DETECTION_EXTENDEDLIKELIHOOD = 25,