Changeset 4949 for trunk/psphot/src/psphotOutput.c

Timestamp:

Sep 5, 2005, 8:44:00 PM (21 years ago)

Author:

eugene

Message:

adding pmObjects stuff

File:

• trunk/psphot/src/psphotOutput.c (modified) (18 diffs)

trunk/psphot/src/psphotOutput.c

@@ -52 +52 @@
 
     sprintf (name, "%s.psf.dat", filename);
-    psModelWritePSFs (sources, name);
+    pmModelWritePSFs (sources, name);
 
     sprintf (name, "%s.flt.dat", filename);
-    psModelWriteFLTs (sources, name);
+    pmModelWriteFLTs (sources, name);
 
     sprintf (name, "%s.nul.dat", filename);
-    psModelWriteNULLs (sources, name);
+    pmModelWriteNULLs (sources, name);
 
     sprintf (name, "%s.mnt.dat", filename);
-    psMomentsWriteText (sources, name);
+    pmMomentsWriteText (sources, name);
 
     psFree (name);
@@ -71 +71 @@
 
     int i, type, status;
-    psModel *model;
+    pmModel *model;
     psF32 *PAR, *dPAR;
     float sky, dmag, apMag, fitMag;
@@ -85 +85 @@
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
+        pmSource *source = (pmSource *) sources->data[i];
 
         // use the correct model
@@ -162 +162 @@
 
     int i, status, flags;
-    psModel *model;
+    pmModel *model;
     psF32 *PAR, *dPAR;
     float sky, dmag, apMag, fitMag;
@@ -176 +176 @@
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
+        pmSource *source = (pmSource *) sources->data[i];
         flags = 0;
 
@@ -260 +260 @@
 
     int i, type, status;
-    psModel *model;
+    pmModel *model;
     psF32 *PAR, *dPAR;
     float sky, dmag, apMag, fitMag, lsky, Theta;
@@ -282 +282 @@
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
+        pmSource *source = (pmSource *) sources->data[i];
 
         // use the correct model
@@ -395 +395 @@
 
 // write the moments to an output file 
-bool psMomentsWriteText (psArray *sources, char *filename) {
+bool pmMomentsWriteText (psArray *sources, char *filename) {
 
     int i;
     FILE *f;
-    psSource *source;
+    pmSource *source;
         
     f = fopen (filename, "w");
     if (f == NULL) {
-        psLogMsg ("psMomentsWriteText", 3, "can't open output file for moments%s\n", filename);
-        return false;
-    }
-
-    for (i = 0; i < sources->n; i++) {
-        source = (psSource *) sources->data[i];
+        psLogMsg ("pmMomentsWriteText", 3, "can't open output file for moments%s\n", filename);
+        return false;
+    }
+
+    for (i = 0; i < sources->n; i++) {
+        source = (pmSource *) sources->data[i];
         if (source->moments == NULL) continue;
         fprintf (f, "%5d %5d  %7.1f  %7.1f %7.1f  %6.3f %6.3f  %8.1f %7.1f %7.1f %7.1f  %4d %2d\n", 
@@ -423 +423 @@
 
 // dump the sources to an output file
-bool psModelWritePSFs (psArray *sources, char *filename) {
+bool pmModelWritePSFs (psArray *sources, char *filename) {
 
     double dP, flux;
@@ -430 +430 @@
     psVector *params;
     psVector *dparams;
-    psModel  *model;
+    pmModel  *model;
 
     f = fopen (filename, "w");
     if (f == NULL) {
-        psLogMsg ("psModelWritePSFs", 3, "can't open output file for moments%s\n", filename);
+        psLogMsg ("pmModelWritePSFs", 3, "can't open output file for moments%s\n", filename);
         return false;
     }
@@ -440 +440 @@
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
-        model = (psModel  *) source->modelPSF;
+        pmSource *source = (pmSource *) sources->data[i];
+        model = (pmModel  *) source->modelPSF;
         if (model == NULL) continue;
 
@@ -459 +459 @@
         dP = sqrt (dP);
         
-        psModelFlux modelFluxFunc = psModelFlux_GetFunction (model->type);
+        pmModelFlux modelFluxFunc = pmModelFlux_GetFunction (model->type);
         flux = modelFluxFunc (params);
 
@@ -489 +489 @@
 
 // dump the sources to an output file
-bool psModelWriteFLTs (psArray *sources, char *filename) {
+bool pmModelWriteFLTs (psArray *sources, char *filename) {
 
     double dP;
@@ -496 +496 @@
     psVector *params;
     psVector *dparams;
-    psModel  *model;
+    pmModel  *model;
 
     f = fopen (filename, "w");
     if (f == NULL) {
-        psLogMsg ("psModelWriteFLTs", 3, "can't open output file for moments%s\n", filename);
+        psLogMsg ("pmModelWriteFLTs", 3, "can't open output file for moments%s\n", filename);
         return false;
     }
@@ -506 +506 @@
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
-        model = (psModel  *) source->modelFLT;
+        pmSource *source = (pmSource *) sources->data[i];
+        model = (pmModel  *) source->modelFLT;
         if (model == NULL) continue;
         if (source->type == PS_SOURCE_GALAXY) goto valid;
@@ -551 +551 @@
 
 // dump the sources to an output file
-bool psModelWriteNULLs (psArray *sources, char *filename) 
+bool pmModelWriteNULLs (psArray *sources, char *filename) 
 {
 
@@ -563 +563 @@
     }
 
-    psMoments *empty = pmMomentsAlloc ();
+    pmMoments *empty = pmMomentsAlloc ();
 
     // write sources with models first 
     for (i = 0; i < sources->n; i++) {
-        psSource *source = (psSource *) sources->data[i];
+        pmSource *source = (pmSource *) sources->data[i];
 
         // skip these sources (in PSF or FLT)
@@ -598 +598 @@
 
 // translations between psphot object types and dophot object types
-int pmSourceDophotType (psSource *source) {
+int pmSourceDophotType (pmSource *source) {
 
     switch (source->type) {