Changeset 25328

Timestamp:

Sep 10, 2009, 3:54:56 PM (17 years ago)

Author:

Paul Price

Message:

Renaming 'fake' to 'efficiency' --- it's not so much about the fake sources, but the efficiency (for which we use fake sources).

Location:

branches/pap

Files:

• ippconfig/recipes/psphot.config (modified) (1 diff)
• psphot/src/Makefile.am (modified) (1 diff)
• psphot/src/psphot.h (modified) (1 diff)
• psphot/src/psphotEfficiency.c (moved) (moved from branches/pap/psphot/src/psphotFake.c ) (6 diffs)
• psphot/src/psphotReadout.c (modified) (1 diff)

branches/pap/ippconfig/recipes/psphot.config

@@ -265 +265 @@
 PSPHOT.CR.NSIGMA.SOFTEN             F32   0.0025          # Softening parameter for weights
 
-# Fake sources for detection efficiency
-FAKE.NUM                            S32   500                   # Number of fake sources per bin
-@FAKE.MAG                           F32   -2.0 -1.0 -0.5 0.0 0.5 1.0    # Magnitude of fake sources relative to limit
-
+# Detection efficiency
+EFF.NUM                            S32   500                    # Number of fake sources per bin
+@EFF.MAG                            F32   -2.0 -1.0 -0.5 0.0 0.5 1.0    # Magnitude of fake sources relative to limit
 
 # Recipe overrides for CHIP

branches/pap/psphot/src/Makefile.am

@@ -129 +129 @@
         psphotThreadTools.c            \
         psphotAddNoise.c               \
-        psphotFake.c
+        psphotEfficiency.c
 
 # dropped? psphotGrowthCurve.c

branches/pap/psphot/src/psphot.h

@@ -76 +76 @@
 bool            psphotExtendedSourceAnalysis (pmReadout *readout, psArray *sources, psMetadata *recipe);
 bool            psphotExtendedSourceFits (pmReadout *readout, psArray *sources, psMetadata *recipe);
-bool            psphotFake(pmConfig *config, pmReadout *readout, const pmFPAview *view, const pmPSF *psf, psMetadata *recipe, const psArray *realSources);
+bool            psphotEfficiency(pmConfig *config, pmReadout *readout, const pmFPAview *view, const pmPSF *psf, psMetadata *recipe, const psArray *realSources);
 
 // thread-related:

branches/pap/psphot/src/psphotEfficiency.c

@@ -11 +11 @@
 // We limit ourselves to calculating the peak flux in the smoothed image, which should be close (modulo
 // non-Gaussian PSF) to the limiting flux in the un-smoothed original image.
-static bool fakeLimit(float *magLim,           // Limiting magntiude, to return
-                      int *radius,             // Radius for fake sources, to return
-                      float *minFlux,          // Minimum flux for fake sources, to return
-                      float *norm,             // Normalisation of PSF (conversion: peak --> integrated flux)
-                      const pmReadout *ro,     // Readout of interest
-                      const pmPSF *psf,        // Point-spread function
-                      float thresh,            // Threshold for source identification
-                      float smoothSigma,       // Gaussian smoothing sigma
-                      float smoothNsigma,      // Smoothing limit
-                      psImageMaskType maskVal  // Value to mask
-                      )
+static bool effLimit(float *magLim,           // Limiting magntiude, to return
+                     int *radius,             // Radius for fake sources, to return
+                     float *minFlux,          // Minimum flux for fake sources, to return
+                     float *norm,             // Normalisation of PSF (conversion: peak --> integrated flux)
+                     const pmReadout *ro,     // Readout of interest
+                     const pmPSF *psf,        // Point-spread function
+                     float thresh,            // Threshold for source identification
+                     float smoothSigma,       // Gaussian smoothing sigma
+                     float smoothNsigma,      // Smoothing limit
+                     psImageMaskType maskVal  // Value to mask
+                     )
 {
     PM_ASSERT_READOUT_NON_NULL(ro, false);
@@ -83 +83 @@
 
 /// Generate a fake image and add it in to the existing readout
-static bool fakeGenerate(psImage **xSrc, psImage **ySrc, // Positions of sources
-                         const pmReadout *ro,            // Readout of interest
-                         const pmPSF *psf,               // Point-spread function
-                         const psVector *magOffsets,     // Magnitude offsets for fake sources
-                         int numSources,                 // Number of fake sources for each bin
-                         float refMag,                   // Reference magnitude
-                         int radius,                     // Radius for fake sources
-                         float minFlux                   // Minimum flux for fake sources
-                         )
+static bool effGenerate(psImage **xSrc, psImage **ySrc, // Positions of sources
+                        const pmReadout *ro,            // Readout of interest
+                        const pmPSF *psf,               // Point-spread function
+                        const psVector *magOffsets,     // Magnitude offsets for fake sources
+                        int numSources,                 // Number of fake sources for each bin
+                        float refMag,                   // Reference magnitude
+                        int radius,                     // Radius for fake sources
+                        float minFlux                   // Minimum flux for fake sources
+                        )
 {
     PM_ASSERT_READOUT_NON_NULL(ro, false);
@@ -148 +148 @@
 
 
-// *** in this section, perform the photometry for fake sources ***
-bool psphotFake(pmConfig *config, pmReadout *readout, const pmFPAview *view, const pmPSF *psf,
+// Determine detection efficiency
+bool psphotEfficiency(pmConfig *config, pmReadout *readout, const pmFPAview *view, const pmPSF *psf,
                 psMetadata *recipe, const psArray *realSources)
 {
@@ -177 +177 @@
         return false;
     }
-    psVector *magOffsets = psMetadataLookupVector(NULL, recipe, "FAKE.MAG"); // Magnitude offsets
+    psVector *magOffsets = psMetadataLookupVector(NULL, recipe, "EFF.MAG"); // Magnitude offsets
     if (!magOffsets || magOffsets->type.type != PS_TYPE_F32) {
-        psError(PSPHOT_ERR_CONFIG, false, "Unable to find FAKE.MAG F32 vector in recipe");
+        psError(PSPHOT_ERR_CONFIG, false, "Unable to find EFF.MAG F32 vector in recipe");
         return NULL;
     }
-    int numSources = psMetadataLookupS32(NULL, recipe, "FAKE.NUM"); // Number of sources for each bin
+    int numSources = psMetadataLookupS32(NULL, recipe, "EFF.NUM"); // Number of sources for each bin
     if (numSources == 0) {
-        psError(PSPHOT_ERR_CONFIG, false, "Unable to find FAKE.NUM in recipe");
+        psError(PSPHOT_ERR_CONFIG, false, "Unable to find EFF.NUM in recipe");
         return NULL;
     }
@@ -220 +220 @@
     float minFlux;                      // Minimum flux for fake sources
     float norm;                         // Normalisation of PSF
-    if (!fakeLimit(&magLim, &radius, &minFlux, &norm, readout,
+    if (!effLimit(&magLim, &radius, &minFlux, &norm, readout,
                    psf, thresh, smoothSigma, smoothNsigma, maskVal)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to determine limits for image");
@@ -233 +233 @@
 
     psImage *xFake = NULL, *yFake = NULL; // Coordinates of sources, each bin in a row
-    if (!fakeGenerate(&xFake, &yFake, readout, psf, magOffsets, numSources, magLim, radius, minFlux)) {
+    if (!effGenerate(&xFake, &yFake, readout, psf, magOffsets, numSources, magLim, radius, minFlux)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to generate fake sources");
         psFree(xFake);

branches/pap/psphot/src/psphotReadout.c

@@ -224 +224 @@
     psphotMagnitudes(config, readout, view, sources, psf);
 
-    if (!psphotFake(config, readout, view, psf, recipe, sources)) {
+    if (!psphotEfficiency(config, readout, view, psf, recipe, sources)) {
         psErrorStackPrint(stderr, "Unable to determine detection efficiencies from fake sources");
         psErrorClear();