Changeset 7680

Timestamp:

Jun 24, 2006, 1:06:12 PM (20 years ago)

Author:

eugene

Message:

changed dvo1.h to dvoshell.h

Location:

trunk/Ohana/src/opihi

Files:

• cmd.astro/objload.c (modified) (1 diff)
• dvo/ImageOps.c (modified) (1 diff)
• dvo/ImageSelection.c (modified) (1 diff)
• dvo/LoadImages.c (modified) (1 diff)
• dvo/Makefile (modified) (2 diffs)
• dvo/addxtra.c (modified) (1 diff)
• dvo/aregion.c (modified) (1 diff)
• dvo/avextract.c (modified) (1 diff)
• dvo/badimages.c (modified) (1 diff)
• dvo/calextract.c (modified) (1 diff)
• dvo/calmextract.c (modified) (1 diff)
• dvo/catalog.c (modified) (1 diff)
• dvo/catdir.c (modified) (1 diff)
• dvo/ccd.c (modified) (1 diff)
• dvo/cmatch.c (modified) (1 diff)
• dvo/cmd.c (modified) (1 diff)
• dvo/cmpRead.c (modified) (1 diff)
• dvo/cmpload.c (modified) (1 diff)
• dvo/cmpread.c (modified) (1 diff)
• dvo/compare.c (modified) (1 diff)
• dvo/ddmags.c (modified) (1 diff)
• dvo/detrend.c (modified) (1 diff)
• dvo/dmagaves.c (modified) (1 diff)
• dvo/dmagmeas.c (modified) (1 diff)
• dvo/dmags.c (modified) (1 diff)
• dvo/dmt.c (modified) (1 diff)
• dvo/dvo.c (modified) (1 diff)
• dvo/dvomisc.c (modified) (1 diff)
• dvo/elixir.c (modified) (1 diff)
• dvo/extract.c (modified) (1 diff)
• dvo/find_regions.c (modified) (1 diff)
• dvo/fitcolors.c (modified) (3 diffs)
• dvo/gcat.c (modified) (1 diff)
• dvo/get_regions.c (modified) (1 diff)
• dvo/getxtra.c (modified) (1 diff)
• dvo/gimages.c (modified) (1 diff)
• dvo/gstar.c (modified) (1 diff)
• dvo/images.c (modified) (1 diff)
• dvo/imbox.c (modified) (1 diff)
• dvo/imdata.c (modified) (1 diff)
• dvo/imdense.c (modified) (1 diff)
• dvo/imextract.c (modified) (1 diff)
• dvo/imlist.c (modified) (1 diff)
• dvo/imphot.c (modified) (1 diff)
• dvo/imrough.c (modified) (1 diff)
• dvo/imsearch.c (modified) (1 diff)
• dvo/imstats.c (modified) (1 diff)
• dvo/init.c (modified) (3 diffs)
• dvo/lcat.c (modified) (1 diff)
• dvo/lcurve.c (modified) (1 diff)
• dvo/lightcurve.c (modified) (1 diff)
• dvo/match_image.c (modified) (1 diff)
• dvo/mextract.c (modified) (1 diff)
• dvo/pcat.c (modified) (1 diff)
• dvo/photcodes.c (modified) (1 diff)
• dvo/photometry.c (modified) (1 diff)
• dvo/pmeasure.c (modified) (1 diff)
• dvo/procks.c (modified) (1 diff)
• dvo/region_list.c (modified) (1 diff)
• dvo/showtile.c (modified) (1 diff)
• dvo/simage.c (modified) (1 diff)
• dvo/skycat.c (modified) (1 diff)
• dvo/skycoverage.c (modified) (1 diff)
• dvo/subpix.c (modified) (1 diff)
• dvo/version.c (modified) (1 diff)
• include/data.h (modified) (1 diff)
• include/dvo1.h (deleted)
• include/dvo2.h (deleted)
• include/dvoshell.h (added)
• lib.data/graphtools.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.astro/objload.c

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define CHAR_LINE 104
 # define NBLOCK 100

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset,

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* db image table */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 Image *LoadImages (int *nimage) {

trunk/Ohana/src/opihi/dvo/Makefile

@@ -57 +57 @@
 $(SDIR)/elixir.$(ARCH).o                \
 $(SDIR)/fitcolors.$(ARCH).o             \
+$(SDIR)/fitsed.$(ARCH).o                \
 $(SDIR)/gcat.$(ARCH).o                  \
 $(SDIR)/gimages.$(ARCH).o               \
@@ -99 +100 @@
 help: cmd.basic.help cmd.data.help cmd.astro.help dvo.help
 
-$(funcs) $(cmds) $(libs) : $(INC)/dvo1.h
+$(funcs) $(cmds) $(libs) : $(INC)/dvoshell.h
 
 .PHONY: dvo

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 typedef struct {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # include "hstgsc.h"
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int avextract (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 static int badim_int = FALSE;

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 enum {Nd, Nm, NC, NR, ND, Np, Nc, Nt, Nx, Nd1, Nd2, NVEC};

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 enum {Nd, Nm1, Nm2, Nc, Ns, Nt, Nz, NR, ND, Nxc, Nyc, Nxm, Nym, NT, NP, Nd1, Nd2, NVEC};

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define NBYTES 160000
 # define BYTES_STAR 23

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int catdir_define (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int ccd (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int cmatch (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int cmd (int argc, char **argv) { /* really need to think about upper limits & how to represent them */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define D_NSTARS 1000
 # define BYTES_STAR 66

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define D_NSTARS 1000
 # define BYTES_STAR 66

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* add others as needed */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define D_NMATCH 500;
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int ddmags (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* qualities to be extracted */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int dmagaves (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int dmagmeas (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int dmags (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* extract vectors giving delta mags for multiple measurements */ 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 # define opihi_name "DVO"

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int WriteMsg (char *fifo, char *message);

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 // XXX EAM : this function is deprecated
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # include "hstgsc.h"
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define NMIN_PTS 100
 
-void init_catalog (Catalog *catalog);
-void free_catalog (Catalog *catalog, int Ncatalog);
+static void init_catalog (Catalog *catalog);
+static void free_catalog (Catalog *catalog, int Ncatalog);
 
 /* this function takes a photcode (and camera name?) and measures the  *
@@ -394 +394 @@
 }
 
-void free_catalog (Catalog *catalog, int Ncatalog) {
+static void free_catalog (Catalog *catalog, int Ncatalog) {
 
   int i;
@@ -407 +407 @@
 }
 
-void init_catalog (Catalog *catalog) {
+static void init_catalog (Catalog *catalog) {
   catalog[0].average = NULL; 
   catalog[0].secfilt = NULL;

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int gcat (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* return region files containing given image */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int getxtra (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int gimages (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 void print_value (FILE *f, double value, short int ival);

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int images (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imbox (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imdata (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 extern double drand48();
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG};

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imlist (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imphot (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 RegImage *load_imreg (char *DataBase, int *nimage);
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imsearch (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int imstats (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int avextract       PROTO((int, char **));
@@ -20 +20 @@
 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 **));
@@ -76 +77 @@
   {"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"},

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int lcat (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int lcurve (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int lightcurve (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int match_image (Image *image, int Nimage, unsigned int T, short int S) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int mextract (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside);
 

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* list or return all photcodes equivalent to the given filter */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* match code to measure  */

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int pmeasure (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 typedef struct {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 /* XXX note : for RegionName or RegionList, we need to free the skylist

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 static float dr[] = {0.0, 1.0, 1.0, 0.0};
 static float dd[] = {0.0, 0.0, 1.0, 1.0};

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 # define D_NSTARS 1000
 # define BYTES_STAR 31

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside);

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int skycoverage (int argc, char **argv) {

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 
 int bracket (double *list, double value, int Nlist, int mode);

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

@@ -1 @@
-# include "dvo1.h"
+# include "dvoshell.h"
 static char *name = "$Name: not supported by cvs2svn $";
 

trunk/Ohana/src/opihi/include/data.h

@@ -120 +120 @@
 /* graphtools.c */
 void          SetLimits             PROTO((Vector *xvec, Vector *yvec, Graphdata *graphmode));
+void          SetLimitsRaw          PROTO((float *xvec, float *yvec, int Npts, Graphdata *graphmode));
 void          ApplyLimits           PROTO((int Xgraph, Graphdata *graphmode, int apply));
 int           style_args            PROTO((Graphdata *graphmode, int *argc, char **argv, int Nforce));

trunk/Ohana/src/opihi/lib.data/graphtools.c

@@ -40 +40 @@
   set_variable ("YMAX", graphmode[0].ymax);
 }
+
+void SetLimitsRaw (float *xvec, float *yvec, int Nelements, Graphdata *graphmode) {
+
+  double maxX, minX, maxY, minY, range;
+  int i;
+
+  if (xvec != NULL) {
+    maxX = minX = xvec[0];
+    for (i = 1; i < Nelements; i++) {
+      if (!finite(xvec[i])) continue;
+      maxX = MAX (maxX, xvec[i]);
+      minX = MIN (minX, xvec[i]);
+    }
+    range = maxX - minX;
+    if (range == 0) range = 0.001 * maxX;
+    if (range == 0) range = 0.001;
+    graphmode[0].xmin = minX - 0.05*range;
+    graphmode[0].xmax = maxX + 0.05*range;
+  }
+
+  if (yvec != NULL) {
+    maxY = minY = yvec[0];
+    for (i = 1; i < Nelements; i++) {
+      if (!finite(yvec[i])) continue;
+      maxY = MAX (maxY, yvec[i]);
+      minY = MIN (minY, yvec[i]);
+    }
+    range = maxY - minY;
+    if (range == 0) range = 0.0011 * maxY;
+    if (range == 0) range = 0.0011;
+    graphmode[0].ymin = minY - 0.05*range;
+    graphmode[0].ymax = maxY + 0.05*range;
+  }
+  SetGraph (graphmode[0]);
+
+  set_variable ("XMIN", graphmode[0].xmin);
+  set_variable ("XMAX", graphmode[0].xmax);
+  set_variable ("YMIN", graphmode[0].ymin);
+  set_variable ("YMAX", graphmode[0].ymax);
+}