Changeset 25027 for branches/pap/psModules/src/camera/pmReadoutFake.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmReadoutFake.c (modified) (3 diffs)

branches/pap/psModules/src/camera/pmReadoutFake.c

@@ -29 +29 @@
 #define MAX_AXIS_RATIO 20.0             // Maximum axis ratio for PSF model
 #define SOURCE_MASK (PM_SOURCE_MODE_DEFECT | PM_SOURCE_MODE_CR_LIMIT) // Mask to apply to input sources
+#define MODEL_MASK (PM_MODEL_STATUS_NONCONVERGE | PM_MODEL_STATUS_OFFIMAGE | \
+                    PM_MODEL_STATUS_BADARGS | PM_MODEL_STATUS_LIMITS) // Mask to apply to models
 
 
@@ -80 +82 @@
 
     int numSources = sources->n;          // Number of stars
-
-    float flux0 = NAN;                  // Flux for central intensity of 1.0
-    if (normalisePeak) {
-        pmModel *fakeModel = pmModelFromPSFforXY(psf, (float)numCols / 2.0, (float)numRows / 2.0,
-                                                 1.0); // Fake model, with central intensity of 1.0
-        psAssert(fakeModel, "failed to generate model: should this be an error or not?");
-
-        if (circularise && !circulariseModel(fakeModel)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to circularise PSF model.");
-            psFree(fakeModel);
-            return false;
-        }
-
-        flux0 = fakeModel->modelFlux(fakeModel->params); // Flux for central intensity of 1.0
-        psFree(fakeModel);
-    }
-
     for (int i = 0; i < numSources; i++) {
         pmSource *source = sources->data[i]; // Source of interest
@@ -118 +103 @@
 
         float flux = powf(10.0, -0.4 * source->psfMag); // Flux of source
+
         if (normalisePeak) {
-            flux /= flux0;
+            // Normalise flux
+            pmModel *normModel = pmModelFromPSFforXY(psf, x, y, 1.0); // Model for normalisation
+            if (!normModel || (normModel->flags & MODEL_MASK)) {
+                psFree(normModel);
+                continue;
+            }
+            if (circularise && !circulariseModel(normModel)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to circularise PSF model.");
+                psFree(normModel);
+                return false;
+            }
+
+            flux /= normModel->modelFlux(normModel->params);
+            psFree(normModel);
         }
 
         pmModel *fakeModel = pmModelFromPSFforXY(psf, x, y, flux);
-        if (!fakeModel) {
+        if (!fakeModel || (fakeModel->flags & MODEL_MASK)) {
+            psFree(fakeModel);
             continue;
         }