Changeset 39382

Timestamp:

Feb 24, 2016, 10:18:30 AM (10 years ago)

Author:

eugene

Message:

in non-parallel context, load the image table for UpdateObjectOffsets

File:

• trunk/Ohana/src/relastro/src/relastro.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/relastro.c

@@ -35 +35 @@
       exit (0);
 
-    case OP_UPDATE_OFFSETS:
+    case OP_UPDATE_OFFSETS: 
+      if (!PARALLEL) {
+        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);
+      }
+
       // iterate over catalogs to make detection coordinates consistant
       UpdateObjectOffsets (skylist, 0, NULL);