Changeset 38473

Timestamp:

Jun 14, 2015, 12:53:55 PM (11 years ago)

Author:

eugene

Message:

add testing; rename HAS_STACK with HAS_PS1_STACK; use synth phot if no ps1 data exists

Location:

trunk/Ohana

Files:

• Makefile.in (modified) (2 diffs)
• src/libkapa/Makefile (modified) (2 diffs)
• src/libtap/Makefile (modified) (2 diffs)
• src/relphot/src/setMrelCatalog.c (modified) (2 diffs)

trunk/Ohana/Makefile.in

@@ -109 +109 @@
         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 +159 @@
 %.dist:
         (cd src/$* && $(MAKE) dist)
+
+%.test:
+        if [ -d "src/$*" ]; then (cd src/$* && $(MAKE) test); fi
+
+.PHONY: test

trunk/Ohana/src/libkapa/Makefile

@@ -9 +9 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+TESTDIR =       $(HOME)/test
+TESTBIN =       $(HOME)/test
 include ../../Makefile.Common
 
@@ -49 +51 @@
 $(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

trunk/Ohana/src/libtap/Makefile

@@ -10 +10 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+TESTDIR =       $(HOME)/test
+TESTBIN =       $(HOME)/test
 include ../../Makefile.Common
 
@@ -32 +34 @@
 
 # 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

trunk/Ohana/src/relphot/src/setMrelCatalog.c

@@ -293 +293 @@
     }
 
-    // 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 +657 @@
     }
 
-    secfilt[Nsec].flags |= ID_SECF_HAS_STACK;
+    secfilt[Nsec].flags |= ID_SECF_HAS_PS1_STACK;
   } // Nsecfilt loop