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

Timestamp:

Feb 23, 2006, 6:16:11 PM (20 years ago)

Author:

eugene

Message:

fixed some errors with double sources, added second-pass linear PSF fit, multiple-depths

File:

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

trunk/psphot/src/psphotOutput.c

@@ -11 +11 @@
 static char *extNameKey = NULL;
 static char *extRoot    = NULL;
+static char *psfFile    = NULL;
+static char *psfSample  = NULL;
 
 void psphotOutputCleanup () {
@@ -21 +23 @@
     psFree (extNameKey);
     psFree (extRoot);
+    psFree (psfFile);
+    psFree (psfSample);
     return;
 }
@@ -34 +38 @@
     outputMode      = psMetadataLookupStr (&status, config->recipe, "OUTPUT_MODE");
     outputFormat    = psMetadataLookupStr (&status, config->recipe, "OUTPUT_FORMAT");
+
+    psfFile         = psMetadataLookupStr (&status, config->recipe, "PSF_OUTPUT_FILE");
+    psfSample       = psMetadataLookupStr (&status, config->recipe, "PSF_SAMPLE_FILE");
 
     // rules to construct output names
@@ -75 +82 @@
     }
 
+    // register background image-file names
+    psphotBackgroundNames (config->arguments);
+
     // save so freeing config will not drop these references
     psMemCopy (outputRoot);
@@ -83 +93 @@
     psMemCopy (extNameKey);
     psMemCopy (extRoot);
+    psMemCopy (psfFile);
+    psMemCopy (psfSample);
 
     return;
@@ -165 +177 @@
     char *outputFile;
 
-    psTimerStart ("psphot");
-
     psMetadata *header = pmReadoutGetHeader (readout);
 
@@ -180 +190 @@
     } 
 
-    char *psfFile    = psMetadataLookupStr (&status, arguments, "PSF_OUTPUT_FILE");
-    char *psfSample  = psMetadataLookupStr (&status, arguments, "PSF_SAMPLE_FILE");
     char *residImage = psMetadataLookupStr (&status, arguments, "RESID_IMAGE");
 
@@ -236 +244 @@
     psF32 *PAR, *dPAR;
     float dmag, apResid;
+
+    psTimerStart ("string");
 
     psLine *line = psLineAlloc (104);  // 104 is dophot-defined line length
@@ -274 +284 @@
     }
     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);
+
     return true;
 }
@@ -501 +555 @@
     }
 
-   // write sources with models first 
+    // write sources with models first 
     for (i = 0; i < sources->n; i++) {
         pmSource *source = (pmSource *) sources->data[i];
@@ -525 +579 @@
             fprintf (f, "%9.6f ", dPAR[j]);
         }
-        fprintf (f, ": %7.4f %2d %#5x %7.3f %7.1f %7.2f %4d %2d\n", 
+        fprintf (f, ": %8.4f %2d %#5x %7.3f %7.1f %7.2f %4d %2d\n", 
                  source[0].apMag, source[0].type, source[0].mode, 
                  log10(model[0].chisq/model[0].nDOF), 
@@ -617 +671 @@
             
         if (source->moments == NULL) {
-          moment = empty;
+            moment = empty;
         } else {
-          moment = source->moments;
+            moment = source->moments;
         }