Changeset 39693

Timestamp:

Sep 13, 2016, 12:31:29 PM (10 years ago)

Author:

eugene

Message:

add code to repair stacks and to repair the psps object IDs

Location:

trunk/Ohana/src/relastro

Files:

• Makefile (modified) (2 diffs)
• include/relastro.h (modified) (2 diffs)
• src/RepairObjectIDs.c (added)
• src/RepairStacks.c (added)
• src/UpdateObjectOffsets.c (modified) (2 diffs)
• src/args.c (modified) (4 diffs)
• src/relastro.c (modified) (1 diff)
• src/relastro_client.c (modified) (1 diff)

trunk/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 \

trunk/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);

trunk/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");
 
@@ -327 +327 @@
     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");
 

trunk/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;

trunk/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) */

trunk/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: {