Changeset 2822

Timestamp:

Dec 23, 2004, 5:16:39 PM (22 years ago)

Author:

eugene

Message:

minor fixes

Location:

trunk/Ohana/src/opihi/dvo

Files:

• Makefile (modified) (3 diffs)
• imsearch.c (modified) (1 diff)
• init.c (modified) (4 diffs)

trunk/Ohana/src/opihi/dvo/Makefile

@@ -25 +25 @@
 # dvo user commands and support functions ########################
 
-dvo = \
+dvofuncs = \
 $(SDIR)/init.$(ARCH).o                  \
+$(SDIR)/ImageOps.$(ARCH).o              \
+$(SDIR)/LoadImages.$(ARCH).o            \
+$(SDIR)/aregion.$(ARCH).o               \
+$(SDIR)/compare.$(ARCH).o               \
+$(SDIR)/find_regions.$(ARCH).o          \
+$(SDIR)/get_regions.$(ARCH).o           \
+$(SDIR)/match_image.$(ARCH).o           \
+$(SDIR)/photometry.$(ARCH).o            \
+$(SDIR)/dvomisc.$(ARCH).o               \
+$(SDIR)/region_list.$(ARCH).o           \
+$(SDIR)/dvo.$(ARCH).o
+
+dvocmds = \
 $(SDIR)/avextract.$(ARCH).o             \
 $(SDIR)/badimages.$(ARCH).o             \
@@ -32 +45 @@
 $(SDIR)/calmextract.$(ARCH).o           \
 $(SDIR)/catalog.$(ARCH).o               \
+$(SDIR)/ccd.$(ARCH).o                   \
 $(SDIR)/cmatch.$(ARCH).o                \
-$(SDIR)/ccd.$(ARCH).o                   \
 $(SDIR)/cmd.$(ARCH).o                   \
 $(SDIR)/cmpload.$(ARCH).o               \
 $(SDIR)/cmpread.$(ARCH).o               \
 $(SDIR)/ddmags.$(ARCH).o                \
+$(SDIR)/detrend.$(ARCH).o               \
 $(SDIR)/dmagaves.$(ARCH).o              \
 $(SDIR)/dmagmeas.$(ARCH).o              \
 $(SDIR)/dmags.$(ARCH).o                 \
 $(SDIR)/dmt.$(ARCH).o                   \
+$(SDIR)/elixir.$(ARCH).o                \
 $(SDIR)/gcat.$(ARCH).o                  \
 $(SDIR)/gimages.$(ARCH).o               \
@@ -64 +79 @@
 $(SDIR)/showtile.$(ARCH).o              \
 $(SDIR)/simage.$(ARCH).o                \
-$(SDIR)/subpix.$(ARCH).o                \
-$(SDIR)/find_regions.$(ARCH).o          \
-$(SDIR)/get_regions.$(ARCH).o           \
-$(SDIR)/aregion.$(ARCH).o               \
-$(SDIR)/region_list.$(ARCH).o           \
-$(SDIR)/match_image.$(ARCH).o           \
-$(SDIR)/LoadImages.$(ARCH).o            \
-$(SDIR)/ImageOps.$(ARCH).o              \
-$(SDIR)/dvomisc.$(ARCH).o               \
-$(SDIR)/compare.$(ARCH).o               \
-$(SDIR)/photometry.$(ARCH).o            \
-$(SDIR)/dvo.$(ARCH).o
+$(SDIR)/subpix.$(ARCH).o                
+
+dvo = $(dvofuncs) $(dvocmds)
 
 libs = \

trunk/Ohana/src/opihi/dvo/imsearch.c

@@ -118 +118 @@
     if (TimeSelect && ((pimage[i].obstime < tzero) || (pimage[i].obstime > tzero + trange))) continue;
     if (FilterSelect && (strcasecmp (pimage[i].filter, Filter))) continue;
-    if (ModeSelect && (pimage[i].mode != mode)) continue;
+    if (ModeSelect && (pimage[i].mode != Mode)) continue;
     if (CCDSelect && (pimage[i].ccd != CCD)) continue;
     if (TypeSelect && (pimage[i].type != Type)) continue;
 
-    obstime = ctime (&pimage[i].obstime);
+    obstime = ctime ((time_t *)&pimage[i].obstime);
     obstime[strlen(obstime)-1] = 0;
 

trunk/Ohana/src/opihi/dvo/init.c

@@ -1 +1 @@
 # include "dvo.h"
 
-int addxtra         PROTO((int, char **));
 int avextract       PROTO((int, char **));
 int badimages       PROTO((int, char **));
@@ -18 +17 @@
 int dmags           PROTO((int, char **));
 int dmt             PROTO((int, char **));
+int elixir          PROTO((int, char **));
 int gcat            PROTO((int, char **));
 int getxtra         PROTO((int, char **));
@@ -45 +45 @@
 
 /* temporarily exclude
+int addxtra         PROTO((int, char **));
   {"addxtra",     addxtra,      "add extra data to object"},
-  {"detrend",     detrend,      "extract from detrend database?"},
   {"getxtra",     getxtra,      "get extra data from object"},
 */
@@ -56 +56 @@
   {"calmextract", calmextract,  "extract photometry calibration"},
   {"catalog",     catlog,       "plot catalog stars"},
+  {"ccd",         ccd,          "plot color-color diagram"},
   {"cmatch",      cmatch,       "match two catalogs"},
-  {"ccd",         ccd,          "plot color-color diagram"},
   {"cmd",         cmd,          "plot cmd of stars in current region"},
   {"cmpload",     cmpload,      "load cmp file into ?"},
   {"cmpread",     cmpread,      "read data from cmp format files"},
   {"ddmags",      ddmags,       "plot magnitude differences"},
+  {"detrend",     detrend,      "extract from detrend database?"},
   {"dmagaves",    dmagaves,     "foo"},
   {"dmagmeas",    dmagmeas,     "foo"},
   {"dmags",       dmags,        "plot differential magnitudes between filters"},
   {"dmt",         dmt,          "plot mag scatter"},
+  {"elixir",      elixir,       "talk to elixir"},
   {"gcat",        gcat,         "get catalog at location"},
   {"gimages",     gimages,      "get images at location"},