Changeset 38472 for trunk

Timestamp:

Jun 14, 2015, 12:53:51 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/src/libdvo

Files:

• Makefile (modified) (2 diffs)
• include/dvo.h (modified) (1 diff)

trunk/Ohana/src/libdvo/Makefile

@@ -10 +10 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
-TEST    =       $(HOME)/test
+TESTDIR =       $(HOME)/test
 TESTBIN =       $(HOME)/test
 ASRC    =       $(AUTO)/src
@@ -183 +183 @@
         cd $(AUTO) && $(MAKE) clean
 
+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
+
 .PRECIOUS: $(ASRC)/%.c

trunk/Ohana/src/libdvo/include/dvo.h

@@ -196 +196 @@
   ID_SECF_STAR_POOR     = 0x00000002, // used within relphot: skip star
   ID_SECF_USE_SYNTH     = 0x00000004, // synthetic photometry used in average measurement
-  ID_SECF_USE_UBERCAL   = 0x00000008, // synthetic photometry used in average measurement
+  ID_SECF_USE_UBERCAL   = 0x00000008, // ubercal photometry used in average measurement
   ID_SECF_HAS_PS1       = 0x00000010, // PS1 photometry used in average measurement
-  ID_SECF_HAS_STACK     = 0x00000020, // PS1 stack photometry exists
+  ID_SECF_HAS_PS1_STACK = 0x00000020, // PS1 stack photometry exists
   ID_SECF_HAS_TYCHO     = 0x00000040, // Tycho photometry used for synth mags
   ID_SECF_FIX_SYNTH     = 0x00000080, // synth mags repaired with zpt map