Changeset 27665

Timestamp:

Apr 12, 2010, 12:54:19 PM (16 years ago)

Author:

Paul Price

Message:

Explicitly set TRIMSEC when resizing image.

File:

• trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c (modified) (2 diffs)

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))) {
-                  numCols = psf->fieldNx;
-                  numRows = psf->fieldNy;
-                  psLogMsg("ppVizPSF", PS_LOG_INFO, "Generating %dx%d image", numCols, numRows);
-                }
+                if (sources || (data->fakeNum > 0 && isfinite(data->fakeMag))) {
+                    numCols = psf->fieldNx;
+                    numRows = psf->fieldNy;
+                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Generating %dx%d image", numCols, numRows);
+                }
                 if (sources) {
                     psMemIncrRefCounter(sources);
                     psLogMsg("ppVizPSF", PS_LOG_INFO, "Using %ld input sources", sources->n);
                 }
-                if (data->fakeNum > 0 && isfinite(data->fakeMag)) {
-                  long numOld = 0; // Old number of sources
-                  long numNew = -1; // New number of sources
-                  psLogMsg("ppVizPSF", PS_LOG_INFO, "Adding %d fake sources", data->fakeNum);
-                  if (sources) {
-                    numOld = sources->n;
-                    numNew = numOld + data->fakeNum;
-                    sources = psArrayRealloc(sources, numNew);
-                    sources->n = numNew;
-                  } else {
-                    numNew = data->fakeNum;
-                    sources = psArrayAlloc(numNew);
-                  }
+                if (data->fakeNum > 0 && isfinite(data->fakeMag)) {
+                    long numOld = 0; // Old number of sources
+                    long numNew = -1; // New number of sources
+                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Adding %d fake sources", data->fakeNum);
+                    if (sources) {
+                        numOld = sources->n;
+                        numNew = numOld + data->fakeNum;
+                        sources = psArrayRealloc(sources, numNew);
+                        sources->n = numNew;
+                    } else {
+                        numNew = data->fakeNum;
+                        sources = psArrayAlloc(numNew);
+                    }
 
-                  psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS); // Random number generator
+                    psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS); // Random number generator
 
-                  for (int i = numOld; i < numNew; i++) {
-                    pmSource *source = pmSourceAlloc(); // Fake source
-                    sources->data[i] = source;
-                    float xSrc = psRandomUniform(rng) * numCols, ySrc = psRandomUniform(rng) * numRows; // Position of source
+                    for (int i = numOld; i < numNew; i++) {
+                        pmSource *source = pmSourceAlloc(); // Fake source
+                        sources->data[i] = source;
+                        float xSrc = psRandomUniform(rng) * numCols, ySrc = psRandomUniform(rng) * numRows; // Position of source
 
-                    pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
-                    float fluxNorm = model->modelFlux(model->params);               // Flux for peak=1
-                    float fluxPeak = powf(10.0, -0.4 * data->fakeMag) / fluxNorm; // Peak flux
-                    source->peak = pmPeakAlloc(xSrc, ySrc, fluxPeak, PM_PEAK_LONE);
-                    source->psfMag = data->fakeMag;
-                    psFree(model);
-                  }
-                }                 
-                if (!sources) {
-                  // Generate fake image with only a single realisation of the PSF
+                        pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
+                        float fluxNorm = model->modelFlux(model->params);               // Flux for peak=1
+                        float fluxPeak = powf(10.0, -0.4 * data->fakeMag) / fluxNorm; // Peak flux
+                        source->peak = pmPeakAlloc(xSrc, ySrc, fluxPeak, PM_PEAK_LONE);
+                        source->psfMag = data->fakeMag;
+                        psFree(model);
+                    }
+                }
+                if (!sources) {
+                    // Generate fake image with only a single realisation of the PSF
                     sources = psArrayAlloc(1);
                     pmSource *source = pmSourceAlloc(); // Fake source
@@ -134 +134 @@
                     psLogMsg("ppVizPSF", PS_LOG_INFO, "Generating %dx%d image with single PSF",
                              numCols, numRows);
+                    psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
+                    *trimsec = psRegionSet(0, numCols, 0, numRows);
                 }