Changeset 39719 for branches/czw_branch/20160809/Ohana

Timestamp:

Sep 24, 2016, 3:29:05 PM (10 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/czw_branch/20160809

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/delstar/Makefile (modified) (2 diffs)
• Ohana/src/delstar/include/delstar.h (modified) (3 diffs)
• Ohana/src/delstar/src/args.c (modified) (4 diffs)
• Ohana/src/delstar/src/delete_duplicate_measures.c (modified) (3 diffs)
• Ohana/src/delstar/src/delstar.c (modified) (1 diff)
• Ohana/src/delstar/src/delstar_client.c (modified) (1 diff)
• Ohana/src/kapa2/src/Graphs.c (modified) (1 diff)
• Ohana/src/libdvo/include/dvo.h (modified) (1 diff)
• Ohana/src/libdvo/src/dbExtractMeasures.c (modified) (1 diff)
• Ohana/src/libdvo/src/dvo_photcode_ops.c (modified) (1 diff)
• Ohana/src/libkapa/src/KapaWindow.c (modified) (2 diffs)
• Ohana/src/relastro/Makefile (modified) (2 diffs)
• Ohana/src/relastro/include/relastro.h (modified) (2 diffs)
• Ohana/src/relastro/src (modified) (1 prop)
• Ohana/src/relastro/src/RepairObjectIDs.c (copied) (copied from trunk/Ohana/src/relastro/src/RepairObjectIDs.c )
• Ohana/src/relastro/src/RepairStacks.c (copied) (copied from trunk/Ohana/src/relastro/src/RepairStacks.c )
• Ohana/src/relastro/src/StackImageMaps.c (modified) (2 diffs)
• Ohana/src/relastro/src/UpdateObjectOffsets.c (modified) (2 diffs)
• Ohana/src/relastro/src/args.c (modified) (4 diffs)
• Ohana/src/relastro/src/relastro.c (modified) (1 diff)
• Ohana/src/relastro/src/relastro_client.c (modified) (1 diff)

branches/czw_branch/20160809/Ohana/src/delstar/Makefile

@@ -31 +31 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_measures_by_match.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \
@@ -56 +57 @@
 $(SRC)/delete_duplicate_images.$(ARCH).o \
 $(SRC)/delete_duplicate_measures.$(ARCH).o \
+$(SRC)/delete_measures_by_match.$(ARCH).o \
 $(SRC)/delete_fix_LAP.$(ARCH).o \
 $(SRC)/delete_fix_LAP_edges.$(ARCH).o \

branches/czw_branch/20160809/Ohana/src/delstar/include/delstar.h

@@ -93 +93 @@
 
 int   SAVE_DUPLICATES;
+int   SAVE_DELETES;
 int   SKIP_IMAGES;
 char *BACKUP_EXTNAME;
@@ -104 +105 @@
 
 int    MODE;
-enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
+enum {MODE_NONE, MODE_IMAGENAME, MODE_IMAGEFILE, MODE_TIME, MODE_ORPHAN, MODE_MISSED, MODE_PHOTCODES, MODE_DUP_IMAGES, MODE_DUP_MEASURES, MODE_DELETE_MEASURES_BY_MATCH, MODE_FIX_LAP, MODE_FIX_LAP_STATS, MODE_FIX_LAP_EDGES, MODE_FIX_LAP_EDGES_DELETE};
 
 char DateKeyword[64], DateMode[64], UTKeyword[64], MJDKeyword[64], JDKeyword[64];
@@ -185 +186 @@
 int ImageIDSave(char *filename, IndexArray *imageID);
 
+int delete_measures_by_match ();
+int delete_measures_by_match_parallel (SkyList *sky);
+DeleteMeasureResult delete_measures_by_match_catalog (Catalog *catalog);
+
 int delete_duplicate_measures ();
 int delete_duplicate_measures_parallel (SkyList *sky);

branches/czw_branch/20160809/Ohana/src/delstar/src/args.c

@@ -12 +12 @@
   fprintf (stderr, "  delstar -dup-images : delete duplicate images (by externID)\n\n");
   fprintf (stderr, "  delstar -dup-measures : delete duplicate measures (by imageID + detID)\n\n");
+  fprintf (stderr, "  delstar -delete-measures-by-match : delete duplicate measures by imageID, photcode, time constratins\n\n");
   fprintf (stderr, "  optional flags:\n");
   fprintf (stderr, "  -v               : verbose mode\n");
@@ -194 +195 @@
     SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
   }
+  if ((N = get_argument (argc, argv, "-delete-measures-by-match"))) {
+    if (MODE != MODE_NONE) usage();
+    MODE = MODE_DELETE_MEASURES_BY_MATCH;
+    remove_argument (N, &argc, argv);
+    SKIP_IMAGES = TRUE; // we do not need to load the images for -dup-measures
+  }
 
   DELETE_MIN_DET_ID = 0;
@@ -222 +229 @@
     remove_argument (N, &argc, argv);
   }
+
   BACKUP_EXTNAME = NULL;
   if ((N = get_argument (argc, argv, "-backup-extname"))) {
@@ -229 +237 @@
   }
   if (!BACKUP_EXTNAME) BACKUP_EXTNAME = strcreate (".bck");
+
+  SAVE_DELETES = FALSE;
+  if ((N = get_argument (argc, argv, "-save-deletes"))) {
+    SAVE_DELETES = TRUE;
+    remove_argument (N, &argc, argv);
+  }
 
   if ((N = get_argument (argc, argv, "-fix-LAP"))) {

branches/czw_branch/20160809/Ohana/src/delstar/src/delete_duplicate_measures.c

@@ -373 +373 @@
   }
     
-# if (0)
+# if (1)
   FILE *fsave = NULL;
   if (SAVE_DUPLICATES) {
@@ -408 +408 @@
     off_t N = measure[j].averef;
     if (VERBOSE) fprintf (stderr, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
-//  if (fsave) {
-//    fprintf (fsave, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
-//  }
+    if (fsave) {
+      fprintf (fsave, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
+    }
     if (isGPC1chip(measure[j].photcode)) {
       result.NdelChip ++;
@@ -426 +426 @@
   }
   
-  // if (fsave) fclose (fsave);
+  if (fsave) fclose (fsave);
 
   // set up the measure sequence lists

branches/czw_branch/20160809/Ohana/src/delstar/src/delstar.c

@@ -27 +27 @@
     case MODE_DUP_MEASURES:
       if (!delete_duplicate_measures ()) exit (1);
+      delstar_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_MATCH:
+      if (!delete_measures_by_match ()) exit (1);
       delstar_args_free ();
       ohana_memcheck (TRUE);

branches/czw_branch/20160809/Ohana/src/delstar/src/delstar_client.c

@@ -31 +31 @@
       if (!delete_duplicate_measures ()) exit (1);
       delstar_client_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_MATCH:
+      if (!delete_measures_by_match ()) exit (1);
+      delstar_args_free ();
       ohana_memcheck (TRUE);
       ohana_memdump (TRUE);

branches/czw_branch/20160809/Ohana/src/kapa2/src/Graphs.c

@@ -26 +26 @@
     graph[0].axis[i].fMinor = 5.0;
   }    
-  graph[0].data.ticktextPad = NAN;
 
-  graph[0].data.labelPadXm = NAN;
-  graph[0].data.labelPadXp = NAN;
-  graph[0].data.labelPadYm = NAN;
-  graph[0].data.labelPadYp = NAN;
-
-  graph[0].data.padXm = NAN;
-  graph[0].data.padXp = NAN;
-  graph[0].data.padYm = NAN;
-  graph[0].data.padYp = NAN;
-
-  graph[0].data.fLabelRangeXm = 1.0;
-  graph[0].data.fLabelRangeXp = 1.0;
-  graph[0].data.fLabelRangeYm = 1.0;
-  graph[0].data.fLabelRangeYp = 1.0;
-
-  graph[0].data.fMinorXm = 5.0;
-  graph[0].data.fMinorXp = 5.0;
-  graph[0].data.fMinorYm = 5.0;
-  graph[0].data.fMinorYp = 5.0;
+  KapaInitGraph (&graph[0].data);
 
   for (i = 0; i < 8; i++) {
     strcpy (graph[0].label[i].text, "");
   }
-
-  graph[0].data.xmin = 0.0;
-  graph[0].data.xmax = 1.0;
-  graph[0].data.ymin = 0.0;
-  graph[0].data.ymax = 1.0;
-
-  graph[0].data.style   = 2;            // points
-  graph[0].data.ptype   = 2;            // + for points
-  graph[0].data.ltype   = 0;            // solid line
-  graph[0].data.etype   = 0;            // no error bars
-  graph[0].data.ebar    = 0;            // no cross bar
-  graph[0].data.color   = 0;            // black
-  graph[0].data.lweight = 0.5;          // line weight of 0.5
-  graph[0].data.size    = 1.0;          // point size of 1.0
-
-  graph[0].data.flipeast = TRUE;        // +East  = -X by default
-  graph[0].data.flipnorth = FALSE;      // +North = +Y by default
-
-  InitCoords (&graph[0].data.coords, "DEC--LIN");
-  strcpy (graph[0].data.axis, "2222");
-  strcpy (graph[0].data.ticks, "2222");
-  strcpy (graph[0].data.labels, "2222");
 
   graph[0].Nobjects = 0;

branches/czw_branch/20160809/Ohana/src/libdvo/include/dvo.h

@@ -921 +921 @@
 float PhotFluxCatErr (Measure *measure, dvoMagClassType class);
 float PhotFluxAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class);
 
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);

branches/czw_branch/20160809/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -228 +228 @@
               break;
             case MAG_LEVEL_SYS:
+              value.Flt = PhotFluxSysErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_REL:
+              value.Flt = PhotFluxRelErr (measure, average, secfilt, field->magClass); 
+              break;
             case MAG_LEVEL_CAL:
-              // value.Flt = PhotFluxErr (measure, field->magClass);  
+              // XXX not defined
               break;
             case MAG_LEVEL_AVE:
+              value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              break;
             case MAG_LEVEL_REF:
-              // value.Flt = PhotFluxAveErr (equiv, average, secfilt, field->magClass, field->magSource);  
+              // XXX not defined
               break;
             case MAG_LEVEL_NONE:

branches/czw_branch/20160809/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -1507 +1507 @@
   }
   return (dFcat);
+}
+
+float PhotFluxSysErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFsys = dFcat * Fcol;
+
+  return (dFsys);
+}
+
+float PhotFluxRelErr (Measure *measure, Average *average, SecFilt *secfilt, dvoMagClassType class) {
+
+  int Np = photcodes[0].hashcode[measure[0].photcode];
+  if (Np == -1) return (NAN);
+  PhotCode *code = &photcodes[0].code[Np];
+
+  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
+  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
+  float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
+  float Moff = Mcal - ZERO_POINT + 8.9;
+  float Foff = 3630.8 * MagToFlux(Mcal);
+
+  // use dFlux if we can, but use dMag if we must:
+  // dFlux = Flux * dMag
+
+  float dFcat = NAN;
+  switch (class) {
+    case MAG_CLASS_PSF:
+      if (isnan (measure[0].dFluxPSF)) {
+        float Finst = MagToFlux(measure[0].M + Moff);
+        dFcat = measure[0].dM * Finst;
+      } else {
+        dFcat = measure[0].dFluxPSF * Foff;
+      }
+      break;
+    case MAG_CLASS_KRON:
+      if (isnan (measure[0].dFluxKron)) {
+        float Finst = MagToFlux(measure[0].Mkron + Moff);
+        dFcat = measure[0].dMkron * Finst;
+      } else {
+        dFcat = measure[0].dFluxKron * Foff;
+      }
+      break;
+    case MAG_CLASS_APER:
+      if (isnan (measure[0].dFluxAp)) {
+        float Finst = MagToFlux(measure[0].Map + Moff);
+        dFcat = measure[0].dMap * Finst;
+      } else {
+        dFcat = measure[0].dFluxAp * Foff;
+      }
+      break;
+    default:
+      break;
+  }
+
+  /* color correction */
+  float mc = PhotColorForCode (average, secfilt, NULL, code);
+  if (isnan(mc)) return (dFcat);
+  mc -= SCALE*code[0].dX;
+
+  double Mc = mc;
+  float Mcol = 0;
+  int i = 0;
+  for (i = 0; i < code[0].Nc; i++) {
+    Mcol += code[0].X[i]*Mc;
+    Mc *= mc;
+  }
+  float Fcol = MagToFlux (Mcol);
+
+  float dFrel = dFcat * Fcol;
+
+  return (dFrel);
 }
 

branches/czw_branch/20160809/Ohana/src/libkapa/src/KapaWindow.c

@@ -93 +93 @@
   graphdata[0].xmin = graphdata[0].ymin = 0.0;
   graphdata[0].xmax = graphdata[0].ymax = 1.0;
-  graphdata[0].style = graphdata[0].ptype = 0;
+
+  graphdata[0].style = graphdata[0].ptype = 2;
   graphdata[0].ltype = graphdata[0].color = 0;
   graphdata[0].etype = graphdata[0].ebar = 0;
@@ -117 +118 @@
   graphdata[0].padYm = NAN;
   graphdata[0].padYp = NAN;
+
+  graphdata[0].fLabelRangeXm = 1.0;
+  graphdata[0].fLabelRangeXp = 1.0;
+  graphdata[0].fLabelRangeYm = 1.0;
+  graphdata[0].fLabelRangeYp = 1.0;
+
+  graphdata[0].fMinorXm = 5.0;
+  graphdata[0].fMinorXp = 5.0;
+  graphdata[0].fMinorYm = 5.0;
+  graphdata[0].fMinorYp = 5.0;
 
   return (TRUE);

branches/czw_branch/20160809/Ohana/src/relastro/Makefile

@@ -26 +26 @@
 RELASTRO = \
 $(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairObjectIDs.$(ARCH).o \
+$(SRC)/RepairStacks.$(ARCH).o \
 $(SRC)/RepairStackMeasures.$(ARCH).o \
 $(SRC)/StackImageMaps.$(ARCH).o \
@@ -114 +116 @@
 RELASTRO_CLIENT = \
 $(SRC)/CheckMeasureToImage.$(ARCH).o \
+$(SRC)/RepairObjectIDs.$(ARCH).o \
+$(SRC)/RepairStacks.$(ARCH).o \
 $(SRC)/RepairStackMeasures.$(ARCH).o \
 $(SRC)/StackImageMaps.$(ARCH).o \

branches/czw_branch/20160809/Ohana/src/relastro/include/relastro.h

@@ -31 +31 @@
 typedef enum {FIT_NONE, FIT_AVERAGE, FIT_PM_ONLY, FIT_PAR_ONLY, FIT_PM_AND_PAR} FitMode;
 
-typedef enum {OP_NONE, OP_IMAGES, OP_HIGH_SPEED, OP_MERGE_SOURCE, OP_UPDATE_OBJECTS, OP_UPDATE_OFFSETS, OP_LOAD_OBJECTS, OP_HPM, OP_PARALLEL_REGIONS, OP_PARALLEL_IMAGES, OP_REPAIR_WARPS} RelastroOp;
+typedef enum {OP_NONE, OP_IMAGES, OP_HIGH_SPEED, OP_MERGE_SOURCE, OP_UPDATE_OBJECTS, OP_UPDATE_OFFSETS, OP_LOAD_OBJECTS, OP_HPM, OP_PARALLEL_REGIONS, OP_PARALLEL_IMAGES, OP_REPAIR_STACKS, OP_REPAIR_WARPS, OP_REPAIR_OBJECT_ID} RelastroOp;
 
 typedef enum {TARGET_NONE, TARGET_SIMPLE, TARGET_CHIPS, TARGET_MOSAICS} FitTarget;
@@ -864 +864 @@
 uint64_t CreatePSPSDetectionID(double tobs, int ccdid, int detID);
 
+int RepairStacks (SkyList *skylist, int hostID, char *hostpath);
+
+int RepairObjectIDs (SkyList *skylist, int hostID, char *hostpath);
+
 void sort_by_ra (double *R, double *D, int *I, int *S, int N);
 void FreeStackGroups (void);

branches/czw_branch/20160809/Ohana/src/relastro/src/StackImageMaps.c

@@ -87 +87 @@
   // we have the stack centers; find all stacks within 0.3 degrees of this point
   Rstk = ohana_normalize_angle (Rstk);
-  double dD = 0.3;
+  double dD = 0.4;
   double dR = dD / cos(RAD_DEG*Dstk);
   double Rmin = Rstk - dR;
@@ -93 +93 @@
   double Dmin = Dstk - dD;
   double Dmax = Dstk + dD;
+
+  // for the north pole, just test the whole circle
+  if (Dstk > 88) {
+    Rmin = 0.0;
+    Rmax = 360.0;
+  }
 
   double dPosMin = NAN;

branches/czw_branch/20160809/Ohana/src/relastro/src/UpdateObjectOffsets.c

@@ -194 +194 @@
     if (USE_FIXED_PIXCOORDS) strextend (&command, "-D USE_FIXED_PIXCOORDS 1"); 
 
-    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks");
+    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks-on-update");
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 
@@ -324 +324 @@
     if (ExcludeBogus)    strextend (&command, "-exclude-bogus %f", ExcludeBogusRadius);
     
+    if (USE_ALL_IMAGES)      strextend (&command, "-use-all-images");
     if (USE_FIXED_PIXCOORDS) strextend (&command, "-D USE_FIXED_PIXCOORDS 1"); 
 
-    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks");
+    if (REPAIR_STACKS)          strextend (&command, "-repair-stacks-on-update");
     if (CHECK_MEASURE_TO_IMAGE) strextend (&command, "-check-measures");
 

branches/czw_branch/20160809/Ohana/src/relastro/src/args.c

@@ -53 +53 @@
   }
 
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_STACKS;
+  }
+  if ((N = get_argument (argc, argv, "-repair-object-id"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_OBJECT_ID;
+  }
+
   if ((N = get_argument (argc, argv, "-repair-warps"))) {
     remove_argument (N, &argc, argv);
@@ -59 +68 @@
 
   REPAIR_STACKS = FALSE;
-  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+  if ((N = get_argument (argc, argv, "-repair-stacks-on-update"))) {
     remove_argument (N, &argc, argv);
     REPAIR_STACKS = TRUE;
@@ -691 +700 @@
   }
 
+  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_STACKS;
+  }
+
+  if ((N = get_argument (argc, argv, "-repair-object-id"))) {
+    remove_argument (N, &argc, argv);
+    RELASTRO_OP = OP_REPAIR_OBJECT_ID;
+  }
+
   if ((N = get_argument (argc, argv, "-repair-warps"))) {
     remove_argument (N, &argc, argv);
@@ -697 +716 @@
 
   REPAIR_STACKS = FALSE;
-  if ((N = get_argument (argc, argv, "-repair-stacks"))) {
+  if ((N = get_argument (argc, argv, "-repair-stacks-on-update"))) {
     remove_argument (N, &argc, argv);
     REPAIR_STACKS = TRUE;

branches/czw_branch/20160809/Ohana/src/relastro/src/relastro.c

@@ -104 +104 @@
     }
 
+    case OP_REPAIR_STACKS: {
+      FITS_DB db;
+      if (!PARALLEL) {
+      
+        set_db (&db);
+        gfits_db_init (&db);
+
+        /* lock and load the image db table */
+        int status = dvo_image_lock (&db, ImageCat, 60.0, LCK_SOFT);
+        if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+        if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+        if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
+        // the raw FITS data is freed by dvo_image_load, leaving only the Image structure data
+
+        /* load regions and images based on specified sky patch (default depth) */
+        load_images (&db, skylist, FALSE, USE_ALL_IMAGES);
+      }
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairStacks (skylist, 0, NULL);
+
+      if (!PARALLEL) {
+        freeImages (db.ftable.buffer);
+        gfits_db_free (&db);
+        freeMosaics ();
+      } 
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
+    case OP_REPAIR_OBJECT_ID: {
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairObjectIDs (skylist, 0, NULL);
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
     case OP_HIGH_SPEED:
       /* high-speed is a 2pt cross-correlation process for linking moving objects (high PM) */

branches/czw_branch/20160809/Ohana/src/relastro/src/relastro_client.c

@@ -104 +104 @@
     }
 
+    case OP_REPAIR_OBJECT_ID: {
+
+      // iterate over catalogs to make detection coordinates consistant
+      RepairObjectIDs (skylist, HOST_ID, HOSTDIR);
+
+      relastro_free (sky, skylist);
+      exit (0);
+    }
+
+      // XXX loading the images is fairly costly -- see if we can do an image subset?
+    case OP_REPAIR_STACKS: {
+      FITS_DB db;
+      
+      set_db (&db);
+      gfits_db_init (&db);
+
+      /* lock and load the image db table */
+      int status = dvo_image_lock (&db, ImageCat, 60.0, LCK_SOFT);
+      if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);
+      if (db.dbstate == LCK_EMPTY) Shutdown ("ERROR: No images in catalog %s (1)", db.filename);
+      if (!dvo_image_load (&db, VERBOSE, FALSE)) Shutdown ("can't read image catalog %s", db.filename);
+      // the raw FITS data is freed by dvo_image_load, leaving only the Image structure data
+
+      /* load regions and images based on specified sky patch (default depth) */
+      load_images (&db, skylist, FALSE, USE_ALL_IMAGES);
+
+      RepairStacks (skylist, HOST_ID, HOSTDIR);
+      
+      freeImages (db.ftable.buffer);
+      gfits_db_free (&db);
+      freeMosaics ();
+
+      relastro_client_free (sky, skylist);
+      break;
+    }
+
       // XXX loading the images is fairly costly -- see if we can do an image subset?
     case OP_REPAIR_WARPS: {