Index: /trunk/Ohana/src/opihi/dvo/dvo.c.in =================================================================== --- /trunk/Ohana/src/opihi/dvo/dvo.c.in (revision 16432) +++ /trunk/Ohana/src/opihi/dvo/dvo.c.in (revision 16433) @@ -57,4 +57,10 @@ void cleanup () { QuitKapa (); + ConfigFree (); + + FreeBasic (); + FreeData (); + FreeAstro (); + FreeDVO (); return; } Index: /trunk/Ohana/src/opihi/dvo/init.c =================================================================== --- /trunk/Ohana/src/opihi/dvo/init.c (revision 16432) +++ /trunk/Ohana/src/opihi/dvo/init.c (revision 16433) @@ -1,107 +1,107 @@ # include "dvoshell.h" -int avextract PROTO((int, char **)); -int badimages PROTO((int, char **)); -int calextract PROTO((int, char **)); -int calmextract PROTO((int, char **)); -int catlog PROTO((int, char **)); +int avextract PROTO((int, char **)); +int badimages PROTO((int, char **)); +int calextract PROTO((int, char **)); +int calmextract PROTO((int, char **)); +int catlog PROTO((int, char **)); int catdir_define PROTO((int, char **)); -int ccd PROTO((int, char **)); -int cmatch PROTO((int, char **)); -int cmd PROTO((int, char **)); -int cmpload PROTO((int, char **)); -int cmpread PROTO((int, char **)); -int ddmags PROTO((int, char **)); -int detrend PROTO((int, char **)); -int dmagaves PROTO((int, char **)); -int dmagmeas PROTO((int, char **)); -int dmags PROTO((int, char **)); -int dmt PROTO((int, char **)); +int ccd PROTO((int, char **)); +int cmatch PROTO((int, char **)); +int cmd PROTO((int, char **)); +int cmpload PROTO((int, char **)); +int cmpread PROTO((int, char **)); +int ddmags PROTO((int, char **)); +int detrend PROTO((int, char **)); +int dmagaves PROTO((int, char **)); +int dmagmeas PROTO((int, char **)); +int dmags PROTO((int, char **)); +int dmt PROTO((int, char **)); int elixir PROTO((int, char **)); int fitcolors PROTO((int, char **)); int fitsed PROTO((int, char **)); -int gcat PROTO((int, char **)); -int getxtra PROTO((int, char **)); -int gimages PROTO((int, char **)); -int gstar PROTO((int, char **)); -int gtypes PROTO((int, char **)); -int images PROTO((int, char **)); -int imbox PROTO((int, char **)); -int imdata PROTO((int, char **)); -int imdense PROTO((int, char **)); -int imextract PROTO((int, char **)); -int imlist PROTO((int, char **)); -int imphot PROTO((int, char **)); -int imrough PROTO((int, char **)); -int imsearch PROTO((int, char **)); -int imstats PROTO((int, char **)); -int lcat PROTO((int, char **)); -int lcurve PROTO((int, char **)); -int lightcurve PROTO((int, char **)); -int mextract PROTO((int, char **)); -int pcat PROTO((int, char **)); -int photcodes PROTO((int, char **)); -int pmeasure PROTO((int, char **)); -int paverage PROTO((int, char **)); -int procks PROTO((int, char **)); -int showtile PROTO((int, char **)); -int skycat PROTO((int, char **)); -int skycoverage PROTO((int, char **)); -int skyregion PROTO((int, char **)); -int simage PROTO((int, char **)); -int subpix PROTO((int, char **)); +int gcat PROTO((int, char **)); +int getxtra PROTO((int, char **)); +int gimages PROTO((int, char **)); +int gstar PROTO((int, char **)); +int gtypes PROTO((int, char **)); +int images PROTO((int, char **)); +int imbox PROTO((int, char **)); +int imdata PROTO((int, char **)); +int imdense PROTO((int, char **)); +int imextract PROTO((int, char **)); +int imlist PROTO((int, char **)); +int imphot PROTO((int, char **)); +int imrough PROTO((int, char **)); +int imsearch PROTO((int, char **)); +int imstats PROTO((int, char **)); +int lcat PROTO((int, char **)); +int lcurve PROTO((int, char **)); +int lightcurve PROTO((int, char **)); +int mextract PROTO((int, char **)); +int pcat PROTO((int, char **)); +int photcodes PROTO((int, char **)); +int pmeasure PROTO((int, char **)); +int paverage PROTO((int, char **)); +int procks PROTO((int, char **)); +int showtile PROTO((int, char **)); +int skycat PROTO((int, char **)); +int skycoverage PROTO((int, char **)); +int skyregion PROTO((int, char **)); +int simage PROTO((int, char **)); +int subpix PROTO((int, char **)); int version PROTO((int, char **)); static Command cmds[] = { - {"avextract", avextract, "extract average data values"}, - {"badimages", badimages, "look for images with anomalous astrometry"}, - {"calextract", calextract, "extract photometry calibration"}, - {"calmextract", calmextract, "extract photometry calibration"}, - {"catdir", catdir_define,"re-define CATDIR"}, - {"ccd", ccd, "plot color-color diagram"}, - {"cmatch", cmatch, "match two catalogs"}, - {"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"}, - {"fitcolors", fitcolors, "fit chip-to-chip color terms"}, - {"fitsed", fitsed, "fit stellar SEDs to objects"}, - {"gcat", gcat, "get catalog at location"}, - {"gimages", gimages, "get images at location"}, - {"gstar", gstar, "get star statistics"}, - {"images", images, "plot image boxes"}, - {"imbox", imbox, "plot expected image box"}, - {"imdata", imdata, "extract data for specific images"}, - {"imdense", imdense, "image density plot"}, - {"imextract", imextract, "extract vectors from catalogs"}, - {"imlist", imlist, "list image info"}, - {"imphot", imphot, "image photometry info"}, - {"imrough", imrough, "get info from imruf database"}, - {"imsearch", imsearch, "get info from imreg database"}, - {"imstats", imstats, "plot image statistics"}, - {"lcat", lcat, "list catalogs in region"}, - {"lcurve", lcurve, "plot lightcurve for a star"}, - {"lightcurve", lightcurve, "extract lightcurve for a star"}, - {"mextract", mextract, "extract measure data values"}, - {"pcat", skycat, "plot catalog boundaries"}, - {"photcodes", photcodes, "list photometry codes"}, - {"pmeasure", pmeasure, "plot individual measurements"}, - {"paverage", paverage, "plot average magnitude"}, - {"procks", procks, "plot rocks"}, - {"showtile", showtile, "plot tile pattern"}, - {"skycat", skycat, "show sky catalog boundaries"}, - {"skycoverage", skycoverage, "measure image union on sky"}, - {"skyregion", skyregion, "set sky region for db queries"}, - {"simage", simage, "plot stars in an image"}, - {"subpix", subpix, "get subpixel positions"}, - {"version", version, "show version information"}, -//{"addxtra", addxtra, "add extra data to object"}, -//{"getxtra", getxtra, "get extra data from object"}, + {1, "avextract", avextract, "extract average data values"}, + {1, "badimages", badimages, "look for images with anomalous astrometry"}, + {1, "calextract", calextract, "extract photometry calibration"}, + {1, "calmextract", calmextract, "extract photometry calibration"}, + {1, "catdir", catdir_define,"re-define CATDIR"}, + {1, "ccd", ccd, "plot color-color diagram"}, + {1, "cmatch", cmatch, "match two catalogs"}, + {1, "cmd", cmd, "plot cmd of stars in current region"}, + {1, "cmpload", cmpload, "load cmp file into ?"}, + {1, "cmpread", cmpread, "read data from cmp format files"}, + {1, "ddmags", ddmags, "plot magnitude differences"}, + {1, "detrend", detrend, "extract from detrend database?"}, + {1, "dmagaves", dmagaves, "foo"}, + {1, "dmagmeas", dmagmeas, "foo"}, + {1, "dmags", dmags, "plot differential magnitudes between filters"}, + {1, "dmt", dmt, "plot mag scatter"}, + {1, "elixir", elixir, "talk to elixir"}, + {1, "fitcolors", fitcolors, "fit chip-to-chip color terms"}, + {1, "fitsed", fitsed, "fit stellar SEDs to objects"}, + {1, "gcat", gcat, "get catalog at location"}, + {1, "gimages", gimages, "get images at location"}, + {1, "gstar", gstar, "get star statistics"}, + {1, "images", images, "plot image boxes"}, + {1, "imbox", imbox, "plot expected image box"}, + {1, "imdata", imdata, "extract data for specific images"}, + {1, "imdense", imdense, "image density plot"}, + {1, "imextract", imextract, "extract vectors from catalogs"}, + {1, "imlist", imlist, "list image info"}, + {1, "imphot", imphot, "image photometry info"}, + {1, "imrough", imrough, "get info from imruf database"}, + {1, "imsearch", imsearch, "get info from imreg database"}, + {1, "imstats", imstats, "plot image statistics"}, + {1, "lcat", lcat, "list catalogs in region"}, + {1, "lcurve", lcurve, "plot lightcurve for a star"}, + {1, "lightcurve", lightcurve, "extract lightcurve for a star"}, + {1, "mextract", mextract, "extract measure data values"}, + {1, "pcat", skycat, "plot catalog boundaries"}, + {1, "photcodes", photcodes, "list photometry codes"}, + {1, "pmeasure", pmeasure, "plot individual measurements"}, + {1, "paverage", paverage, "plot average magnitude"}, + {1, "procks", procks, "plot rocks"}, + {1, "showtile", showtile, "plot tile pattern"}, + {1, "skycat", skycat, "show sky catalog boundaries"}, + {1, "skycoverage", skycoverage, "measure image union on sky"}, + {1, "skyregion", skyregion, "set sky region for db queries"}, + {1, "simage", simage, "plot stars in an image"}, + {1, "subpix", subpix, "get subpixel positions"}, + {1, "version", version, "show version information"}, +//{1, "addxtra", addxtra, "add extra data to object"}, +//{1, "getxtra", getxtra, "get extra data from object"}, }; @@ -116,2 +116,5 @@ } } + +void FreeDVO () { +}