Changeset 6556 for branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c

Timestamp:

Mar 8, 2006, 5:14:23 PM (20 years ago)

Author:

magnier

Message:

major rework of objects code

File:

• branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c (modified) (6 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourceIO_OBJ.c

@@ -1 @@
-# include "pmSource.h"
+/** @file  pmSourceIO.c
+ *
+ *  @author EAM, IfA
+ *
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-03-09 03:14:23 $
+ *
+ *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include <string.h>
+#include "pslib.h"
+#include "psLine.h"
+#include "psEllipse.h"
+#include "pmHDU.h"
+#include "pmFPA.h"
+#include "pmPeaks.h"
+#include "pmMoments.h"
+#include "pmGrowthCurve.h"
+#include "pmModel.h"
+#include "pmPSF.h"
+#include "pmSource.h"
+#include "pmModelGroup.h"
+#include "pmSourceIO.h"
 
 // dophot-style output list with fixed line width
@@ -8 +34 @@
     psF32 *PAR, *dPAR;
     float dmag, apResid;
+    EllipseShape shape;
+    EllipseAxes axes;
 
     psTimerStart ("string");
@@ -22 +50 @@
     for (int i = 0; i < sources->n; i++) {
         pmSource *source = (pmSource *) sources->data[i];
-        pmModel *model = pmModelSelect (source);
+        pmModel *model = pmSourceSelectModel (source);
         if (model == NULL)
             continue;
@@ -31 +59 @@
         dmag = dPAR[1] / PAR[1];
         type = pmSourceDophotType (source);
-        apResid = source->apMag - source->fitMag;
+        if ((source->apMag < 99.0) && (source->psfMag < 99.0)) {
+            apResid = source->apMag - source->psfMag;
+        } else {
+            apResid = 0.0;
+        }
+
+        shape.sx  = PAR[4];
+        shape.sy  = PAR[5];
+        shape.sxy = PAR[6];
+        axes = EllipseShapeToAxes (shape);
 
         psLineInit (line);
@@ -37 +74 @@
         psLineAdd (line, "%8.2f", PAR[2]);
         psLineAdd (line, "%8.2f", PAR[3]);
-        psLineAdd (line, "%8.3f", source->fitMag);
+        psLineAdd (line, "%8.3f", source->psfMag);
         psLineAdd (line, "%6.3f", dmag);
         psLineAdd (line, "%9.2f", PAR[0]);
-        psLineAdd (line, "%9.3f", PAR[4]);
-        psLineAdd (line, "%9.3f", PAR[5]);
-        psLineAdd (line, "%7.2f", PAR[6]);
-        psLineAdd (line, "%8.3f", 99.999);
+        psLineAdd (line, "%9.3f", axes.major);
+        psLineAdd (line, "%9.3f", axes.minor);
+        psLineAdd (line, "%7.2f", axes.theta);
+        psLineAdd (line, "%8.3f", source->extMag);
         psLineAdd (line, "%8.3f", source->apMag);
         psLineAdd (line, "%8.2f\n", apResid);
@@ -50 +87 @@
     fclose (f);
     psFree (line);
-    fprintf (stderr, "%f seconds for %d objects with psLine\n", psTimerMark ("string"), (int)sources->n);
-
-    psTimerStart ("string");
-
-    f = fopen ("test.obj", "w");
-    if (f == NULL) {
-        psLogMsg ("WriteSourceOBJ", 3, "can't open output file for output %s\n", "test.obj");
-        return false;
-    }
-
-    char *string;
-    // write sources with models
-    for (int i = 0; i < sources->n; i++) {
-        pmSource *source = (pmSource *) sources->data[i];
-        pmModel *model = pmModelSelect (source);
-        if (model == NULL)
-            continue;
-
-        PAR = model->params->data.F32;
-        dPAR = model->dparams->data.F32;
-
-        dmag = dPAR[1] / PAR[1];
-        type = pmSourceDophotType (source);
-        apResid = source->apMag - source->fitMag;
-
-        string = NULL;
-        psStringAppend (&string, "%3d",   type);
-        psStringAppend (&string, "%8.2f", PAR[2]);
-        psStringAppend (&string, "%8.2f", PAR[3]);
-        psStringAppend (&string, "%8.3f", source->fitMag);
-        psStringAppend (&string, "%6.3f", dmag);
-        psStringAppend (&string, "%9.2f", PAR[0]);
-        psStringAppend (&string, "%9.3f", PAR[4]);
-        psStringAppend (&string, "%9.3f", PAR[5]);
-        psStringAppend (&string, "%7.2f", PAR[6]);
-        psStringAppend (&string, "%8.3f", 99.999);
-        psStringAppend (&string, "%8.3f", source->apMag);
-        psStringAppend (&string, "%8.2f\n", apResid);
-        fwrite (string, 1, strlen(string), f);
-        psFree (string);
-    }
-    fclose (f);
-    fprintf (stderr, "%f seconds for %d objects with psString\n", psTimerMark ("string"), (int)sources->n);
-
+    fprintf (stderr, "%f seconds for %d objects\n", psTimerMark ("string"), (int)sources->n);
     return true;
 }
-
-// XXX should we use psStringAppend or psLineAdd?