Index: /trunk/Ohana/configure.tcsh
===================================================================
--- /trunk/Ohana/configure.tcsh	(revision 31668)
+++ /trunk/Ohana/configure.tcsh	(revision 31669)
@@ -203,6 +203,6 @@
   set CPPFLAGS = ""
 endif  
-if ($pedantic) set CPPFLAGS = "$CPPFLAGS-Wall -Werror "
-if ($memcheck) set CPPFLAGS = "$CPPFLAGS-DOHANA_MEMORY "
+if ($pedantic) set CPPFLAGS = "$CPPFLAGS -Wall -Werror"
+if ($memcheck) set CPPFLAGS = "$CPPFLAGS -DOHANA_MEMORY"
 
 if (! $?LDFLAGS) then
@@ -540,5 +540,5 @@
   endif
   set haveflag = `echo $f | tr '[:lower:]' '[:upper:]' | tr '.' '_'`
-  set CPPFLAGS = "$CPPFLAGS-DHAVE_$haveflag "
+  set CPPFLAGS = "$CPPFLAGS -DHAVE_$haveflag"
 end
 
Index: /trunk/Ohana/src/addstar/include/addstar.h
===================================================================
--- /trunk/Ohana/src/addstar/include/addstar.h	(revision 31668)
+++ /trunk/Ohana/src/addstar/include/addstar.h	(revision 31669)
@@ -124,4 +124,6 @@
 float   ZPT_OBS_PHU;
 float   ZPT_ERR_PHU;
+
+float   OFFSET_ZPT;
 
 int     OLD_RESORT;
Index: /trunk/Ohana/src/addstar/src/LoadData.c
===================================================================
--- /trunk/Ohana/src/addstar/src/LoadData.c	(revision 31668)
+++ /trunk/Ohana/src/addstar/src/LoadData.c	(revision 31669)
@@ -89,4 +89,13 @@
     CHECK_REALLOCATE (images[0], Image, NVALID, Nvalid, 10);
   }
+
+  if (isfinite(OFFSET_ZPT)) {
+    for (i = 0; i < *Nstars; i++) {
+      stars[0][i].measure.M   += OFFSET_ZPT;
+      stars[0][i].measure.Map += OFFSET_ZPT;
+    }
+
+  }
+
   free (name);
   *nvalid = Nvalid;
Index: /trunk/Ohana/src/addstar/src/args.c
===================================================================
--- /trunk/Ohana/src/addstar/src/args.c	(revision 31668)
+++ /trunk/Ohana/src/addstar/src/args.c	(revision 31669)
@@ -34,9 +34,5 @@
     remove_argument (N, &argc, argv);
   }
-  OLD_RESORT = FALSE;
-  if ((N = get_argument (argc, argv, "-old-resort"))) {
-    remove_argument (N, &argc, argv);
-    OLD_RESORT = TRUE;
-  }
+
   if ((N = get_argument (argc, argv, "-fakeimage"))) {
     options.mode = M_FAKEIMAGE;
@@ -47,4 +43,11 @@
     remove_argument (N, &argc, argv);
     FAKE_THETA = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  OFFSET_ZPT = NAN;
+  if ((N = get_argument (argc, argv, "-fakezpt"))) {
+    remove_argument (N, &argc, argv);
+    OFFSET_ZPT = atof (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -392,6 +395,9 @@
   fprintf (stderr, "  -accept-motion           	  : accept proper-motion data from reference\n");
   fprintf (stderr, "  -accept-time           	  : use TZERO supplied in header\n");
+  fprintf (stderr, "  -use-name                	  : use the given name instead of the filename as the filename\n");
   fprintf (stderr, "  -no-stars                	  : skip the stars\n");
   fprintf (stderr, "  -force                	  : force read of database with inconsistent info\n");
+  fprintf (stderr, "  -threads (N)            	  : use N threads for resort option\n");
+  fprintf (stderr, "  -fakezpt (offset)        	  : apply an artificial offset to the magnitudes (for testing)\n");
   fprintf (stderr, "  -textmode                	  : force textmode for file (ignore header clues)\n");
   fprintf (stderr, "  -v                    	  : verbose mode\n");
@@ -399,4 +405,5 @@
   fprintf (stderr, "  -help                 	  : this list\n");
   fprintf (stderr, "  -h                    	  : this list\n\n");
+
   exit (2);
 }
@@ -417,3 +424,2 @@
 
 **/
-
Index: /trunk/Ohana/src/getstar/src/getstar.c
===================================================================
--- /trunk/Ohana/src/getstar/src/getstar.c	(revision 31668)
+++ /trunk/Ohana/src/getstar/src/getstar.c	(revision 31669)
@@ -9,4 +9,5 @@
   Catalog output;
   FITS_DB db;
+  int code, Nsec, needMeas;
 
   args (argc, argv);
@@ -17,4 +18,8 @@
     
   SkyTableSetFilenames (sky, CATDIR, "cpt");
+
+  code = photcode[0].code;
+  Nsec = GetPhotcodeNsec (code);
+  needMeas = (Nsec == -1);
 
   // create an output catalog with the desired name and format options
@@ -58,5 +63,6 @@
 	catalog.filename = skylist[0].filename[i];
 	catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-	catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+	catalog.catflags = LOAD_AVES | LOAD_SECF;
+	catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
 	// an error exit status here is a significant error
@@ -89,5 +95,6 @@
 	catalog.filename = skylist[0].filename[i];
 	catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
-	catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+	catalog.catflags = LOAD_AVES | LOAD_SECF;
+	catalog.catflags |= needMeas ? LOAD_MEAS : SKIP_MEAS;
 
 	// an error exit status here is a significant error
Index: /trunk/Ohana/src/getstar/src/select_by_region.c
===================================================================
--- /trunk/Ohana/src/getstar/src/select_by_region.c	(revision 31668)
+++ /trunk/Ohana/src/getstar/src/select_by_region.c	(revision 31669)
@@ -4,6 +4,6 @@
 int select_by_region (Catalog *output, Catalog *catalog, SkyRegion *region, int start, int end) {
 
-  int i, j, n, Nm, offset, m, Nsecfilt, code, Nsec;
-  int Nave, NAVE, Nmeas, NMEAS;
+  int i, j, Nm, offset, m, Nsecfilt, code, Nsec;
+  int Nave, NAVE, Nmeas, NMEAS, needMeas;
   double R, D, AREA;
   float mag;
@@ -27,4 +27,5 @@
   code = photcode[0].code;
   Nsec = GetPhotcodeNsec (code);
+  needMeas = (Nsec == -1);
 
   /* select the average objects in this region */
@@ -67,9 +68,7 @@
 
     for (i = 0; i < catalog[0].Naverage; i++) {
-      n = catalog[0].measure[i].averef;
+      // n = catalog[0].measure[i].averef;
       mag = NAN;
-      if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
-      } else {
+      if (needMeas) {
         offset = catalog[0].average[i].measureOffset;
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
@@ -79,4 +78,6 @@
           }
         }
+      } else {
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       }
       if (isnan(mag)) continue;
@@ -102,5 +103,5 @@
 
   for (i = 0; i < catalog[0].Naverage; i++) {
-    n = catalog[0].measure[i].averef;
+    // n = catalog[0].measure[i].averef;
 
     R = catalog[0].average[i].R;
@@ -119,7 +120,5 @@
     if (MagLimitUse) {
       mag = NAN;
-      if (Nsec != -1) {
-        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
-      } else {
+      if (needMeas) {
         offset = catalog[0].average[i].measureOffset;
         for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
@@ -129,4 +128,6 @@
           }
         }
+      } else {
+        mag = catalog[0].secfilt[i*Nsecfilt + Nsec].M;
       }
       if (isnan(mag) || (mag > MagLimitValue)) continue;
@@ -142,10 +143,11 @@
     offset = catalog[0].average[i].measureOffset;
 
-    for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
-      output[0].measure[Nmeas] = catalog[0].measure[offset + j];
-      output[0].measure[Nmeas].averef = Nave;
-      Nmeas ++;
-
-      CHECK_REALLOCATE (output[0].measure, Measure, NMEAS, Nmeas, 1000);
+    if (needMeas) {
+      for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
+	output[0].measure[Nmeas] = catalog[0].measure[offset + j];
+	output[0].measure[Nmeas].averef = Nave;
+	Nmeas ++;
+	CHECK_REALLOCATE (output[0].measure, Measure, NMEAS, Nmeas, 1000);
+      }
     }