Index: trunk/ppMops/configure.ac
===================================================================
--- trunk/ppMops/configure.ac	(revision 24249)
+++ trunk/ppMops/configure.ac	(revision 24307)
@@ -19,4 +19,5 @@
 
 PKG_CHECK_MODULES([PSLIB], [pslib >= 1.0.0])
+PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.0.0])
 
 AC_PATH_PROG([ERRORCODES], [psParseErrorCodes], [missing])
@@ -31,6 +32,6 @@
 IPP_VERSION
 
-AC_SUBST([PPSUB_CFLAGS])
-AC_SUBST([PPSUB_LIBS])
+AC_SUBST([PPMOPS_CFLAGS])
+AC_SUBST([PPMOPS_LIBS])
 
 AC_CONFIG_FILES([
Index: trunk/ppMops/src/Makefile.am
===================================================================
--- trunk/ppMops/src/Makefile.am	(revision 24249)
+++ trunk/ppMops/src/Makefile.am	(revision 24307)
@@ -22,6 +22,6 @@
 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 =		\
Index: trunk/ppMops/src/ppMops.c
===================================================================
--- trunk/ppMops/src/ppMops.c	(revision 24249)
+++ trunk/ppMops/src/ppMops.c	(revision 24307)
@@ -64,5 +64,8 @@
         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;
         }
Index: trunk/ppMops/src/ppMops.h
===================================================================
--- trunk/ppMops/src/ppMops.h	(revision 24249)
+++ trunk/ppMops/src/ppMops.h	(revision 24307)
@@ -3,15 +3,12 @@
 
 #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