Changeset 32718

Timestamp:

Nov 18, 2011, 4:55:07 PM (15 years ago)

Author:

eugene

Message:

avoid subtraction errors from using the wrong window size

Location:

tags/ipp-20111110/psModules/src

Files:

• imcombine/pmSubtraction.c (modified) (2 diffs)
• objects (modified) (1 prop)
• objects/pmPeaks.c (modified) (1 diff)
• objects/pmPeaks.h (modified) (1 diff)
• objects/pmSource.c (modified) (6 diffs)
• objects/pmSource.h (modified) (1 diff)

tags/ipp-20111110/psModules/src/imcombine/pmSubtraction.c

@@ -1487 +1487 @@
             }
         }
+        psFree(out1->covariance);
         out1->covariance = psImageCovarianceAverage(covars);
         psFree(covars);
@@ -1527 +1528 @@
             }
         }
+        psFree(out2->covariance);
         out2->covariance = psImageCovarianceAverage(covars);
         psFree(covars);

tags/ipp-20111110/psModules/src/objects/pmPeaks.c

@@ -190 +190 @@
     out->assigned        = in->assigned;
     out->type            = in->type;
+    out->footprint       = in->footprint;
 
     return true;

tags/ipp-20111110/psModules/src/objects/pmPeaks.h

@@ -71 +71 @@
     bool assigned;                      ///< is peak assigned to a source?
     pmPeakType type;                    ///< Description of peak.
-    pmFootprint *footprint;             ///< reference to containing footprint
+    pmFootprint *footprint;             ///< reference to containing footprint (just a view, not a memcopy)
     psArray *saddlePoints;              ///< set of saddle points between this peak and near neighbors
 }

tags/ipp-20111110/psModules/src/objects/pmSource.c

@@ -121 +121 @@
     source->modelFits = NULL;
     source->extFitPars = NULL;
+
     source->type = PM_SOURCE_TYPE_UNKNOWN;
     source->mode = PM_SOURCE_MODE_DEFAULT;
@@ -138 +139 @@
     source->apFluxErr        = NAN; 
 
+    source->windowRadius     = NAN;
     source->skyRadius        = NAN;
     source->skyFlux          = NAN;
@@ -203 +205 @@
 
     source->imageID          = in->imageID;
+
     source->type             = in->type;
     source->mode             = in->mode;
     source->mode2            = in->mode2;
     source->tmpFlags         = in->tmpFlags;
+
     source->psfMag           = in->psfMag;
     source->psfMagErr        = in->psfMagErr;
@@ -217 +221 @@
     source->apFlux           = in->apFlux;
     source->apFluxErr        = in->apFluxErr;
+
+    source->windowRadius     = in->windowRadius;
+    source->skyRadius        = in->skyRadius;   
+    source->skyFlux          = in->skyFlux;     
+    source->skySlope         = in->skySlope;    
+
     source->pixWeightNotBad  = in->pixWeightNotBad;
     source->pixWeightNotPoor = in->pixWeightNotPoor;
+
     source->psfChisq         = in->psfChisq;
     source->crNsigma         = in->crNsigma;
@@ -259 +270 @@
     }
     mySource->region   = srcRegion;
+    mySource->windowRadius = Radius;
 
     return true;
@@ -328 +340 @@
         mySource->psfImage = NULL;
     }
+    mySource->windowRadius = Radius;
     return extend;
 }

tags/ipp-20111110/psModules/src/objects/pmSource.h

@@ -97 +97 @@
     float apFluxErr;                    ///< apFluxErr corresponding to psfMag or extMag (depending on type)
 
+    float windowRadius;                 ///< size of box used for full analysis
     float skyRadius;                    ///< radius at which profile hits local sky (or goes flat)
     float skyFlux;                      ///< mean flux per pixel in aperture at which profile hits local sky (or goes flat)