Changeset 8496

Timestamp:

Aug 22, 2006, 4:43:45 PM (20 years ago)

Author:

eugene

Message:

convert to new DVO APIs, some cleanup of config options

Location:

trunk/Ohana/src/gastro2

Files:

• Makefile (modified) (4 diffs)
• include/gastro2.h (modified) (4 diffs)
• src/ConfigInit.c (modified) (3 diffs)
• src/extr2mass.c (deleted)
• src/gcatalog.c (deleted)
• src/getgsc.c (added)
• src/getptolemy.c (modified) (5 diffs)
• src/getusno.c (modified) (3 diffs)
• src/getusnob.c (modified) (8 diffs)
• src/gfit2.c (modified) (1 diff)
• src/gptolemy2.c (deleted)
• src/greference2.c (modified) (4 diffs)
• src/gregions2.c (deleted)
• src/lumfunc.c (modified) (2 diffs)
• src/misc.c (modified) (2 diffs)
• src/plots.c (modified) (2 diffs)
• src/plotstuff.c (modified) (1 diff)
• src/polyfit.c (modified) (1 diff)

trunk/Ohana/src/gastro2/Makefile

@@ -29 +29 @@
 
 GASTRO = \
-$(SRC)/getptolemy.$(ARCH).o \
-$(SRC)/gptolemy2.$(ARCH).o \
 $(SRC)/plots.$(ARCH).o \
 $(SRC)/gheader2.$(ARCH).o \
@@ -42 +40 @@
 $(SRC)/grid.$(ARCH).o \
 $(SRC)/lumfunc.$(ARCH).o \
-$(SRC)/gregions2.$(ARCH).o \
 $(SRC)/sort.$(ARCH).o \
 $(SRC)/misc.$(ARCH).o \
@@ -52 +49 @@
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gcatalog.$(ARCH).o \
+$(SRC)/getptolemy.$(ARCH).o \
+$(SRC)/getgsc.$(ARCH).o \
 $(SRC)/remove_clumps.$(ARCH).o \
 $(SRC)/rfits.$(ARCH).o \
 $(SRC)/rtext.$(ARCH).o
+
+#$(SRC)/gptolemy2.$(ARCH).o \
+#$(SRC)/gregions2.$(ARCH).o \
 
 OBJ = $(GASTRO)
@@ -64 +65 @@
 
 $(GASTRO): $(INC)/gastro2.h
-
-extr2mass: $(2MASS)
-        $(CC) $(2MASS) -o $(BIN)/extr2mass.linux $(CCFLAGS)
 
 coordtest: $(COORDTEST)

trunk/Ohana/src/gastro2/include/gastro2.h

@@ -93 +93 @@
 int FLIPX, FLIPY;
 int NPOLYTERMS;
-char CDROM[256];
-char USNO_B_DIR[256];
 char CATDIR[256];
 char   CATMODE[16];    /* raw, mef, split, mysql */
@@ -117 +115 @@
 double F_DEC;
 
-char GSCFILE[256], GSC_DIR[256], LONEOS_REGION_FILE[256];
-char TWO_MASS_DIR[256];
 double ASEC_PIX;
 char ROUGH_ASTROMETRY[64];
+
+/* locations for reference data */
+char GSCFILE[256];
+char GSCDIR[256];
+char CATDIR[256];
+char USNO_A_DIR[256];
+char USNO_B_DIR[256];
+char TWO_MASS_CATDIR[256];
+char ASTROM_CATDIR[256];
+char LONEOS_REGION_FILE[256];
 
 typedef struct {
@@ -143 +149 @@
 void      ahelp ();
 void      area_of_region (CatStats *region);
+double    area_of_skyregion (SkyRegion *region);
 void      args (int *argc, char **argv, Coords *coords);
 void      define_region (CatStats *catstats, CmpCatalog *Target);
@@ -182 +189 @@
 int       mk_vector (int n, int m, int norder);
 int       open_graph (int N);
+
 void      pair_add (int i1, int i2);
 void      pair_init ();
+int       pair_lists (int **index1, int **index2);
+
 int       parse_GSC_line (CatStats *tregion, char *line);
 int       plot_addpt_gridplot (double x, double y);

trunk/Ohana/src/gastro2/src/ConfigInit.c

@@ -15 +15 @@
   if (VERBOSE) fprintf (stderr, "loaded config file: %s\n", file);
 
+  GASTRO_MAX_NSTARS = 300;
   ScanConfig (config, "OFFSET_RADIUS",     "%lf", 0, &SEARCH_RADIUS);
   ScanConfig (config, "MIN_MATCHES",       "%d",  0, &MIN_MATCHES);
@@ -34 +35 @@
   ScanConfig (config, "POLAR_ALIGNMENT",   "%d",  0, &POLAR_ALIGNMENT);
   ScanConfig (config, "GSCFILE",           "%s",  0, GSCFILE);
-  ScanConfig (config, "GSCDIR",            "%s",  0, GSC_DIR);
-  ScanConfig (config, "2MASS_DIR",         "%s",  0, TWO_MASS_DIR);
   ScanConfig (config, "POLAR_AXIS_RA",     "%lf", 0, &POLE_RA);
   ScanConfig (config, "POLAR_AXIS_DEC",    "%lf", 0, &POLE_DEC);
@@ -41 +40 @@
   ScanConfig (config, "DEC_OFFSET",        "%lf", 0, &DEC_OFFSET);
   ScanConfig (config, "LONEOS_REGIONS",    "%s",  0, LONEOS_REGION_FILE);
-  ScanConfig (config, "USNO_CDROM",        "%s",  0, CDROM);
+
+  /* possible sources of astrometric reference data */
+  if (!ScanConfig (config, "USNO_A_DIR",             "%s",  0, USNO_A_DIR)) {
+    ScanConfig (config, "USNO_CDROM",             "%s",  0, USNO_A_DIR);
+  }
   ScanConfig (config, "USNO_B_DIR",        "%s",  0, USNO_B_DIR);
+  ScanConfig (config, "ASTROM_CATDIR",     "%s",  0, ASTROM_CATDIR);
+  ScanConfig (config, "2MASS_CATDIR",      "%s",  0, TWO_MASS_CATDIR);
+  ScanConfig (config, "GSCDIR",            "%s",  0, GSCDIR);
+
   ScanConfig (config, "ASTRO_REFCAT",      "%s",  0, REFCAT);
   ScanConfig (config, "CATDIR",            "%s",  0, CATDIR);

trunk/Ohana/src/gastro2/src/getptolemy.c

@@ -1 +1 @@
 # include "gastro2.h"
+double catalog_area (Average *average, int Naverage, SkyRegion *region);
 
 int getptolemy (CatStats *catstats, RefCatalog *Ref) {
   
-  int i, j, k, Ns, Nptolemy, Nregions; 
+  int i, j, k, Ns; 
   double FracArea;
-  GSCdata *ptolemy;
-  CatStats *regions;
+  Catalog catalog;
+  SkyList *skylist;
+  SkyTable *sky;
+  SkyRegion patch;
 
   Ref[0].N = 0;
@@ -12 +15 @@
   ALLOCATE (Ref[0].stars, StarData, 1);
 
-  regions = gregions (catstats, &Nregions);
+  patch.Rmin = catstats[0].RA[0];
+  patch.Rmax = catstats[0].RA[1];
+  patch.Dmin = catstats[0].DEC[0];
+  patch.Dmax = catstats[0].DEC[1];
+
+  /* load regions from GSC table, restrict to patch */
+  sky = SkyTableFromGSC (GSCFILE, 3, VERBOSE);
+  SkyTableSetFilenames (sky, CATDIR, "cpt");
+  skylist = SkyListByPatch (sky, -1, &patch);
   
-  for (i = 0; i < Nregions; i++) {
-    ptolemy = gptolemy (regions[i].name, &Nptolemy);
-    if (Nptolemy == 0) continue;
+  for (i = 0; i < skylist[0].Nregions; i++) {
+    // set the parameters which guide catalog open/load/create
+    catalog.filename  = skylist[0].filename[i];
+    catalog.catflags  = LOAD_AVES | LOAD_MEAS;
+    catalog.Nsecfilt  = 0;
 
-    // XXX this measurement adjusts a DVO database for 
-    // partial coverage; the correction is bogus if the
-    // sky density of the catalog is too low (<< 100 stars
-    // per field
+    // an error exit status here is a significant error
+    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
+      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
+      exit (2);
+    }
+    dvo_catalog_unlock (&catalog);
+
+    // Nave_disk == 0 implies an empty catalog file
+    // for only_match, skip empty catalogs
+    if (!catalog.Nave_disk) {
+      dvo_catalog_free (&catalog);
+      continue;
+    }
+
+    // this measurement adjusts a DVO database for partial coverage
+    // XXX the correction is bogus if the sky density of the catalog 
+    // is too low (<< 100 stars per field)
     FracArea = 1.0;
     if (PTOLEMY_FILL_FACTOR) {
-        FracArea = ptolemy_area (ptolemy, Nptolemy, &regions[i]);
+      FracArea = catalog_area (catalog.average, catalog.Naverage, skylist[0].regions[i]);
     } 
 
     Ns = Ref[0].N;
-    Ref[0].N += Nptolemy;
-    Ref[0].Area += regions[i].Area * FracArea;
+    Ref[0].N += catalog.Naverage;
+    Ref[0].Area += FracArea * area_of_skyregion (skylist[0].regions[i]);
 
     REALLOCATE (Ref[0].stars, StarData, MAX (1, Ref[0].N));
-    for (k = Ns, j = 0; j < Nptolemy; k++, j++) {
-      Ref[0].stars[k].R = ptolemy[j].R;
-      Ref[0].stars[k].D = ptolemy[j].D;
-      Ref[0].stars[k].M = ptolemy[j].M;
+    for (k = Ns, j = 0; j < catalog.Naverage; k++, j++) {
+      Ref[0].stars[k].R = catalog.average[j].R;
+      Ref[0].stars[k].D = catalog.average[j].D;
+      Ref[0].stars[k].M = catalog.measure[catalog.average[j].offset].M_PS;
     }      
-    free (ptolemy);
+    dvo_catalog_free (&catalog);
   }
   
@@ -52 +78 @@
 }  
 
-double ptolemy_area (GSCdata *ptolemy, int N, CatStats *patch) {
+double catalog_area (Average *average, int Naverage, SkyRegion *region) {
 
   int i, xb, yb, Nb;
@@ -58 +84 @@
   double frac, Rmin, Rmax, Dmin, Dmax, dR, dD;
 
-  Rmin = patch[0].RA[0];
-  Rmax = patch[0].RA[1];
-  Dmin = patch[0].DEC[0];
-  Dmax = patch[0].DEC[1];
+  Rmin = region[0].Rmin;
+  Rmax = region[0].Rmax;
+  Dmin = region[0].Dmin;
+  Dmax = region[0].Dmax;
   dR = Rmax - Rmin;
   dD = Dmax - Dmin;
@@ -71 +97 @@
   }
 
-  for (i = 0; i < N; i++) {
-    xb = MAX (MIN (0, 10 * (ptolemy[i].R - Rmin) / dR), 9);
-    yb = MAX (MIN (0, 10 * (ptolemy[i].D - Dmin) / dD), 9);
+  for (i = 0; i < Naverage; i++) {
+    xb = MAX (MIN (0, 10 * (average[i].R - Rmin) / dR), 9);
+    yb = MAX (MIN (0, 10 * (average[i].D - Dmin) / dD), 9);
     bin[xb][yb] ++;
   }

trunk/Ohana/src/gastro2/src/getusno.c

@@ -15 +15 @@
   float hours[100];
   int start[100], number[100], *buffer, *buf;
-  char filename[128], c;
+  char filename[128];
   FILE *f;
   double DEC1;
@@ -49 +49 @@
     }
     if (disk < 0) {
-      fprintf (stderr, "ERROR: can't find cdrom for spd %d\n",  spd);
+      fprintf (stderr, "ERROR: can't find USNO zone for spd %d\n",  spd);
       exit (0);
     }
     
     /* load accelerator file */
-    sprintf (filename, "%s/zone%04d.acc", CDROM, spd); 
+    sprintf (filename, "%s/zone%04d.acc", USNO_A_DIR, spd); 
     fprintf (stderr, "reading from %s\n", filename);
     f = fopen (filename, "r");
     if (f == (FILE *) NULL) {
-      fprintf (stderr, "can't open file %s, is cdrom %d in drive?\n", filename, disk);
-      fprintf (stderr, "press return when ready to continue: ");
-      fscanf (stdin, "%c", &c);
-      fprintf (stderr, "trying again...\n");
-      f = fopen (filename, "r");
-      if (f == (FILE *) NULL) {
-        fprintf (stderr, "ERROR: can't open file %s, is cdrom %d in drive?\n", filename, disk);
-        exit (1);  
-      }
+      fprintf (stderr, "ERROR: can't open accelerator file %s\n", filename);
+      exit (1);  
     }
     for (i = 0; fscanf (f, "%f %d %d", &hours[i], &start[i], &number[i]) != EOF; i++);
@@ -84 +77 @@
     
     /* open data file */
-    sprintf (filename, "%s/zone%04d.cat", CDROM, spd);
+    sprintf (filename, "%s/zone%04d.cat", USNO_A_DIR, spd);
     fprintf (stderr, "reading from %s\n", filename);
     f = fopen (filename, "r");

trunk/Ohana/src/gastro2/src/getusnob.c

@@ -1 +1 @@
 # include "gastro2.h"
 # define NZONE 180
+# define NBYTE   4
+# define NELEM  20
 
 int getusnob (CatStats *catstats, RefCatalog *Ref, double epoch) {
@@ -8 +10 @@
   float hours[100];
   int start[100], number[100], *buffer, *buf;
-  char filename[128], c;
+  char filename[128];
   FILE *f;
   double DEC1;
@@ -14 +16 @@
   float mB1, mB2, mR1, mR2, mB, mR;
   int iDEC0, iDEC1, iRA0, iRA1;
-  int spd, spd_start, spd_end, disk;
+  int spd, spd_start, spd_end;
   int NUSNO, Nusno, Nstars;
   StarData *stars;
@@ -42 +44 @@
     /* load accelerator file */
     sprintf (filename, "%s/%03d/b%04d.acc", USNO_B_DIR, (int)(spd/10), spd); 
-    fprintf (stderr, "reading from %s\n", filename);
+    if (VERBOSE) fprintf (stderr, "reading from %s\n", filename);
     f = fopen (filename, "r");
     if (f == (FILE *) NULL) {
-      fprintf (stderr, "can't open file %s, is cdrom %d in drive?\n", filename, disk);
-      fprintf (stderr, "press return when ready to continue: ");
-      fscanf (stdin, "%c", &c);
-      fprintf (stderr, "trying again...\n");
-      f = fopen (filename, "r");
-      if (f == (FILE *) NULL) {
-        fprintf (stderr, "ERROR: can't open file %s, is cdrom %d in drive?\n", filename, disk);
-        exit (1);  
-      }
+      fprintf (stderr, "ERROR: can't open accelerator file %s\n", filename);
+      exit (1);  
     }
     for (i = 0; fscanf (f, "%f %d %d", &hours[i], &start[i], &number[i]) != EOF; i++);
@@ -71 +66 @@
     
     /* open data file */
-    sprintf (filename, "%s/zone%04d.cat", CDROM, spd);
-    fprintf (stderr, "reading from %s\n", filename);
+    sprintf (filename, "%s/%03d/b%04d.cat", USNO_B_DIR, (int)(spd/10), spd); 
+    if (VERBOSE) fprintf (stderr, "reading from %s\n", filename);
     f = fopen (filename, "r");
     if (f == (FILE *) NULL) {
@@ -79 +74 @@
     }
 
+    /** USNO-B consists of 20 x 4byte (int) records **/
     /* advance file pointer to first slice */
-    /**** 80 is record-length for USNO-B ****/
-    offset = 80*sizeof(int)*(start[first] - 1);
+    offset = NELEM*NBYTE*(start[first] - 1);
     fseek (f, offset, SEEK_SET);
 
@@ -89 +84 @@
       Nstars += number[bin];
     }
-    Nitems = 80*Nstars/4;  /* number of integer blocks; need to use Fread for byte-swapping read */
+    Nitems = NELEM*Nstars;  /* number of integer blocks; need to use Fread for byte-swapping read */
 
     /* allocate space for stars in segment */
     ALLOCATE (buffer, int, Nitems);
-    nitems = Fread (buffer, sizeof(int), Nitems, f, "int");
+    // data has the WRONG byte order?
+    // nitems = Fread (buffer, sizeof(int), Nitems, f, "int");
+    nitems = fread (buffer, sizeof(int), Nitems, f);
     if (nitems != Nitems) {
       fprintf (stderr, "ERROR: failure reading data from file %s\n", filename);
@@ -101 +98 @@
     buf = buffer;
     /* print out data from slice within RA and DEC range */
-    for (i = 0; i < Nstars; i++, buf+=20) {
+    for (i = 0; i < Nstars; i++, buf += NELEM) {
       if (buf[0] < iRA0) continue;
       if (buf[0] > iRA1) continue;

trunk/Ohana/src/gastro2/src/gfit2.c

@@ -76 +76 @@
   if (PLOTSTUFF) fprintf (stderr, "ploting resid (2)\n");
   plot_resid_init (0, (double) Target[0].header.Naxis[0]);
-  plot_resid_init (1, (double) Target[0].header.Naxis[1]);
+  // XXX test: plotting fit_apply and RD_to_XY results plot_resid_init (1, (double) Target[0].header.Naxis[1]);
+  plot_resid_init (1, (double) Target[0].header.Naxis[0]);
   if (PLOTSTUFF) plot_resid (st, sr, &Target[0].coords);
   free (idx1);

trunk/Ohana/src/gastro2/src/greference2.c

@@ -29 +29 @@
   /* get stars from 2MASS for the given region -- add PHOTCODE check? */
   if (!strcasecmp (REFCAT, "2MASS")) {
-    strcpy (CATDIR, TWO_MASS_DIR);
+    strcpy (CATDIR, TWO_MASS_CATDIR);
     getptolemy (&catstats, Ref);
-    /* get2mass (&catstats, Ref); */
   }
   
   /* get stars from the DVO CATDIR for the given region */
   if (!strcasecmp (REFCAT, "PTOLEMY")) {
+    strcpy (CATDIR, ASTROM_CATDIR);
     getptolemy (&catstats, Ref);
   }
@@ -44 +44 @@
   }
 
-  Ref[0].lum.Mz = (2 + log (Ref[0].Area) / log (10.) - Ref[0].lum.Mo) / Ref[0].lum.dNdM;
-  Target[0].lum.Mz = (2 + log (Target[0].Area) / log (10.) - Target[0].lum.Mo) / Target[0].lum.dNdM;
-  Ref[0].Moff = Target[0].lum.Mz - Ref[0].lum.Mz;
-  fprintf (stderr, "mag offset: %f (Areas: %f vs %f)\n", Ref[0].Moff, Target[0].Area, Ref[0].Area);
+  {
+    double Mref, Mtar, logRho;
+
+    /* what is the offset between the two lines at the average magnitude? */
+    Mref = 0.5*(Ref[0].lum.Mmin + Ref[0].lum.Mmax);
+    logRho = Mref * Ref[0].lum.dNdM + Ref[0].lum.Mo - log10(Ref[0].Area);
+    Mtar = (logRho + log10(Ref[0].Area) - Target[0].lum.Mo) / Target[0].lum.dNdM;
+
+    Ref[0].lum.Mz = Mref;
+    Target[0].lum.Mz = Mtar;
+    Ref[0].Moff = Target[0].lum.Mz - Ref[0].lum.Mz;
+    fprintf (stderr, "mag offset: %f (Areas: %f vs %f; log(Rho): %f @ %f mags)\n", Ref[0].Moff, Target[0].Area, Ref[0].Area, logRho, Mref);
+  }
 
   if (PLOTSTUFF) plot_lumfunc (Target, Ref);
@@ -79 +88 @@
   }
 
+  catstats[0].RA[0] =  360.0;
+  catstats[0].RA[1] =    0.0;
+  catstats[0].DEC[0] = +90.0;
+  catstats[0].DEC[1] = -90.0;
+
   for (x = 0; x <= 1.0; x += 0.5) {
     for (y = 0; y <= 1.0; y += 0.5) {
@@ -98 +112 @@
   /* is a pole in the image?  if so, include it... */
   status = RD_to_XY (&X, &Y, 0.0, 90.0, &Target[0].coords);
-  if (status) catstats[0].DEC[1] = 90.0;
-
+  if (status) {
+      if (fabs(X - NX*0.5) < (NFIELD + 0.5)*NX) goto not_north;
+      if (fabs(Y - NY*0.5) < (NFIELD + 0.5)*NY) goto not_north;
+      catstats[0].DEC[1] = 90.0;
+  }
+not_north:
+  
   status = RD_to_XY (&X, &Y, 0.0, -90.0, &Target[0].coords);
-  if (status) catstats[0].DEC[0] = -90.0;
+  if (status) {
+      if (fabs(X - NX*0.5) < (NFIELD + 0.5)*NX) goto not_south;
+      if (fabs(Y - NY*0.5) < (NFIELD + 0.5)*NY) goto not_south;
+      catstats[0].DEC[0] = -90.0;
+  }
+not_south:
 
   if (VERBOSE) fprintf (stderr, "full region: %f - %f, %f - %f\n", 

trunk/Ohana/src/gastro2/src/lumfunc.c

@@ -9 +9 @@
 int get_luminosity_func (StarData *stars, int N, LumStats *lum) {
 
-  int i, j, Nb;
+  int i, j, Nb, peaki, peakn;
   double mbin[NMBIN];
   double bin[NMBIN], lbin[NMBIN], rbin[NMBIN];
@@ -28 +28 @@
   }
 
+  /* find peak bin */
+  peaki = 0;
+  peakn = mbin[0];
+  for (i = 0; i < NMBIN; i++) {
+    if (mbin[i] > peakn) {
+      peaki = i;
+      peakn = mbin[i];
+    }
+  }
+
   /* select filled bins */
-  for (Nb = i = 0; i < NMBIN; i++) {
+  for (Nb = i = 0; i < peaki; i++) {
     if (mbin[i] > 0) {
       bin[Nb]  = i * dM + MMIN;

trunk/Ohana/src/gastro2/src/misc.c

@@ -35 +35 @@
 }
 
-/***** convert [-]00:00:00 to 0.0000 ****/
-int dms_to_ddd (double *Value, char *string) {
-  
-  int valid, neg, status;
-  double tmp, value;
-  char *p1, *p2, *px;
-
-  valid = FALSE; 
-  neg = FALSE;
-  stripwhite (string);
-  p1 = string;
-  px = string + strlen(string);
-
-  if (string[0] == '-') { 
-    valid = TRUE; 
-    neg = TRUE;
-    p1 = &string[1];
-  }
-  if (string[0] == '+') { 
-    valid = TRUE; 
-    neg = FALSE;
-    p1 = &string[1];
-  }
-  if (isdigit(string[0])) { 
-    valid = TRUE;
-    p1 = &string[0];
-  }
-  if (!valid) { return (FALSE); }
-
-  status = 1;
-  tmp = strtod (p1, &p2);
-  if (p2 == p1) return (FALSE); /* entry not a number: +fred */
-  value = tmp;
-  if (p2 == px) goto escape;    /* entry only number: +1.0 */ 
-  p1 = p2 + 1;
-
-  tmp = strtod (p1, &p2);
-  if (p2 == p1) goto escape;    /* entry not a number: +1:fred */
-  status = 2;
-  value += tmp / 60.0;
-  if (p2 == px) goto escape;    /* entry only number: +1:1 */
-  p1 = p2 + 1;
-
-  tmp = strtod (p1, &p2);
-  if (p2 == p1) goto escape;    /* entry not a number: +1:1:fred */
-  value += tmp / 3600.0;
-
- escape:
-  if (neg) {
-    value *= -1;
-  }
-  *Value = value;
-
-  return (status);
-}
-
-/**********/
-int str_to_radec (double *ra, double *dec, char *str1, char *str2) {
-
-  double Ra, Dec;
-
-  *ra = *dec = 0;
-  switch (dms_to_ddd (&Ra, str1)) {
-  case 0:
-    fprintf (stderr, "syntax error in RA\n");
-    return (FALSE);
-  case 1:
-    break;
-  case 2:
-    Ra = Ra * 15;
-    break;
-  }
-  switch (dms_to_ddd (&Dec, str2)) {
-  case 0:
-    fprintf (stderr, "syntax error in DEC\n");
-    return (FALSE);
-  case 1:
-  case 2:
-    break;
-  }
-  *ra = Ra;
-  *dec = Dec;
-  return (TRUE);
-}
-
 void area_of_region (CatStats *region) {
   
@@ -126 +41 @@
   area = DEG_RAD*(region[0].RA[1] - region[0].RA[0])*(sin(region[0].DEC[1]*RAD_DEG) - sin(region[0].DEC[0]*RAD_DEG));
   region[0].Area = area;
+}
+
+double area_of_skyregion (SkyRegion *region) {
+  
+  double area;
+
+  area = DEG_RAD*(region[0].Rmax - region[0].Rmin)*(sin(region[0].Dmax*RAD_DEG) - sin(region[0].Dmin*RAD_DEG));
+  return (area);
 }
 

trunk/Ohana/src/gastro2/src/plots.c

@@ -359 +359 @@
     RD_to_XY (&x, &y, sr[idx2[i]].R, sr[idx2[i]].D, coords);
     
-    dx = x - st[idx1[i]].X;
-    dy = y - st[idx1[i]].Y;
+    dx = st[idx1[i]].X - x;
+    dy = st[idx1[i]].Y - y;
     
     xvect0[i] = st[idx1[i]].X;
@@ -381 +381 @@
     fit_apply (&x, &y, st[idx1[i]].X, st[idx1[i]].Y);
     
-    dx = 5.0*(x - sr[idx2[i]].P);
-    dy = 5.0*(y - sr[idx2[i]].Q);
+    dx = (x - sr[idx2[i]].P)/coords[0].cdelt1;
+    dy = (y - sr[idx2[i]].Q)/coords[0].cdelt2;
     
     xvect0[i] = st[idx1[i]].X;

trunk/Ohana/src/gastro2/src/plotstuff.c

@@ -37 +37 @@
   status = listen (InitSocket, 1);
   
-  sprintf (temp, "kapa %s &", socket_name);
+  sprintf (temp, "kapa %s -name %d &", socket_name, N);
 # ifndef DEBUG
   system (temp);

trunk/Ohana/src/gastro2/src/polyfit.c

@@ -237 +237 @@
 int fit_adjust (Coords *coords) {
 
-  int i, j, N;
-  double a00, a10, a01, a20, a11, a02, a30, a21, a12, a03, dA;
-  double b00, b10, b01, b20, b11, b02, b30, b21, b12, b03, dB;
+  int i;
+  double a10, a01, a20, a11, a02, a30, a21, a12, a03;
+  double b10, b01, b20, b11, b02, b30, b21, b12, b03;
   double Xo, Yo, det;
-  int Np, Nv;
   double **A, **B, Fx, Fy;