Index: /trunk/Ohana/Makefile.in
===================================================================
--- /trunk/Ohana/Makefile.in	(revision 38472)
+++ /trunk/Ohana/Makefile.in	(revision 38473)
@@ -109,4 +109,7 @@
 	cd src/opihi; $(MAKE) dvo.install && exit 1
 
+test:
+	for i in $(LIBS); do $(MAKE) $$i.test || exit 1; done
+
 clean:
 	@if [ "$(ARCH)" = "" ]; then echo ""; echo " *** please define ARCH ***"; echo; exit 1; fi
@@ -156,2 +159,7 @@
 %.dist:
 	(cd src/$* && $(MAKE) dist)
+
+%.test:
+	if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) test); fi
+
+.PHONY: test
Index: /trunk/Ohana/src/libkapa/Makefile
===================================================================
--- /trunk/Ohana/src/libkapa/Makefile	(revision 38472)
+++ /trunk/Ohana/src/libkapa/Makefile	(revision 38473)
@@ -9,4 +9,6 @@
 MAN	=	$(HOME)/doc
 INC	=	$(HOME)/include
+TESTDIR	=	$(HOME)/test
+TESTBIN	=	$(HOME)/test
 include ../../Makefile.Common
 
@@ -49,2 +51,9 @@
 $(DESTLIB)/libkapa.a:  $(LIB)/libkapa.$(ARCH).a  
 $(DESTLIB)/libkapa.$(DLLTYPE): $(LIB)/libkapa.$(ARCH).$(DLLTYPE)
+
+TESTPROG = 
+$(TESTPROG) : % : $(TESTBIN)/% $(OBJS)
+test: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 | $(TESTHARNESS); done
+test.verbose: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 |& $(TESTHARNESS) -v; done
Index: /trunk/Ohana/src/libtap/Makefile
===================================================================
--- /trunk/Ohana/src/libtap/Makefile	(revision 38472)
+++ /trunk/Ohana/src/libtap/Makefile	(revision 38473)
@@ -10,4 +10,6 @@
 MAN	=	$(HOME)/doc
 INC	= 	$(HOME)/include
+TESTDIR	=	$(HOME)/test
+TESTBIN	=	$(HOME)/test
 include ../../Makefile.Common
 
@@ -32,2 +34,9 @@
 
 # libtap tests are currently not compiled or run
+
+TESTPROG = 
+$(TESTPROG) : % : $(TESTBIN)/% $(OBJS)
+test: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 | $(TESTHARNESS); done
+test.verbose: $(TESTPROG)
+	for i in $(TESTPROG); do $(TESTBIN)/$$i 2>&1 |& $(TESTHARNESS) -v; done
Index: /trunk/Ohana/src/relphot/src/setMrelCatalog.c
===================================================================
--- /trunk/Ohana/src/relphot/src/setMrelCatalog.c	(revision 38472)
+++ /trunk/Ohana/src/relphot/src/setMrelCatalog.c	(revision 38473)
@@ -293,6 +293,7 @@
     }
 
-    // force the synthetic magnitude (apply zpt calibration if no tycho photometry exists)
-    if (results->needSYN[Nsec]) {
+    // use the synthetic magnitude for mean photometry (apply zpt calibration if no tycho
+    // photometry exists)
+    if (results->needSYN[Nsec] || (!results->havePS1[Nsec] && results->haveSYN[Nsec])) {
       if (!isSetMrelFinal) continue;
 
@@ -656,5 +657,5 @@
     }
 
-    secfilt[Nsec].flags |= ID_SECF_HAS_STACK;
+    secfilt[Nsec].flags |= ID_SECF_HAS_PS1_STACK;
   } // Nsecfilt loop