Changeset 24307 for trunk/ppMops

Timestamp:

Jun 2, 2009, 5:45:48 PM (17 years ago)

Author:

Paul Price

Message:

Use pmSourceMasks.h to define mask values, rather than specifying them by number. Don't throw out sources masked DEFECT if they are also masked MOMENTS_FAILURE.

Location:

trunk/ppMops

Files:

• configure.ac (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/ppMops.c (modified) (1 diff)
• src/ppMops.h (modified) (1 diff)

trunk/ppMops/configure.ac

@@ -19 +19 @@
 
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
+PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.0.0])
 
 AC_PATH_PROG([ERRORCODES], [psParseErrorCodes], [missing])
@@ -31 +32 @@
 IPP_VERSION
 
-AC_SUBST([PPSUB_CFLAGS])
-AC_SUBST([PPSUB_LIBS])
+AC_SUBST([PPMOPS_CFLAGS])
+AC_SUBST([PPMOPS_LIBS])
 
 AC_CONFIG_FILES([

trunk/ppMops/src/Makefile.am

@@ -22 +22 @@
 FORCE: ;
 
-ppMops_CPPFLAGS = $(PSLIB_CFLAGS) $(PPMOPS_CFLAGS)
-ppMops_LDFLAGS  = $(PSLIB_LIBS)   $(PPMOPS_LIBS)
+ppMops_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(PPMOPS_CFLAGS)
+ppMops_LDFLAGS  = $(PSLIB_LIBS) $(PPMOPS_LIBS)
 
 ppMops_SOURCES =                \

trunk/ppMops/src/ppMops.c

@@ -64 +64 @@
         psU32 flags = psMetadataLookupU32(NULL, inRow, "FLAGS");
 
-        if (!isfinite(mag) || !isfinite(magErr) || (flags & SOURCE_MASK)) {
+        if (!isfinite(mag) || !isfinite(magErr) || (flags & SOURCE_MASK) ||
+            ((flags & PM_SOURCE_MODE_DEFECT) && !(flags & PM_SOURCE_MODE_MOMENTS_FAILURE))
+            ) {
+            // DEFECT can be due to bad moments
             continue;
         }

trunk/ppMops/src/ppMops.h

@@ -3 +3 @@
 
 #include <pslib.h>
+#include <pmSourceMasks.h>
 
 #define IN_EXTNAME "SkyChip.psf"                // Extension name for data in input
 #define OBSERVATORY_CODE 566                    // IAU Observatory Code
 #define OUT_EXTNAME "MOPS_TRANSIENT_DETECTIONS" // Extension name for data in output
-#define SOURCE_MASK (8 | /* FAIL */ \
-                     1024 |  /* BADPSF */ \
-                     2048 | /* DEFECT */ \
-                     4096 | /* SATURATED */ \
-                     8192 | /* CR_LIMIT */ \
-                     65536 /* SKY_FAILURE */ \
-                     )
+#define SOURCE_MASK (PM_SOURCE_MODE_FAIL | PM_SOURCE_MODE_BADPSF | PM_SOURCE_MODE_SATURATED | \
+                     PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_SKY_FAILURE) // Flags to exclude
+
 
 // Configuration data