Index: trunk/psModules/src/Makefile.am =================================================================== --- trunk/psModules/src/Makefile.am (revision 1887) +++ trunk/psModules/src/Makefile.am (revision 1888) @@ -1,18 +1,5 @@ lib_LIBRARIES = libpsmodule.a -bin_PROGRAMS = tst_pmFlatField tst_pmMaskBadPixels libpsmodule_a_SOURCES = pmFlatField.c pmMaskBadPixels.c pmSubtractBias.c psTest.c pmSubtractBias.c libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h libpsmodule_adir = . - -tst_pmFlatField_SOURCES = tst_pmFlatField.c -tst_pmFlatField_LDFLAGS = libpsmodule.a - -tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c -tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a - -tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c -tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a - -tst_pmSB_SOURCES = tst_pmMaskBadPixels.c -tst_pmSB_LDFLAGS = libpsmodule.a Index: trunk/psModules/src/Makefile.in =================================================================== --- trunk/psModules/src/Makefile.in (revision 1887) +++ trunk/psModules/src/Makefile.in (revision 1888) @@ -16,6 +16,5 @@ - -SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) $(tst_pmMaskBadPixels_SOURCES) +SOURCES = $(libpsmodule_a_SOURCES) srcdir = @srcdir@ @@ -40,5 +39,4 @@ POST_UNINSTALL = : host_triplet = @host@ -bin_PROGRAMS = tst_pmFlatField$(EXEEXT) tst_pmMaskBadPixels$(EXEEXT) subdir = src DIST_COMMON = $(libpsmodule_a_HEADERS) $(srcdir)/Makefile.am \ @@ -52,5 +50,5 @@ CONFIG_CLEAN_FILES = ARFLAGS = cru -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)" +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libpsmodule_adir)" libLIBRARIES_INSTALL = $(INSTALL_DATA) LIBRARIES = $(lib_LIBRARIES) @@ -61,12 +59,4 @@ psTest.$(OBJEXT) pmSubtractBias.$(OBJEXT) libpsmodule_a_OBJECTS = $(am_libpsmodule_a_OBJECTS) -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_tst_pmFlatField_OBJECTS = tst_pmFlatField.$(OBJEXT) -tst_pmFlatField_OBJECTS = $(am_tst_pmFlatField_OBJECTS) -tst_pmFlatField_LDADD = $(LDADD) -am_tst_pmMaskBadPixels_OBJECTS = tst_pmMaskBadPixels.$(OBJEXT) -tst_pmMaskBadPixels_OBJECTS = $(am_tst_pmMaskBadPixels_OBJECTS) -tst_pmMaskBadPixels_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -75,7 +65,5 @@ @AMDEP_TRUE@ ./$(DEPDIR)/pmMaskBadPixels.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/pmSubtractBias.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/psTest.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tst_pmFlatField.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/tst_pmMaskBadPixels.Po +@AMDEP_TRUE@ ./$(DEPDIR)/psTest.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -86,8 +74,6 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \ - $(tst_pmMaskBadPixels_SOURCES) -DIST_SOURCES = $(libpsmodule_a_SOURCES) $(tst_pmFlatField_SOURCES) \ - $(tst_pmMaskBadPixels_SOURCES) +SOURCES = $(libpsmodule_a_SOURCES) +DIST_SOURCES = $(libpsmodule_a_SOURCES) libpsmodule_aHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(libpsmodule_a_HEADERS) @@ -182,4 +168,5 @@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ @@ -193,10 +180,4 @@ libpsmodule_a_HEADERS = pmFlatField.h pmMaskBadPixels.h pmSubtractBias.h psTest.h pmSubtractBias.h libpsmodule_adir = . -tst_pmFlatField_SOURCES = tst_pmFlatField.c -tst_pmFlatField_LDFLAGS = libpsmodule.a -tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c -tst_pmMaskBadPixels_LDFLAGS = libpsmodule.a -tst_pmSB_SOURCES = tst_pmMaskBadPixels.c -tst_pmSB_LDFLAGS = libpsmodule.a all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -283,38 +264,4 @@ $(libpsmodule_a_AR) libpsmodule.a $(libpsmodule_a_OBJECTS) $(libpsmodule_a_LIBADD) $(RANLIB) libpsmodule.a -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done -tst_pmFlatField$(EXEEXT): $(tst_pmFlatField_OBJECTS) $(tst_pmFlatField_DEPENDENCIES) - @rm -f tst_pmFlatField$(EXEEXT) - $(LINK) $(tst_pmFlatField_LDFLAGS) $(tst_pmFlatField_OBJECTS) $(tst_pmFlatField_LDADD) $(LIBS) -tst_pmMaskBadPixels$(EXEEXT): $(tst_pmMaskBadPixels_OBJECTS) $(tst_pmMaskBadPixels_DEPENDENCIES) - @rm -f tst_pmMaskBadPixels$(EXEEXT) - $(LINK) $(tst_pmMaskBadPixels_LDFLAGS) $(tst_pmMaskBadPixels_OBJECTS) $(tst_pmMaskBadPixels_LDADD) $(LIBS) mostlyclean-compile: @@ -328,6 +275,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmSubtractBias.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psTest.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst_pmFlatField.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tst_pmMaskBadPixels.Po@am__quote@ .c.o: @@ -457,7 +402,7 @@ check-am: all-am check: check-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h +all-am: Makefile $(LIBRARIES) $(HEADERS) config.h installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libpsmodule_adir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libpsmodule_adir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done @@ -488,6 +433,6 @@ clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \ - clean-libtool mostlyclean-am +clean-am: clean-generic clean-libLIBRARIES clean-libtool \ + mostlyclean-am distclean: distclean-am @@ -509,5 +454,5 @@ install-data-am: install-libpsmodule_aHEADERS -install-exec-am: install-binPROGRAMS install-libLIBRARIES +install-exec-am: install-libLIBRARIES install-info: install-info-am @@ -535,21 +480,20 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ - uninstall-libLIBRARIES uninstall-libpsmodule_aHEADERS - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libLIBRARIES clean-libtool ctags distclean \ +uninstall-am: uninstall-info-am uninstall-libLIBRARIES \ + uninstall-libpsmodule_aHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLIBRARIES clean-libtool ctags distclean \ distclean-compile distclean-generic distclean-hdr \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-libLIBRARIES \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-libLIBRARIES \ install-libpsmodule_aHEADERS install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-libLIBRARIES \ - uninstall-libpsmodule_aHEADERS + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLIBRARIES uninstall-libpsmodule_aHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: trunk/psModules/src/tst_pmFlatField.c =================================================================== --- trunk/psModules/src/tst_pmFlatField.c (revision 1887) +++ (revision ) @@ -1,233 +1,0 @@ -/** @file tst_pmFlatField.c - * - * @brief Contains the tests for pmFlatField.c: - * - * Test A - Divide input image by flat image - * Test B - Mask flat image data - * Test C - Mask flat image data starting with non-null mask - * Test E - Attempt to use null input image - * Test F - Attempt tp use null flat image - * Test G - Attempt to use input image bigger than flat image - * Test H - Attempt to use input image mask bigger than flat image - * Test I - Attempt to use offset greater than input image - * Test J - Attempt to use complex input image - * Test K - Attempt to use complex flat image - * Test L - Attempt to use non-equal input and flat image types - * Test M - Attempt to use non-mask type mask image - * - * @author Ross Harman, MHPCC - * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-23 23:33:54 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - - -#include "psTest.h" -#include "pslib.h" -#include "pmFlatField.h" - - -#define PRINT_MATRIX(IMAGE,TYPE,STRING) \ -printf(STRING); \ -printf("\n"); \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ - printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ - } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d ", (int)IMAGE->data.TYPE[i][j]); \ - } else { \ - printf("%f ", (double)IMAGE->data.TYPE[i][j]); \ - } \ - } \ - printf("\n"); \ -} \ -printf("\n"); - - -#define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ -psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - NAME->data.TYPE[i][j] = VALUE; \ - } \ -} - - -static int testFlatField(void); - - -testDescription tests[] = { - {testFlatField, 884, "pmFlatField", 0, false}, - {NULL} - }; - - -int main(int argc, char* argv[]) -{ - return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv); -} - - -int testFlatField( void ) -{ - // Test A - Divide input image by flat image - printPositiveTestHeader(stdout, "pmFlatField", "Test A - Divide input image by flat image"); - CREATE_AND_SET_IMAGE(inImage,F64,6.0,3,3) - psReadout *inReadout = psReadoutAlloc(0, 0, inImage); - PRINT_MATRIX(inImage,F64,"Input image:"); - CREATE_AND_SET_IMAGE(flatImage1,F64,2.0,3,3) - psReadout *flatReadout = psReadoutAlloc(0, 0, flatImage1); - PRINT_MATRIX(flatImage1,F64,"Flat image:"); - pmFlatField(inReadout, flatReadout); - PRINT_MATRIX(inImage,F64, "Resulting image:"); - printFooter(stdout, "pmFlatField", "Test A - Divide input image by flat image", true); - printf("\n\n\n"); - - - // Test B - Mask flat image data - printPositiveTestHeader(stdout, "pmFlatField", "Test B - Mask flat image data"); - PRINT_MATRIX(inImage, F64, "Input image:"); - CREATE_AND_SET_IMAGE(flatImage2,F64,0.0,3,3) - PRINT_MATRIX(flatImage2, F64, "Flat image:"); - flatReadout->image = flatImage2; - pmFlatField(inReadout, flatReadout); - PRINT_MATRIX(inReadout->mask, PS_TYPE_MASK_DATA, "Resulting mask:"); - printFooter(stdout, "pmFlatField", "Test B - Mask flat image data", true); - printf("\n\n\n"); - - - // Test C - Mask flat image data starting with non-null mask - printPositiveTestHeader(stdout, "pmFlatField", "Test C - Mask flat image data starting with non-null mask"); - PRINT_MATRIX(inImage, F64, "Input image:"); - flatImage2->data.F64[0][0] = 1.0; - PRINT_MATRIX(flatImage2, F64, "Flat image:"); - CREATE_AND_SET_IMAGE(mask1,U8,0,3,3); - psFree(inReadout->mask); - inReadout->mask = mask1; - pmFlatField(inReadout, flatReadout); - PRINT_MATRIX(inReadout->mask, PS_TYPE_MASK_DATA,"Resulting mask:"); - printFooter(stdout, "pmFlatField", "Test C - Mask flat image data starting with non-null mask", true); - printf("\n\n\n"); - - - // Test D - Attempt to use null flat readout - printNegativeTestHeader(stdout,"pmFlatField", "Test D - Attempt to use null flat readout", - "Null not allowed for flat readout", 0); - pmFlatField(inReadout, NULL); - printFooter(stdout, "pmFlatField", "Test D - Attempt to use null flat readout", true); - printf("\n\n\n"); - - - // Test E - Attempt to use null input image - printNegativeTestHeader(stdout,"pmFlatField", "Test E - Attempt to use null input image", - "Null not allowed for input image", 0); - psImage *temp = inReadout->image; - inReadout->image = NULL; - pmFlatField(inReadout, flatReadout); - inReadout->image = temp; - printFooter(stdout, "pmFlatField", "Test E - Attempt to use null input image", true); - printf("\n\n\n"); - - - // Test F - Attempt tp use null flat image - printNegativeTestHeader(stdout,"pmFlatField", "Test F - Attempt tp use null flat image", - "Null not allowed for flat image", 0); - temp = flatReadout->image; - flatReadout->image = NULL; - pmFlatField(inReadout, flatReadout); - flatReadout->image = temp; - printFooter(stdout, "pmFlatField", "Test F - Attempt tp use null flat image", true); - printf("\n\n\n"); - - - // Test G - Attempt to use input image bigger than flat image - printNegativeTestHeader(stdout,"pmFlatField", "Test G - Attempt to use input image bigger than flat image", - "Input image size exceeds that of flat image", 0); - CREATE_AND_SET_IMAGE(smallFlat,F64,0.0,2,2); - temp = flatReadout->image; - flatReadout->image = smallFlat; - pmFlatField(inReadout, flatReadout); - flatReadout->image = temp; - printFooter(stdout, "pmFlatField", "Test G - Attempt to use input image bigger than flat image", true); - printf("\n\n\n"); - - - // Test H - Attempt to use input image mask bigger than flat image - printNegativeTestHeader(stdout,"pmFlatField", "Test H - Attempt to use input image mask bigger than flat image", - "Input image mask size exceeds that of flat image", 0); - CREATE_AND_SET_IMAGE(largeMask,F64,0.0,4,4); - temp = inReadout->mask; - inReadout->mask = largeMask; - pmFlatField(inReadout, flatReadout); - inReadout->mask = temp; - printFooter(stdout, "pmFlatField", "Test H - Attempt to use input image mask bigger than flat image", true); - printf("\n\n\n"); - - - // Test I - Attempt to use offset greater than input image - printNegativeTestHeader(stdout,"pmFlatField", "Test I - Attempt to use offset greater than input image", - "Total offset >= input image size", 0); - *(int*)&inReadout->col0 = 50; - *(int*)&inReadout->row0 = 50; - pmFlatField(inReadout, flatReadout); - *(int*)&inReadout->col0 = 0; - *(int*)&inReadout->row0 = 0; - printFooter(stdout, "pmFlatField", "Test I - Attempt to use offset greater than input image", true); - printf("\n\n\n"); - - - // Test J - Attempt to use complex input image - printNegativeTestHeader(stdout,"pmFlatField", "Test J - Attempt to use complex input image", - "Complex types not allowed for input image", 0); - *(psElemType* ) & inReadout->image->type.type = PS_TYPE_C64; - pmFlatField(inReadout, flatReadout); - *(psElemType* ) & inReadout->image->type.type = PS_TYPE_F64; - printFooter(stdout, "pmFlatField", "Test J - Attempt to use complex input image", true); - printf("\n\n\n"); - - - // Test K - Attempt to use complex flat image - printNegativeTestHeader(stdout,"pmFlatField", "Test K - Attempt to use complex flat image", - "Complex types not allowed for flat image", 0); - *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_C64; - pmFlatField(inReadout, flatReadout); - *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F64; - printFooter(stdout, "pmFlatField", "Test K - Attempt to use complex flat image", true); - printf("\n\n\n"); - - - // Test L - Attempt to use non-equal input and flat image types - printNegativeTestHeader(stdout,"pmFlatField", "Test L - Attempt to use non-equal input and flat image types", - "Input and flat image types differ", 0); - *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F32; - pmFlatField(inReadout, flatReadout); - *(psElemType* ) & flatReadout->image->type.type = PS_TYPE_F64; - printFooter(stdout, "pmFlatField", "Test L - Attempt to use non-equal input and flat image types", true); - printf("\n\n\n"); - - - // Test M - Attempt to use non-mask type mask image - printNegativeTestHeader(stdout,"pmFlatField", "Test M - Attempt to use non-mask type mask image", - "Mask must be PS_TYPE_MASK type", 0); - *(psElemType* ) & inReadout->mask->type.type = PS_TYPE_F32; - pmFlatField(inReadout, flatReadout); - *(psElemType* ) & inReadout->mask->type.type = PS_TYPE_MASK; - printFooter(stdout, "pmFlatField", "Test M - Attempt to use non-mask type mask image", true); - printf("\n\n\n"); - - - // Free memory - psFree(inReadout); - psFree(flatReadout); - psFree(inImage); - psFree(flatImage1); - psFree(flatImage1); - psFree(smallFlat); - psFree(largeMask); - - return 0; -} - Index: trunk/psModules/src/tst_pmMaskBadPixels.c =================================================================== --- trunk/psModules/src/tst_pmMaskBadPixels.c (revision 1887) +++ (revision ) @@ -1,251 +1,0 @@ -/** @file tst_pmMaskBadPixels.c - * - * @brief Contains the tests for pmMaskBadPixels: - * - * Test A - Create mask based on maskVal argument - * Test B - Create mask based on saturation argument - * Test C - Create mask based on growVal and grow arguments - * Test D - Auto Create mask based on maskVal argument - * Test E - Attempt to use null mask - * Test F - Attempt tp use null input image - * Test G - Attempt to use input image bigger than mask - * Test H - Attempt to use input image mask bigger than mask - * Test I - Attempt to use offset greater than input image - * Test J - Attempt to use complex input image - * Test K - Attempt to use non-mask type mask image - * - * @author Ross Harman, MHPCC - * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-24 01:34:43 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - - -#include "psTest.h" -#include "pslib.h" -#include "pmMaskBadPixels.h" - - -#define PRINT_MATRIX(IMAGE,TYPE,STRING) \ -printf(STRING); \ -printf("\n"); \ -for(int i=IMAGE->numRows-1; i>-1; i--) { \ - for(int j=0; jnumCols; j++) { \ - if(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) { \ - printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j])); \ - } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) { \ - printf("%d", (int)IMAGE->data.TYPE[i][j]); \ - } else { \ - printf("%f", (double)IMAGE->data.TYPE[i][j]); \ - } \ - } \ - printf("\n"); \ -} \ -printf("\n"); - - -#define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS) \ -psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE); \ -for(int i=0; inumRows; i++) { \ - for(int j=0; jnumCols; j++) { \ - NAME->data.TYPE[i][j] = VALUE; \ - } \ -} - - -static int testMaskBadPixels(void); - - -testDescription tests[] = { - {testMaskBadPixels, 885, "pmMaskBadPixels", 0, false}, - {NULL} - }; - - -int main(int argc, char* argv[]) -{ - return !runTestSuite(stderr, "Test Point Driver", tests, argc, argv); -} - - -int testMaskBadPixels( void ) -{ - - - // Test A - Create mask based on maskVal argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument"); - CREATE_AND_SET_IMAGE(inImage1,F64,0,50,50); - CREATE_AND_SET_IMAGE(mask1,U8,0,50,50) - psReadout *inReadout = psReadoutAlloc(0, 0, inImage1); - mask1->data.PS_TYPE_MASK_DATA[24][24]=1; - PRINT_MATRIX(mask1, U8, "Data mask:"); - pmMaskBadPixels(inReadout, mask1, 1, 100.0, 0, 0); - PRINT_MATRIX(inReadout->mask, U8, "Resulting mask:"); - psFree(mask1); - psFree(inReadout); - psFree(inImage1); - printFooter(stdout, "pmMaskBadPixels", "Test A - Create mask based on maskVal argument", true); - printf("\n\n\n"); - - - // Test B - Create mask based on saturation argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument"); - CREATE_AND_SET_IMAGE(inImage2,F64,150.0,50,50); - CREATE_AND_SET_IMAGE(mask2,U8,0,50,50) - psReadout *inReadout2 = psReadoutAlloc(0, 0, inImage2); - PRINT_MATRIX(mask2, U8, "Data mask:"); - pmMaskBadPixels(inReadout2, mask2, 0, 100.0, 0, 0); - PRINT_MATRIX(inReadout2->mask, U8, "Resulting mask:"); - psFree(mask2); - psFree(inReadout2); - psFree(inImage2); - printFooter(stdout, "pmMaskBadPixels", "Test B - Create mask based on saturation argument", true); - printf("\n\n\n"); - - - // Test C - Create mask based on growVal and grow arguments - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments"); - CREATE_AND_SET_IMAGE(inImage3,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask3,U8,0,50,50) - psReadout *inReadout3 = psReadoutAlloc(0, 0, inImage3); - mask3->data.PS_TYPE_MASK_DATA[24][24]=1; - mask3->data.PS_TYPE_MASK_DATA[4][3]=1; - mask3->data.PS_TYPE_MASK_DATA[4][46]=1; - PRINT_MATRIX(mask3, U8, "Data mask:"); - pmMaskBadPixels(inReadout3, mask3, 0, 100.0, 1, 10); - PRINT_MATRIX(inReadout3->mask, U8, "Resulting mask:"); - psFree(mask3); - psFree(inReadout3); - psFree(inImage3); - printFooter(stdout, "pmMaskBadPixels", "Test C - Create mask based on growVal and grow arguments", true); - printf("\n\n\n"); - - - // Test D - Auto Create mask based on maskVal argument - printPositiveTestHeader(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument"); - CREATE_AND_SET_IMAGE(inImage4,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask4,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask4i,U8,0,50,50) - psReadout *inReadout4 = psReadoutAlloc(0, 0, inImage4); - inReadout4->mask = mask4i; - mask4->data.PS_TYPE_MASK_DATA[24][24]=1; - PRINT_MATRIX(mask4, U8, "Data mask:"); - pmMaskBadPixels(inReadout4, mask4, 0, 100.0, 1, 10); - PRINT_MATRIX(inReadout4->mask, U8, "Resulting mask:"); - psFree(mask4); - psFree(inReadout4); - psFree(inImage4); - printFooter(stdout, "pmMaskBadPixels", "Test D - Auto create mask based on maskVal argument", true); - printf("\n\n\n"); - - - // Test E - Attempt to use null mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test E - Attempt to use null mask", - "Null not allowed for mask image", 0); - CREATE_AND_SET_IMAGE(inImage5,F64,50.0,50,50); - psReadout *inReadout5 = psReadoutAlloc(0, 0, inImage5); - pmMaskBadPixels(inReadout4, NULL, 0, 100.0, 1, 10); - psFree(inReadout5); - psFree(inImage5); - printFooter(stdout, "pmMaskBadPixels", "Test E - Attempt to use null mask", true); - printf("\n\n\n"); - - - // Test F - Attempt tp use null input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test F - Attempt tp use null input image", - "Null not allowed for input image", 0); - - CREATE_AND_SET_IMAGE(mask6,U8,0,50,50) - psReadout *inReadout6 = psReadoutAlloc(0, 0, NULL); - inReadout6->mask = mask6; - pmMaskBadPixels(inReadout6, mask6, 0, 100.0, 1, 10); - psFree(inReadout6); - printFooter(stdout, "pmMaskBadPixels", "Test F - Attempt tp use null input image", true); - printf("\n\n\n"); - - - // Test G - Attempt to use input image bigger than mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask", - "Input image size exceeds that of mask image", 0); - CREATE_AND_SET_IMAGE(inImage7,F64,0.0,60,60); - CREATE_AND_SET_IMAGE(mask7,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask7i,U8,0,50,50) - psReadout *inReadout7 = psReadoutAlloc(0, 0, inImage7); - inReadout4->mask = mask7i; - pmMaskBadPixels(inReadout4, mask7, 0, 100.0, 1, 10); - psFree(mask7); - psFree(inReadout7); - psFree(inImage7); - printFooter(stdout, "pmMaskBadPixels", "Test G - Attempt to use input image bigger than mask", true); - printf("\n\n\n"); - - - // Test H - Attempt to use input image mask bigger than mask - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask", - "Input image mask size exceeds that of mask image", 0); - CREATE_AND_SET_IMAGE(inImage8,F64,0.0,50,50); - CREATE_AND_SET_IMAGE(mask8,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask8i,U8,0,60,60) - psReadout *inReadout8 = psReadoutAlloc(0, 0, inImage8); - inReadout8->mask = mask8i; - pmMaskBadPixels(inReadout8, mask8, 0, 100.0, 1, 10); - psFree(mask8); - psFree(inReadout8); - psFree(inImage8); - printFooter(stdout, "pmMaskBadPixels", "Test H - Attempt to use input image mask bigger than mask", true); - printf("\n\n\n"); - - - // Test I - Attempt to use offset greater than input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test I - Attempt to use offset greater than input image", - "Total offset >= input image size", 0); - CREATE_AND_SET_IMAGE(inImage9,F64,0.0,50,50); - CREATE_AND_SET_IMAGE(mask9,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask9i,U8,0,50,50) - psReadout *inReadout9 = psReadoutAlloc(0, 0, inImage9); - inReadout9->mask = mask9i; - *(int*)&inReadout->col0 = 150; - *(int*)&inReadout->row0 = 150; - pmMaskBadPixels(inReadout9, mask9, 0, 100.0, 1, 10); - psFree(mask9); - psFree(inReadout9); - psFree(inImage9); - printFooter(stdout, "pmMaskBadPixels", "Test I - Attempt to use offset greater than input image", true); - printf("\n\n\n"); - - - // Test J - Attempt to use complex input image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test J - Attempt to use complex input image", - "Complex types not allowed for input image", 0); - CREATE_AND_SET_IMAGE(inImage10,C64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask10,U8,0,50,50) - CREATE_AND_SET_IMAGE(mask10i,U8,0,50,50) - psReadout *inReadout10 = psReadoutAlloc(0, 0, inImage10); - inReadout10->mask = mask10i; - pmMaskBadPixels(inReadout10, mask10, 0, 100.0, 1, 10); - psFree(mask10); - psFree(inReadout10); - psFree(inImage10); - printFooter(stdout, "pmMaskBadPixels", "Test J - Attempt to use complex input image", true); - printf("\n\n\n"); - - - // Test K - Attempt to use non-mask type mask image - printNegativeTestHeader(stdout,"pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image", - "Mask must be PS_TYPE_MASK type", 0); - CREATE_AND_SET_IMAGE(inImage11,F64,50.0,50,50); - CREATE_AND_SET_IMAGE(mask11,F64,0,50,50) - CREATE_AND_SET_IMAGE(mask11i,U8,0,50,50) - psReadout *inReadout11 = psReadoutAlloc(0, 0, inImage10); - inReadout11->mask = mask11i; - pmMaskBadPixels(inReadout11, mask11, 0, 100.0, 1, 10); - psFree(mask11); - psFree(inReadout11); - psFree(inImage11); - printFooter(stdout, "pmMaskBadPixels", "Test K - Attempt to use non-mask type mask image", true); - printf("\n\n\n"); - - return 0; -}