Changeset 28965

Timestamp:

Aug 19, 2010, 3:04:00 PM (16 years ago)

Author:

rhenders

Message:

Changed FilterStars function to also filter detections based on DETECTIONFILTER mask supplied in ptolemyrc

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/FilterStars.c (modified) (4 diffs)

trunk/Ohana/src/addstar/include/addstar.h

@@ -209 +209 @@
 Stars     *ReadStarsSDSS          PROTO((FILE *f, char *name, Header *header, Header *in_theader, Image *images, off_t *nimages, unsigned int *nstars));
 int        ReadImageHeader        PROTO((Header *header, Image *image, int photcode));
-Stars     *FilterStars            PROTO((Stars *instars, Image *image, unsigned int imageID));
+Stars     *FilterStars            PROTO((Stars *instars, Image *image, unsigned int imageID, const AddstarClientOptions *options));
 Stars     *MergeStars             PROTO((Stars *stars, unsigned int *Nstars, Stars *instars, unsigned int Ninstars));
 double     scat_subpix            PROTO((double x, double y));

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -1 +1 @@
 # include "addstar.h"
+#include "pslib/psMetadata.h"
+#include "psmodules/pmSourceMasks.h"
 # define EXTERNAL_ID TRUE
 
@@ -10 +12 @@
 // the imageID supplied here is the sequence **within this set**
 // this value is updated based on the image table later
-Stars *FilterStars (Stars *instars, Image *image, unsigned int imageID) {
+Stars *FilterStars (Stars *instars, Image *image, unsigned int imageID, const AddstarClientOptions *options) {
 
   int j, N;
@@ -28 +30 @@
   ALLOCATE (stars, Stars, image[0].nstar);
   for (N = j = 0; j < image[0].nstar; j++) {
+
+    if (instars[j].measure.photFlags & options->detectionFilter) continue;
 
     /* allow for some dynamic filtering of star list */
@@ -100 +104 @@
     N ++;
   }
+
+  // DEBUG printf("N stars orig = %d after filter = %d\n", image[0].nstar, N);
+  
   image[0].nstar = N;
   REALLOCATE (stars, Stars, image[0].nstar);