Index: trunk/Ohana/src/relphot/src/ConfigInit.c
===================================================================
--- trunk/Ohana/src/relphot/src/ConfigInit.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/ConfigInit.c	(revision 5014)
@@ -22,7 +22,4 @@
   GetConfig (config, "IMAGE_SCATTER",          "%lf", 0, &IMAGE_SCATTER);
   GetConfig (config, "IMAGE_OFFSET",           "%lf", 0, &IMAGE_OFFSET);
-
-  IMAGE_SCATTER *= 1000;
-  IMAGE_OFFSET *= 1000;
 
   GetConfig (config, "STAR_CHISQ",             "%lf", 0, &STAR_CHISQ);
Index: trunk/Ohana/src/relphot/src/ImageOps.c
===================================================================
--- trunk/Ohana/src/relphot/src/ImageOps.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/ImageOps.c	(revision 5014)
@@ -145,5 +145,5 @@
 
   if (image[i].code & IMAGE_BAD)  return (NO_MAG);  
-  value = 0.001*image[i].Mcal;
+  value = image[i].Mcal_PS;
   return (value);
 }
@@ -217,6 +217,6 @@
     
     liststats (list, dlist, N, &stats);
-    image[i].Mcal  = 1000.0*stats.mean;
-    image[i].dMcal = 1000.0*stats.sigma;
+    image[i].Mcal_PS  = stats.mean;
+    image[i].dMcal_PS = stats.sigma;
     image[i].Xm    = 100.0*log10(stats.chisq);
   }
@@ -249,6 +249,6 @@
   for (i = N = 0; i < Nimage; i++) {
     if (image[i].code & IMAGE_BAD) continue;
-    mlist[N] = fabs (image[i].Mcal);
-    slist[N] = image[i].dMcal;
+    mlist[N] = fabs (image[i].Mcal_PS);
+    slist[N] = image[i].dMcal_PS;
     dlist[N] = 1;
     N++;
@@ -260,5 +260,5 @@
   liststats (slist, dlist, N, &stats);
   MaxScatter = MAX (IMAGE_SCATTER, 2*stats.median);
-  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", 0.001*MedOffset, 0.001*stats.median, 0.001*MaxScatter, 0.001*MaxOffset);
+  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", MedOffset, stats.median, MaxScatter, MaxOffset);
   
   Nmark = 0;
@@ -266,5 +266,5 @@
     mark = FALSE;
     image[i].code &= ~ID_IMAGE_POOR;
-    mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].Mcal - MedOffset) > MaxOffset);
+    mark = (image[i].dMcal_PS > MaxScatter) || (fabs(image[i].Mcal_PS - MedOffset) > MaxOffset);
     if (mark) { 
       Nmark ++;
@@ -296,7 +296,7 @@
   /**** dMcal vs airmass ****/
   for (i = 0; i < Nimage; i++) {
-    Mlist[i] = 0.001*image[i].Mcal;
-    dlist[i] = 0.001*image[i].dMcal;
-    xlist[i] = 0.001*image[i].secz;
+    Mlist[i] = image[i].Mcal_PS;
+    dlist[i] = image[i].dMcal_PS;
+    xlist[i] = image[i].secz_PS;
   }
 
@@ -316,5 +316,5 @@
   bzero (Mlist, NBIN*sizeof(double));
   for (i = 0; i < Nimage; i++) {
-    bin = 0.001*image[i].dMcal / 0.0025;
+    bin = image[i].dMcal_PS / 0.0025;
     bin = MAX (0, MIN (NBIN - 1, bin));
     Mlist[bin] += 1.0;
@@ -413,5 +413,5 @@
     if (image[i].code & IMAGE_BAD)  continue;
 
-    list[n] = 0.001*image[i].Mcal;
+    list[n] = image[i].Mcal_PS;
     dlist[n] = 1;
     n++;
@@ -441,5 +441,5 @@
     if (image[i].code & IMAGE_BAD)  continue;
 
-    list[n] = 0.001*image[i].dMcal;
+    list[n] = image[i].dMcal_PS;
     dlist[n] = 1;
     n++;
Index: trunk/Ohana/src/relphot/src/MosaicOps.c
===================================================================
--- trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/MosaicOps.c	(revision 5014)
@@ -69,5 +69,5 @@
     mosaic[Nmosaic].Xm    = 0.0;
     mosaic[Nmosaic].code  = image[i].code;
-    mosaic[Nmosaic].secz  = image[i].secz;
+    mosaic[Nmosaic].secz  = image[i].secz_PS;
 
     /* add image to mosaic image list */
@@ -134,10 +134,10 @@
       Dmin = MIN (Dmin, D);
       Dmax = MAX (Dmax, D);
-      Mcal += 0.001*image[m].Mcal;
-      dMcal += 0.001*image[m].dMcal;
+      Mcal += image[m].Mcal_PS;
+      dMcal += image[m].dMcal_PS;
       Xm += image[m].Xm;
       /* we are using mosaic.Mcal, not image.Mcal. reset image.Mcal */
-      image[m].Mcal = 0.0;
-      image[m].dMcal = image[m].Xm = NO_MAG;
+      image[m].Mcal_PS = 0.0;
+      image[m].dMcal_PS = image[m].Xm = NO_MAG;
     }
     dS /= Nimlist[i];
@@ -179,6 +179,6 @@
     for (j = 0; j < Nimlist[i]; j++) {
       im = imlist[i][j];
-      image[im].Mcal = 1000.0*mosaic[i].Mcal;
-      image[im].dMcal = 1000.0*mosaic[i].dMcal;
+      image[im].Mcal_PS = mosaic[i].Mcal;
+      image[im].dMcal_PS = mosaic[i].dMcal;
       image[im].Xm = mosaic[i].Xm;
       image[im].code |= (mosaic[i].code & ID_IMAGE_FEW);
@@ -405,5 +405,5 @@
   for (i = 0; i < Nmosaic; i++) {
     if (mosaic[i].code & IMAGE_BAD) continue;
-    list[n] = 0.001*mosaic[i].Mcal;
+    list[n] = mosaic[i].Mcal;
     dlist[n] = 1;
     n++;
@@ -432,5 +432,5 @@
 
     if (mosaic[i].code & IMAGE_BAD) continue;
-    list[n] = 0.001*mosaic[i].dMcal;
+    list[n] = mosaic[i].dMcal;
     dlist[n] = 1;
     n++;
@@ -538,5 +538,5 @@
   liststats (slist, dlist, N, &stats);
   MaxScatter = MAX (IMAGE_SCATTER, 2*stats.median);
-  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", 0.001*MedOffset, 0.001*stats.median, 0.001*MaxScatter, 0.001*MaxOffset);
+  fprintf (stderr, "Mrel: %f, dMrel: %f, Max Scatter: %f, Max Offset: %f\n", MedOffset, stats.median, MaxScatter, MaxOffset);
   
   Nmark = 0;
@@ -618,7 +618,7 @@
 
   for (i = 0; i < Nmosaic; i++) {
-    Mlist[i] = 0.001*mosaic[i].Mcal;
-    dlist[i] = 0.001*mosaic[i].dMcal;
-    xlist[i] = 0.001*mosaic[i].secz;
+    Mlist[i] = mosaic[i].Mcal;
+    dlist[i] = mosaic[i].dMcal;
+    xlist[i] = mosaic[i].secz;
   }
 
@@ -640,5 +640,5 @@
   bzero (Mlist, NBIN*sizeof(double));
   for (i = 0; i < Nmosaic; i++) {
-    bin = 0.001*mosaic[i].dMcal / 0.0025;
+    bin = mosaic[i].dMcal / 0.0025;
     bin = MAX (0, MIN (NBIN - 1, bin));
     Mlist[bin] += 1.0;
Index: trunk/Ohana/src/relphot/src/find_images.c
===================================================================
--- trunk/Ohana/src/relphot/src/find_images.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/find_images.c	(revision 5014)
@@ -104,5 +104,5 @@
 	if (RESET) {
 	  assignMcal (&image[nimage], (double *) NULL, -1);
-	  image[nimage].dMcal = NO_MAG;
+	  image[nimage].dMcal_PS = NO_MAG;
 	  image[nimage].code &= ~ID_IMAGE_POOR;
 	}
Index: trunk/Ohana/src/relphot/src/gcatalog.c
===================================================================
--- trunk/Ohana/src/relphot/src/gcatalog.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/gcatalog.c	(revision 5014)
@@ -5,7 +5,4 @@
   char mode;
 
-  /* no autodetect for CATMODE yet */
-  strcpy (catalog[0].catmode, CATMODE);
-
   if (FINAL) {
     mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
@@ -13,4 +10,6 @@
     mode = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
   }    
+
+  /* CATMODE and CATFORMAT determined from catalog */
 
   if (!load_catalog (catalog, mode, VERBOSE)) {
Index: trunk/Ohana/src/relphot/src/wcatalog.c
===================================================================
--- trunk/Ohana/src/relphot/src/wcatalog.c	(revision 4865)
+++ trunk/Ohana/src/relphot/src/wcatalog.c	(revision 5014)
@@ -3,12 +3,5 @@
 void wcatalog (Catalog *catalog) {
   
-  /* set catalog format (elixir, loneos, etc) */
-  if (!strcmp (CATFORMAT, "INTERNAL")) {
-    sprintf (catalog[0].average_format, "DVO_AVERAGE");
-    sprintf (catalog[0].measure_format, "DVO_MEASURE");
-  } else {
-    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
-    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
-  }
+  /* CATMODE and CATFORMAT determined from catalog */
 
   if (!save_catalog (catalog, VERBOSE)) {