Index: /trunk/Ohana/src/photdbc/include/photdbc.h
===================================================================
--- /trunk/Ohana/src/photdbc/include/photdbc.h	(revision 37044)
+++ /trunk/Ohana/src/photdbc/include/photdbc.h	(revision 37045)
@@ -27,13 +27,4 @@
   double Dc;
 } SkyRegionCoords;
-
-# define MARKTIME(MSG,...) {			\
-    gettimeofday (&stopTimer, (void *) NULL);	\
-    float dtime = DTIME (stopTimer, startTimer);	\
-    fprintf (stderr, MSG, __VA_ARGS__); }
-
-# define INITTIME \
-  struct timeval startTimer, stopTimer; \
-  gettimeofday (&startTimer, (void *) NULL);
 
 int    PARALLEL;
Index: /trunk/Ohana/src/photdbc/src/get_mags.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/get_mags.c	(revision 37044)
+++ /trunk/Ohana/src/photdbc/src/get_mags.c	(revision 37045)
@@ -22,5 +22,5 @@
       catalog[0].secfilt[i*Nsecfilt+j].M  = NAN;
       catalog[0].secfilt[i*Nsecfilt+j].dM = NAN;
-      catalog[0].secfilt[i*Nsecfilt+j].Xm = NAN_S_SHORT;
+      catalog[0].secfilt[i*Nsecfilt+j].Mchisq = NAN;
     }
   }
@@ -56,6 +56,6 @@
       Mval = (Nsec == -1) ? &catalog[0].average[i].dM : &catalog[0].secfilt[i*Nsecfilt+Nsec].dM;
       *Mval = stats.sigma;
-      Mval = (Nsec == -1) ? &catalog[0].average[i].Xm : &catalog[0].secfilt[i*Nsecfilt+Nsec].Xm;
-      *Mval = 100.0*log10(stats.chisq);
+      Mval = (Nsec == -1) ? &catalog[0].average[i].Mchisq : &catalog[0].secfilt[i*Nsecfilt+Nsec].Mchisq;
+      *Mval = stats.chisq;
     }
   }
Index: /trunk/Ohana/src/photdbc/src/join_stars.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/join_stars.c	(revision 37044)
+++ /trunk/Ohana/src/photdbc/src/join_stars.c	(revision 37045)
@@ -3,5 +3,5 @@
 void join_stars (Catalog *catalog) {
 
-  off_t i, j, k, m, M, Ni, Nj, first_j, Nfirst;
+  off_t i, j, k, m, Ni, Nj, first_j;
   off_t Naves, Nmeas, Ncurr;
   off_t Naverage, Nmeasure, *index;
@@ -109,6 +109,6 @@
 	mpointer[Nmeas].measure = m;
 	mpointer[Nmeas].averef  = Naves;
-	mpointer[Nmeas].R       = average[Ni].R - measure[m].dR / 3600.0;
-	mpointer[Nmeas].D       = average[Ni].D - measure[m].dD / 3600.0;
+	mpointer[Nmeas].R       = measure[m].R;
+	mpointer[Nmeas].D       = measure[m].D;
 	Nmeas ++;
       }
@@ -155,9 +155,8 @@
 	  mpointer[Nmeas].measure = m;
 	  mpointer[Nmeas].averef  = Ncurr;
-	  mpointer[Nmeas].R       = average[Nj].R - measure[m].dR / 3600.0;
-	  mpointer[Nmeas].D       = average[Nj].D - measure[m].dD / 3600.0;
+	  mpointer[Nmeas].R       = measure[m].R;
+	  mpointer[Nmeas].D       = measure[m].D;
 	  Nmeas ++;
 	}
-	Nfirst = average[Nj].Nmeasure;
 	naverage[Ncurr].Nmeasure += average[Nj].Nmeasure;
 	found[j] = TRUE;
@@ -178,10 +177,10 @@
 
 	/* update original measurement offsets for new detections */
-	for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
-	  m = naverage[Ncurr].measureOffset + k;
-	  M = mpointer[m].measure;
-	  measure[M].dR = 3600.0*(Sr - mpointer[m].R);
-	  measure[M].dD = 3600.0*(Sd - mpointer[m].D);
-	}
+	// for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
+	//   m = naverage[Ncurr].measureOffset + k;
+	//   M = mpointer[m].measure;
+	//   measure[M].dR = 3600.0*(Sr - mpointer[m].R);
+	//   measure[M].dD = 3600.0*(Sd - mpointer[m].D);
+	// }
 
 	/* update current reference star position */
@@ -189,10 +188,11 @@
 # else
 	/* update original measurement offsets for new detections */
-	for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
-	  m = naverage[Ncurr].measureOffset + k;
-	  M = mpointer[m].measure;
-	  measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
-	  measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
-	}
+	// now not needed measure[M] carries R,D
+	// for (k = Nfirst; k < naverage[Ncurr].Nmeasure; k++) {
+	//   m = naverage[Ncurr].measureOffset + k;
+	//   M = mpointer[m].measure;
+	//   measure[M].dR = 3600.0*(naverage[Ncurr].R - mpointer[m].R);
+	//   measure[M].dD = 3600.0*(naverage[Ncurr].D - mpointer[m].D);
+	// }
 # endif
       }
Index: /trunk/Ohana/src/photdbc/src/make_subcatalog.c
===================================================================
--- /trunk/Ohana/src/photdbc/src/make_subcatalog.c	(revision 37044)
+++ /trunk/Ohana/src/photdbc/src/make_subcatalog.c	(revision 37045)
@@ -123,5 +123,5 @@
       // select measurements by mag limit -- drop exactly this measurement  
       if (ExcludeByInstMag) {
-	mag = PhotInst (&catalog[0].measure[offset]);
+	mag = PhotInst (&catalog[0].measure[offset], MAG_CLASS_PSF);
 	if (mag < INST_MAG_MIN) continue;
 	if (mag > INST_MAG_MAX) continue;
@@ -135,5 +135,5 @@
       // check measurements for this object -- drop object if no measurements pass
       if (ExcludeByMaxMinMag) {
-	mag = PhotSys (&catalog[0].measure[offset], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
+	mag = PhotSys (&catalog[0].measure[offset], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
 	minMag = MIN (minMag, mag);
       }