Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 4807)
+++ /trunk/Ohana/src/photdbc/Makefile	(revision 4808)
@@ -33,5 +33,4 @@
 $(SRC)/gcatalog.$(ARCH).o 	 \
 $(SRC)/misc.$(ARCH).o		 \
-$(SRC)/time.$(ARCH).o		 \
 $(SRC)/join_stars.$(ARCH).o      \
 $(SRC)/unique_measures.$(ARCH).o \
Index: /trunk/Ohana/src/photdbc/include/photdbc.h
===================================================================
--- /trunk/Ohana/src/photdbc/include/photdbc.h	(revision 4807)
+++ /trunk/Ohana/src/photdbc/include/photdbc.h	(revision 4808)
@@ -69,11 +69,7 @@
 GSCRegion    *load_images (char *seed, int *nregion); 
 GSCRegion    *name_region (char *name, int *Nregions); 
-char         *sec_to_date (unsigned long second);
 void          ConfigInit (int *argc, char **argv); 
-int           Fseek (FILE *f, long offset, int whence);
 int           args (int argc, char **argv); 
-int           chk_time (char *line);
 int           corner_check (double *x1, double *y1, double *x2, double *y2); 
-int           dms_to_ddd (double *Value, char *string);
 int           edge_check (double *x1, double *y1, double *x2, double *y2); 
 void          flag_measures (Catalog *catalog); 
@@ -81,13 +77,9 @@
 void          get_mags (Catalog *catalog); 
 void          getfullregion (Image *image, int Nimage, GSCRegion *fullregion); 
-int           hms_to_deg (double *h0, double *h1, double *d0, double *d1, char *string); 
 void          initialize (int argc, char **argv); 
 void          initstats (char *mode); 
 void          join_stars (Catalog *catalog); 
 int           liststats (double *value, double *dvalue, int N, StatType *stats); 
-unsigned long jd_to_sec (double jd);
-unsigned long date_to_sec (char *date);
 double        opening_angle (double x1, double y1, double x2, double y2, double x3, double y3); 
-double        sec_to_jd (unsigned long second);
 void          set_ZP (double ZERO); 
 void          sortA (double *X, int N); 
@@ -97,7 +89,6 @@
 void          sort_lists (float *X, float *Y, int *index, int N); 
 void          sort_time (unsigned int *X, int *Y, int N); 
-int           str_to_dtime (char *line, double *second); 
-int           str_to_radec (double *ra, double *dec, char *str1, char *str2);
-int           str_to_time (char *line, unsigned int *second); 
 void          unique_measures (Catalog *catalog);
 void          wcatalog (Catalog *catalog);
+Catalog *subcatalog (Catalog *catalog);
+void check_directory (char *basefile);
Index: /trunk/Ohana/src/photdbc/src/args.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/args.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/args.c	(revision 4808)
@@ -21,5 +21,5 @@
     exit (2);
   } 
-
+  return (TRUE);
 }
 
Index: /trunk/Ohana/src/photdbc/src/check_directory.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/check_directory.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/check_directory.c	(revision 4808)
@@ -1,11 +1,10 @@
 # include "photdbc.h"
 
-check_directory (char *basefile) {
+void check_directory (char *basefile) {
   
-  FILE *f;
   char *c, dir[256], filename[256];
   struct stat filestat;
-  uid_t fuid, uid;
-  gid_t fgid, gid;
+  uid_t uid;
+  gid_t gid;
   int status, cmode;
 
@@ -14,5 +13,5 @@
 
   /* check permission to write to directory */
-  sprintf (filename, "%s\0", basefile);
+  sprintf (filename, "%s", basefile);
   c = strrchr (filename, '/');
   if (c == (char *) NULL) {
Index: /trunk/Ohana/src/photdbc/src/find_images.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/find_images.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/find_images.c	(revision 4808)
@@ -11,9 +11,8 @@
   Header header;
   Image *timage, *image;
-  int i, j, k, m, found, nimage, Nimage, NIMAGE, NTIMAGE, Nloop, Nlast;
-  int n, Nim, status, InRange, np, Np;
+  int i, j, k, m, found, nimage, Nimage, NIMAGE;
+  int status, InRange;
   FILE *f;
   double Xc[5], Yc[5], Xi[5], Yi[5], r, d, dx, dy;
-  char line[256];
   int *line_number;
   Coords tcoords;
Index: /trunk/Ohana/src/photdbc/src/flag_measures.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/flag_measures.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/flag_measures.c	(revision 4808)
@@ -4,5 +4,5 @@
 
   int i, j, k, m, n, N, found;
-  int *imagelink, Nimage, Nmeasure, Nlist, PhotNsec;
+  int *imagelink, Nimage, Nlist, PhotNsec;
   unsigned int Time;
   int Ncode, Photcode, Minst, Mag, BAD_MEASURE;
@@ -45,6 +45,6 @@
   for (i = 0; i < catalog[0].Nmeasure; i++) {
     n = catalog[0].measure[i].averef;
-    ra  = catalog[0].average[n].R - catalog[0].measure[i].dR / 360000.0;
-    dec = catalog[0].average[n].D - catalog[0].measure[i].dD / 360000.0;
+    ra  = catalog[0].average[n].R_PS - catalog[0].measure[i].dR_PS / 3600.0;
+    dec = catalog[0].average[n].D_PS - catalog[0].measure[i].dD_PS / 3600.0;
     k = imagelink[i];
     RD_to_XY (&x, &y, ra, dec, &image[k].coords);
Index: /trunk/Ohana/src/photdbc/src/gcatalog.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/gcatalog.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/gcatalog.c	(revision 4808)
@@ -3,5 +3,5 @@
 int gcatalog (Catalog *catalog) {
   
-  char mode, status;
+  char mode;
 
   mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
Index: /trunk/Ohana/src/photdbc/src/get_regions.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/get_regions.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/get_regions.c	(revision 4808)
@@ -55,5 +55,5 @@
   /* use the pole regions, if near pole */
   if (maxDec > 86.25) {
-    sprintf (regions[nregions].filename, "n8230/pole.cpt\0");
+    sprintf (regions[nregions].filename, "n8230/pole.cpt");
     regions[nregions].RA[0] = 0;
     regions[nregions].RA[1] = 360;
@@ -118,5 +118,5 @@
       if ((DEC1 > 0) && (minDec < DEC1) && (maxDec > DEC0) && (minRa < RA1) && (maxRa > RA0)) {
 	temp[5] = 0;
-	sprintf (regions[nregions].filename, "%s/%s.cpt\0", Dec2Sections[NBigDec + j], &temp[1]);
+	sprintf (regions[nregions].filename, "%s/%s.cpt", Dec2Sections[NBigDec + j], &temp[1]);
 	regions[nregions].RA[0] = RA0;
 	regions[nregions].RA[1] = RA1;
@@ -131,5 +131,5 @@
       if ((DEC1 < 0) && (minDec < DEC0) && (maxDec > DEC1) && (minRa < RA1) && (maxRa > RA0)) {
 	temp[5] = 0;
-	sprintf (regions[nregions].filename, "%s/%s.cpt\0", Dec2Sections[NBigDec + j], &temp[1]);
+	sprintf (regions[nregions].filename, "%s/%s.cpt", Dec2Sections[NBigDec + j], &temp[1]);
 	regions[nregions].RA[0] = RA0;
 	regions[nregions].RA[1] = RA1;
Index: /trunk/Ohana/src/photdbc/src/initialize.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/initialize.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/initialize.c	(revision 4808)
@@ -2,7 +2,4 @@
 
 void initialize (int argc, char **argv) {
-
-  int Np;
-  double tmp;
 
   /* are these set correctly? */
@@ -26,5 +23,5 @@
 						     
     fprintf (stderr, "CHISQ_MAX:             %lf\n", CHISQ_MAX);
-    fprintf (stderr, "NMEAS_MIN:             %lf\n", NMEAS_MIN);
+    fprintf (stderr, "NMEAS_MIN:             %d\n",  NMEAS_MIN);
 
     fprintf (stderr, "IMAGE_CATALOG          %s\n",  ImageCat);
Index: /trunk/Ohana/src/photdbc/src/join_stars.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/join_stars.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/join_stars.c	(revision 4808)
@@ -3,5 +3,5 @@
 void join_stars (Catalog *catalog) {
 
-  int i, j, k, m, M, Ni, Nj, first_j, Ns1, Ns2;
+  int i, j, k, m, M, Ni, Nj, first_j;
   int Naves, Nmeas, Ncurr;
   int Naverage, Nmeasure, *found, *index;
@@ -28,6 +28,6 @@
   Rmid = Dmid = 0;
   for (i = 0; i < Naverage; i++) {
-    Rmid += average[i].R;
-    Dmid += average[i].D;
+    Rmid += average[i].R_PS;
+    Dmid += average[i].D_PS;
   }
   Rmid /= Naverage;
@@ -50,5 +50,5 @@
   for (i = 0; i < Naverage; i++) {
     index[i] = i;
-    fRD_to_XY (&X[i], &Y[i], average[i].R, average[i].D, &tcoords);
+    fRD_to_XY (&X[i], &Y[i], average[i].R_PS, average[i].D_PS, &tcoords);
   }
   sort_lists (X, Y, index, Naverage);
@@ -77,6 +77,6 @@
 	mpointer[Nmeas].measure = m;
 	mpointer[Nmeas].averef  = Naves;
-	mpointer[Nmeas].R       = average[Ni].R - measure[m].dR / 360000.0;
-	mpointer[Nmeas].D       = average[Ni].D - measure[m].dD / 360000.0;
+	mpointer[Nmeas].R       = average[Ni].R_PS - measure[m].dR_PS / 3600.0;
+	mpointer[Nmeas].D       = average[Ni].D_PS - measure[m].dD_PS / 3600.0;
 	Nmeas ++;
       }
@@ -113,6 +113,6 @@
 	  mpointer[Nmeas].measure = m;
 	  mpointer[Nmeas].averef  = Ncurr;
-	  mpointer[Nmeas].R       = average[Nj].R - measure[m].dR / 360000.0;
-	  mpointer[Nmeas].D       = average[Nj].D - measure[m].dD / 360000.0;
+	  mpointer[Nmeas].R       = average[Nj].R_PS - measure[m].dR_PS / 3600.0;
+	  mpointer[Nmeas].D       = average[Nj].D_PS - measure[m].dD_PS / 3600.0;
 	  Nmeas ++;
 	}
@@ -130,6 +130,6 @@
 	Sr = Sr / naverage[Ncurr].Nm;
 	Sd = Sd / naverage[Ncurr].Nm;
-	naverage[Ncurr].R = Sr;
-	naverage[Ncurr].D = Sd;
+	naverage[Ncurr].R_PS = Sr;
+	naverage[Ncurr].D_PS = Sd;
 
 	/* update original measurement offsets */
@@ -137,6 +137,6 @@
 	  m = naverage[Ncurr].offset + k;
 	  M = mpointer[m].measure;
-	  measure[M].dR = 360000.0*(Sr - mpointer[m].R);
-	  measure[M].dD = 360000.0*(Sd - mpointer[m].D);
+	  measure[M].dR_PS = 3600.0*(Sr - mpointer[m].R);
+	  measure[M].dD_PS = 3600.0*(Sd - mpointer[m].D);
 	}
 
Index: /trunk/Ohana/src/photdbc/src/load_catalogs.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/load_catalogs.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/load_catalogs.c	(revision 4808)
@@ -3,5 +3,5 @@
 Catalog *load_catalogs (GSCRegion *region, int Nregion) {
 
-  int i, Nstar;
+  int i;
   Catalog *catalog;
 
Index: /trunk/Ohana/src/photdbc/src/load_images.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/load_images.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/load_images.c	(revision 4808)
@@ -8,6 +8,5 @@
 
   GSCRegion *region;
-  int       Nregion, Ntimage;
-  Image     *timage;
+  int       Nregion;
 
   region = name_region (seed, &Nregion);
Index: /trunk/Ohana/src/photdbc/src/photdbc.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/photdbc.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/photdbc.c	(revision 4808)
@@ -40,13 +40,9 @@
   }
   wcatalog (catalog);
+  exit (0);
 }
-
 
 /** this program is somewhat rough: minimal error checking
     -
     only one catalog is loaded, corresponding to region file
-    
-
-
-
  */
Index: /trunk/Ohana/src/photdbc/src/subcatalog.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/subcatalog.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/subcatalog.c	(revision 4808)
@@ -3,5 +3,5 @@
 Catalog *subcatalog (Catalog *catalog) {
   
-  int i, j, offset, ecode;
+  int i, j, offset;
   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
   int mag;
@@ -27,8 +27,8 @@
 
     /* exclude stars not in range */
-    if (catalog[0].average[i].R < RMIN) continue;
-    if (catalog[0].average[i].R > RMAX) continue;
-    if (catalog[0].average[i].D < DMIN) continue;
-    if (catalog[0].average[i].D > DMAX) continue;
+    if (catalog[0].average[i].R_PS < RMIN) continue;
+    if (catalog[0].average[i].R_PS > RMAX) continue;
+    if (catalog[0].average[i].D_PS < DMIN) continue;
+    if (catalog[0].average[i].D_PS > DMAX) continue;
 
     /* assign average and secfilt values */
Index: /trunk/Ohana/src/photdbc/src/unique_measures.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/unique_measures.c	(revision 4807)
+++ /trunk/Ohana/src/photdbc/src/unique_measures.c	(revision 4808)
@@ -8,5 +8,5 @@
   unsigned int *tlist;
   Measure *mlist, *nmeasure;
-  double dR, dD, R;
+  double dR, dD, R, RADIUS2;
   Average *p;
 
@@ -22,4 +22,6 @@
   ALLOCATE (mlist, Measure, Nlist);
 
+  RADIUS2 = SQ(UNIQ_RADIUS);
+  
   p = catalog[0].average;
   for (i = 0; i < catalog[0].Naverage; i++) {
@@ -58,10 +60,10 @@
       }
       
-      dR = (catalog[0].measure[ilist[j]].dR - catalog[0].measure[ilist[k]].dR);
-      dD = (catalog[0].measure[ilist[j]].dD - catalog[0].measure[ilist[k]].dD);
+      dR = (catalog[0].measure[ilist[j]].dR_PS - catalog[0].measure[ilist[k]].dR_PS);
+      dD = (catalog[0].measure[ilist[j]].dD_PS - catalog[0].measure[ilist[k]].dD_PS);
       R = SQ(dR) + SQ(dD);
       
-      /* dR, dD in 1/100 arcsec, RADIUS is 0.1 arcsec */
-      if (R < UNIQ_RADIUS) {
+      /* dR, dD in arcsec, RADIUS is 0.1 arcsec */
+      if (R < RADIUS2) {
 	/* matched pair */
 	catalog[0].measure[ilist[k]].flags |= FLAG_DUPMEAS;