Changeset 12445 for trunk/psModules/src/objects

Timestamp:

Mar 15, 2007, 10:44:25 AM (19 years ago)

Author:

magnier

Message:

update to conform with ICD

File:

• trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c (modified) (7 diffs)

trunk/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-11 18:56:38 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-15 20:44:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -45 +45 @@
     psArray *table;
     psMetadata *row;
-    int i, type;
+    int i;
     psF32 *PAR, *dPAR;
-    float lsky;
-    bool status;
     psEllipseShape shape;
     psEllipseAxes axes;
-
-    // find config information for output header
-    float ZERO_POINT = psMetadataLookupF32 (&status, header, "ZERO_PT");
 
     table = psArrayAllocEmpty (sources->n);
@@ -66 +61 @@
         dPAR = model->dparams->data.F32;
 
-        type = pmSourceDophotType (source);
-        lsky = (source->sky < 1.0) ? 0.0 : log10(source->sky);
-
         shape.sx  = PAR[PM_PAR_SXX];
         shape.sy  = PAR[PM_PAR_SYY];
@@ -74 +66 @@
         axes = psEllipseShapeToAxes (shape, 20.0);
 
-        peakMag = (source->peak->flux > 0) ? -2.5*log(source->peak->flux) : NAN;
-        nImageOverlap = 1;
-        ID = 0; // XXX need to figure out how to generate this
+        float peakMag = (source->peak->flux > 0) ? -2.5*log(source->peak->flux) : NAN;
+        psS16 nImageOverlap = 1;
+        psS32 ID = 0; // XXX need to figure out how to generate this
 
         row = psMetadataAlloc ();
-        psMetadataAdd (row, PS_LIST_TAIL, "IPP_IDET",         PS_DATA_S64, "IPP detection identifier index",             ID);
+        psMetadataAdd (row, PS_LIST_TAIL, "IPP_IDET",         PS_DATA_U32, "IPP detection identifier index",             ID);
         psMetadataAdd (row, PS_LIST_TAIL, "X_PSF",            PS_DATA_F32, "PSF x coordinate",                           PAR[PM_PAR_XPOS]);
         psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF",            PS_DATA_F32, "PSF y coordinate",                           PAR[PM_PAR_YPOS]);
@@ -99 +91 @@
         psMetadataAdd (row, PS_LIST_TAIL, "PSF_QF",           PS_DATA_F32, "PSF coverage/quality factor",                source->pixWeight);
         // XXX not sure how to get this : need to load Nimages with weight
-        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_S32, "Number of frames overlapping source center", nImageOverlap);
+        psMetadataAdd (row, PS_LIST_TAIL, "N_FRAMES",         PS_DATA_U16, "Number of frames overlapping source center", nImageOverlap);
+        psMetadataAdd (row, PS_LIST_TAIL, "DUMMY",            PS_DATA_U16, "padding", 0);
 
         // XXX these calibrated values are not supplied by psphot analysis
@@ -138 +131 @@
     psEllipseShape shape;
     psEllipseAxes axes;
-    float lsky;
 
     // define PSF model type
@@ -147 +139 @@
         modelType = pmModelSetType (PSF_NAME);
     }
-
-    // find config information for output header
-    float ZERO_POINT = psMetadataLookupF32 (&status, header, "ZERO_PT");
-    if (!status)
-        ZERO_POINT = 25.0;
 
     psArray *table = psFitsReadTable (fits);