Changeset 24951 for branches/czw_branch/cleanup/psModules/src/objects

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• psModules/src/objects/Makefile.am (modified) (1 diff)
• psModules/src/objects/pmFootprint.h (modified) (1 diff)
• psModules/src/objects/pmFootprintCullPeaks.c (copied) (copied from trunk/psModules/src/objects/pmFootprintCullPeaks.c )
• psModules/src/objects/pmSource.c (modified) (2 diffs)
• psModules/src/objects/pmSourceContour.c (modified) (6 diffs)
• psModules/src/objects/pmSourceIO_MatchedRefs.c (modified) (1 diff)

branches/czw_branch/cleanup/psModules/src/objects/Makefile.am

@@ -10 +10 @@
         pmFootprintArraysMerge.c \
         pmFootprintAssignPeaks.c \
+        pmFootprintCullPeaks.c \
         pmFootprintFind.c \
         pmFootprintFindAtPoint.c \

branches/czw_branch/cleanup/psModules/src/objects/pmFootprint.h

@@ -51 +51 @@
 void pmSetFootprintArrayIDsForImage(psImage *idImage,
                                     const psArray *footprints, // the footprints to insert
-                                    const bool relativeIDs); // show IDs starting at 0, not pmFootprint->id
+                                    const bool relativeIDs // show IDs starting at 0, not pmFootprint->id
+    );
 
 psErrorCode pmFootprintsAssignPeaks(psArray *footprints, const psArray *peaks);
 
-psErrorCode pmFootprintArrayCullPeaks(const psImage *img, const psImage *weight, psArray *footprints,
-                                 const float nsigma, const float threshold_min);
-psErrorCode pmFootprintCullPeaks(const psImage *img, const psImage *weight, pmFootprint *fp,
-                                 const float nsigma, const float threshold_min);
+psErrorCode pmFootprintCullPeaks(const psImage *img,       // the image wherein lives the footprint
+                                 const psImage *weight,    // corresponding variance image
+                                 pmFootprint *fp,          // Footprint containing mortal peaks
+                                 const float nsigma_delta, // how many sigma above local background a peak needs to be to survive
+                                 const float fPadding, // fractional padding added to stdev since bright peaks have unreasonably high significance
+                                 const float min_threshold // minimum permitted coll height
+    );
 
 psArray *pmFootprintArrayToPeaks(const psArray *footprints);

branches/czw_branch/cleanup/psModules/src/objects/pmSource.c

@@ -242 +242 @@
     extend |= (mySource->maskView == NULL);
 
-    // extend = true;
     if (extend) {
         // re-create the subimage
@@ -250 +249 @@
 
         mySource->pixels   = psImageSubset(readout->image,  newRegion);
-        mySource->variance   = psImageSubset(readout->variance, newRegion);
+        mySource->variance = psImageSubset(readout->variance, newRegion);
         mySource->maskView = psImageSubset(readout->mask,   newRegion);
         mySource->region   = newRegion;

branches/czw_branch/cleanup/psModules/src/objects/pmSourceContour.c

@@ -273 +273 @@
             x0 = findContourPos (image, threshold, xR, yR, RIGHT, x1);
             if (x0 == x1) {
-                // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
+              // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
                 goto pt1;
             }
@@ -282 +282 @@
             x1 = findContourNeg (image, threshold, xR, yR, RIGHT);
         }
-        // fprintf (stderr, "pos: %d (%d - %d)\n", yR, x0, x1);
+        // fprintf (stderr, "pos: %d (%d - %d)\n", yR, x0, x1);
 
         xVec->data.F32[Npt + 0] = image->col0 + x0;
@@ -288 +288 @@
         yVec->data.F32[Npt + 0] = image->row0 + yR;
         yVec->data.F32[Npt + 1] = image->row0 + yR;
+
         Npt += 2;
 
@@ -307 +308 @@
             x0 = findContourPos (image, threshold, xR, yR, RIGHT, x1);
             if (x0 == x1) {
-                // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
+              // fprintf (stderr, "top: %d (%d - %d)\n", yR, xR, x1);
                 goto pt2;
             }
@@ -322 +323 @@
         yVec->data.F32[Npt + 0] = image->row0 + yR;
         yVec->data.F32[Npt + 1] = image->row0 + yR;
+
         Npt += 2;
 
@@ -334 +336 @@
     yVec->n = Npt;
 
-    // fprintf (stderr, "done\n");
     psArray *tmpArray = psArrayAlloc(2);
 

branches/czw_branch/cleanup/psModules/src/objects/pmSourceIO_MatchedRefs.c

@@ -95 +95 @@
                     psTrace ("psastro", 4, "Trying %ld refstars\n", refstars->n);
 
+# if (0)
+                    // XXX test
+                    FILE *outfile = fopen ("refstars.dat", "w");
+                    assert (outfile);
+                    for (int nn = 0; nn < refstars->n; nn++) {
+                        pmAstromObj *ref = refstars->data[nn];
+                        fprintf (outfile, "%lf %lf\n", ref->sky->r*PS_DEG_RAD, ref->sky->d*PS_DEG_RAD);
+                    }
+                    fclose (outfile);
+# endif
+
                     psArray *matches = psMetadataLookupPtr (NULL, readout->analysis, "PSASTRO.MATCH");
                     if (matches == NULL) continue;