Changeset 30977

Timestamp:

Mar 18, 2011, 2:11:57 PM (15 years ago)

Author:

eugene

Message:

change due to pmPeak element changes

Location:

branches/eam_branches/ipp-20110213

Files:

• ppSim/src/Makefile.am (modified) (1 diff)
• ppSim/src/ppSimDetectionLimits.c (modified) (1 diff)
• ppSim/src/ppSimDetections.c (modified) (3 diffs)
• ppSub/src/ppSubFlagNeighbors.c (modified) (3 diffs)
• ppSub/src/ppSubMakePSF.c (modified) (1 diff)
• psastro/src/psastroConvert.c (modified) (1 diff)
• pswarp/src/pswarpTransformSources.c (modified) (1 diff)

branches/eam_branches/ipp-20110213/ppSim/src/Makefile.am

@@ -48 +48 @@
         ppSimLoop.c               \
         ppSimMergeReadouts.c      \
-        ppSimDetections.c         \
         ppSimMergeSources.c       \
         ppSimMosaicChip.c         \

branches/eam_branches/ipp-20110213/ppSim/src/ppSimDetectionLimits.c

@@ -3 +3 @@
 // compare injected sources (PPSIM.SOURCES) and measured fake sources (PPSIM.FAKE.SOURCES) 
 // to determine detection limits and recovered magnitude errors
+// XXX this function is not used
 bool ppSimDetectionLimits (pmConfig *config, pmFPAview *view) {
 

branches/eam_branches/ipp-20110213/ppSim/src/ppSimDetections.c

@@ -1 +1 @@
 # include "ppSim.h"
 
+// XXX this function is not used
 bool ppSimDetections (psImage *significance, psMetadata *recipe, psArray *sources) {
     psAssert (sources, "programming error: ppSimDetections passed NULL sources");
@@ -12 +13 @@
     float SIGMA_SMTH  = psMetadataLookupF32 (&status, recipe, "SIGMA_SMOOTH"); 
     psAssert (status, "SIGMA_SMOOTH missing: call psphotSignificanceImage first"); 
-    float effArea = 4.0*M_PI*PS_SQR(SIGMA_SMTH);
+    // float effArea = 4.0*M_PI*PS_SQR(SIGMA_SMTH);
 
     int row0 = significance->row0;
@@ -23 +24 @@
         psAssert (peak, "peak is not defined for the source");
 
-        peak->value = significance->data.F32[peak->y-row0][peak->x-col0];
-        peak->SN = sqrt(peak->value*effArea);
-
+        peak->detValue = significance->data.F32[peak->y-row0][peak->x-col0];
     }
     return true;

branches/eam_branches/ipp-20110213/ppSub/src/ppSubFlagNeighbors.c

@@ -191 +191 @@
         if (!isfinite(src->peak->xf)) NEXT1; 
         if (!isfinite(src->peak->yf)) NEXT1; 
-        if (!isfinite(src->peak->SN)) NEXT1; 
-        if (src->peak->SN < MIN_SN) NEXT1; 
+        if (!isfinite(src->peak->detValue)) NEXT1; 
+        if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
  
         if (!obj) NEXT2; 
@@ -213 +213 @@
             if (!isfinite(src->peak->xf)) NEXT1; 
             if (!isfinite(src->peak->yf)) NEXT1; 
-            if (!isfinite(src->peak->SN)) NEXT1; 
-            if (src->peak->SN < MIN_SN) NEXT1; 
+            if (!isfinite(src->peak->detValue)) NEXT1; 
+            if (sqrt(src->peak->detValue) < MIN_SN) NEXT1; 
 
             dx = src->peak->xf - obj->x; 
@@ -235 +235 @@
         src = sources->data[Imin]; 
 
-        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, src->peak->SN, src->id);
+        // fprintf (stderr, "j: %d, Imin: %d, obj x,y: %f, %f  src x,y: %f, %f, SN: %f, ID: %d\n", j, Imin, obj->x, obj->y, src->peak->xf, src->peak->yf, sqrt(src->peak->detValue), src->id);
 
         // add source to object

branches/eam_branches/ipp-20110213/ppSub/src/ppSubMakePSF.c

@@ -158 +158 @@
 psArray *ppSubSelectPSFSources(psArray *sources){
 
-    sources = psArraySort (sources, pmSourceSortBySN);
+    sources = psArraySort (sources, pmSourceSortByFlux);
 
     psArray *subset = psArrayAllocEmpty(MAX_NPSF);

branches/eam_branches/ipp-20110213/psastro/src/psastroConvert.c

@@ -58 +58 @@
     // sort in ascending magnitude order
     // psArraySort (inStars, psastroSortByMag);
-    // psVector *index = psArraySortIndex (sources, pmSourceSortBySN);
+    // psVector *index = psArraySortIndex (sources, pmSourceSortByFlux);
     psVector *index = psArraySortIndex (NULL, inStars, psastroSortByMag);
 

branches/eam_branches/ipp-20110213/pswarp/src/pswarpTransformSources.c

@@ -94 +94 @@
         // relative flux) that's OK.
         pmSource *new = pmSourceAlloc(); ///< New source
-        new->peak = pmPeakAlloc(xOut, yOut, source->peak->flux, PM_PEAK_LONE);
-        new->peak->flux = source->peak->flux;
+        new->peak = pmPeakAlloc(xOut, yOut, source->peak->detValue, PM_PEAK_LONE);
+        new->peak->rawFlux = source->peak->rawFlux;
+        new->peak->smoothFlux = source->peak->smoothFlux;
         new->type = source->type;
         new->mode = source->mode;