Changeset 27667

Timestamp:

Apr 12, 2010, 2:18:52 PM (16 years ago)

Author:

Paul Price

Message:

Add ability to get inputs from text file. Don't use PSF residuals ever, since they seem to cause bad results whenever they're used.

Location:

trunk/ppViz/src/ppVizPSF

Files:

• ppVizPSF.h (modified) (2 diffs)
• ppVizPSFArguments.c (modified) (2 diffs)
• ppVizPSFData.c (modified) (2 diffs)
• ppVizPSFLoop.c (modified) (5 diffs)

trunk/ppViz/src/ppVizPSF/ppVizPSF.h

@@ -11 +11 @@
     psString psfName;                   // Filename with PSF
     psString sourcesName;               // Filename with sources
-    int fakeNum;                        // Number of fake sources
+    int fakeNum;                        // Number of fake sources
     float fakeMag;                      // Magnitude of fake sources
     psString outRoot;                   // Output root name
@@ -17 +17 @@
     int size;                           // Size of PSF image
     float x, y;                         // Position of fake source
+    psArray *input;                     // Input positions and magnitudes
     pmConfig *config;                   // Configuration
 } ppVizPSFData;

trunk/ppViz/src/ppVizPSF/ppVizPSFArguments.c

@@ -50 +50 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-psf", 0, "Filename of PSF", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-sources", 0, "Filename of CMF sources", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-input", 0, "Filename with x,y,mag", NULL);
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-fake-num", 0, "Number of fake sources", 0);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-fake-mag", 0, "Magnitude of fake sources", NAN);
@@ -68 +69 @@
     psMetadataAddStr(data->config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
 
+    const char *inputName = psMetadataLookupStr(NULL, arguments, "-input"); // Name of input file
+    if (inputName) {
+        data->input = psVectorsReadFromFile(inputName, "%f %f %f");
+        if (!data->input) {
+            psError(psErrorCodeLast(), false, "Unable to read input file %s", inputName);
+            return false;
+        }
+    }
+
     psTrace("ppVizPSF", 1, "Done reading command-line arguments\n");
     psFree(arguments);

trunk/ppViz/src/ppVizPSF/ppVizPSFData.c

@@ -16 +16 @@
     psFree(data->sourcesName);
     psFree(data->outRoot);
+    psFree(data->input);
     psFree(data->config);
     return;
@@ -36 +37 @@
     data->x = NAN;
     data->y = NAN;
+    data->input = NULL;
 
     return data;

trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c

@@ -75 +75 @@
                 psVector *xOffset = NULL, *yOffset = NULL; // Offset from source to true position
 
-                if (sources || (data->fakeNum > 0 && isfinite(data->fakeMag))) {
+                if (sources || data->input || (data->fakeNum > 0 && isfinite(data->fakeMag))) {
                     numCols = psf->fieldNx;
                     numRows = psf->fieldNy;
@@ -82 +82 @@
                 if (sources) {
                     psMemIncrRefCounter(sources);
-                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Using %ld input sources", sources->n);
-                }
+                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Using %ld input sources from CMF file", sources->n);
+                } else if (data->input) {
+                    psVector *x = data->input->data[0]; // x coordinates
+                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Using %ld input sources from text file", x->n);
+                }
+
                 if (data->fakeNum > 0 && isfinite(data->fakeMag)) {
                     long numOld = 0; // Old number of sources
@@ -113 +117 @@
                     }
                 }
-                if (!sources) {
+                if (!sources && !data->input) {
                     // Generate fake image with only a single realisation of the PSF
                     sources = psArrayAlloc(1);
@@ -137 +141 @@
                     psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
                     *trimsec = psRegionSet(0, numCols, 0, numRows);
-
-                    // We have trouble with PSF residuals in this case, so don't use them
-                    psFree(psf->residuals);
-                    psf->residuals = NULL;
                 }
 
@@ -148 +148 @@
                 }
 
-                if (!pmReadoutFakeFromSources(readout, numCols, numRows, sources, 0, xOffset, yOffset, psf,
-                                              data->minFlux, 0, false, true)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
-                    return false;
+                // We have trouble with PSF residuals, so don't use them
+                psFree(psf->residuals);
+                psf->residuals = NULL;
+
+                if (sources) {
+                    if (!pmReadoutFakeFromSources(readout, numCols, numRows, sources, 0, xOffset, yOffset,
+                                                  psf, data->minFlux, 0, false, true)) {
+                        psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
+                        return false;
+                    }
+                } else if (data->input) {
+                    psVector *x = data->input->data[0]; // x coordinates
+                    psVector *y = data->input->data[1]; // y coordinates
+                    psVector *mag = data->input->data[2]; // Magnitudes
+                    if (!pmReadoutFakeFromVectors(readout, numCols, numRows, x, y, mag, xOffset, yOffset,
+                                                  psf, data->minFlux, 0, false, true)) {
+                        psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
+                        return false;
+                    }
                 }