Changeset 39445

Timestamp:

Mar 8, 2016, 11:49:15 AM (10 years ago)

Author:

eugene

Message:

move MeasFilterTest code to stand-along c file to avoid excessive dependencies in the test programs fitobj, etc

Location:

branches/eam_branches/ohana.20160226/src/relastro

Files:

• Makefile (modified) (5 diffs)
• src/ImageOps.c (modified) (2 diffs)
• src/MeasFilterTest.c (added)
• src/fitobj.c (modified) (1 diff)
• src/fitobj2.c (modified) (1 diff)
• src/fitstk.c (modified) (1 diff)

branches/eam_branches/ohana.20160226/src/relastro/Makefile

@@ -48 +48 @@
 $(SRC)/UpdateMeasures.$(ARCH).o      \
 $(SRC)/GetAstromError.$(ARCH).o      \
+$(SRC)/MeasFilterTest.$(ARCH).o            \
 $(SRC)/args.$(ARCH).o                \
 $(SRC)/bcatalog.$(ARCH).o            \
@@ -121 +122 @@
 $(SRC)/UpdateMeasures.$(ARCH).o      \
 $(SRC)/GetAstromError.$(ARCH).o      \
+$(SRC)/MeasFilterTest.$(ARCH).o            \
 $(SRC)/args.$(ARCH).o                \
 $(SRC)/bcatalog.$(ARCH).o            \
@@ -196 +198 @@
 $(SRC)/mkpolyterm.$(ARCH).o            \
 $(SRC)/GetAstromError.$(ARCH).o            \
-$(SRC)/ImageOps.$(ARCH).o            \
-$(SRC)/MosaicOps.$(ARCH).o            \
+$(SRC)/MeasFilterTest.$(ARCH).o            \
 $(SRC)/extra.$(ARCH).o            \
 $(SRC)/plotstuff.$(ARCH).o            \
@@ -219 +220 @@
 $(SRC)/mkpolyterm.$(ARCH).o            \
 $(SRC)/GetAstromError.$(ARCH).o            \
-$(SRC)/ImageOps.$(ARCH).o            \
-$(SRC)/MosaicOps.$(ARCH).o            \
+$(SRC)/MeasFilterTest.$(ARCH).o            \
 $(SRC)/extra.$(ARCH).o            \
 $(SRC)/plotstuff.$(ARCH).o            \
@@ -242 +242 @@
 $(SRC)/mkpolyterm.$(ARCH).o            \
 $(SRC)/GetAstromError.$(ARCH).o            \
-$(SRC)/ImageOps.$(ARCH).o            \
-$(SRC)/MosaicOps.$(ARCH).o            \
+$(SRC)/MeasFilterTest.$(ARCH).o            \
 $(SRC)/extra.$(ARCH).o            \
 $(SRC)/plotstuff.$(ARCH).o            \
 $(SRC)/fitpoly.$(ARCH).o
+
+# stupid dependencies: 
+# UpdateObjects.c:UpdateObjects_Chips needs
+# ImageOps.c:MeasFilterTiny forces
+# load_images.c:free_astrom_table needs
+# select_images.c
+# MosaicOps.c
 
 $(FITSTK): $(INC)/relastro.h

branches/eam_branches/ohana.20160226/src/relastro/src/ImageOps.c

@@ -931 +931 @@
 }
 
+# if (0) 
 /** lifted from relphot/StarOps.clean_measures */
 void FlagOutliers2D(Catalog *catalog);
@@ -1298 +1299 @@
   return TRUE;
 }
+# endif

branches/eam_branches/ohana.20160226/src/relastro/src/fitobj.c

@@ -240 +240 @@
   return catalog;
 }
+
+// these dummy functions are used to avoid including ImageOps, etc
+int areImagesMatched () {
+  return FALSE;
+}
+float getColorBlue (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}
+float getColorRed (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}

branches/eam_branches/ohana.20160226/src/relastro/src/fitobj2.c

@@ -265 +265 @@
   return catalog;
 }
+
+// these dummy functions are used to avoid including ImageOps, etc
+int areImagesMatched () {
+  return FALSE;
+}
+float getColorBlue (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}
+float getColorRed (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}

branches/eam_branches/ohana.20160226/src/relastro/src/fitstk.c

@@ -279 +279 @@
   return catalog;
 }
+
+// these dummy functions are used to avoid including ImageOps, etc
+int areImagesMatched () {
+  return FALSE;
+}
+float getColorBlue (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}
+float getColorRed (off_t meas, int cat) {
+  OHANA_UNUSED_PARAM(meas);
+  OHANA_UNUSED_PARAM(cat);
+  return (NAN);
+}