Changeset 39481 for trunk/Ohana/src/relphot/src/relphot.c

Timestamp:

Mar 24, 2016, 10:03:04 AM (10 years ago)

Author:

eugene

Message:

add warp repair option (copied from relastro); free boundary & tessellation tree; free memory; call load_images in relphot_objects; when load_images is called by relphot_objects, free the full image set leaving only the subset; push SkyList load as high as possible

File:

• trunk/Ohana/src/relphot/src/relphot.c (modified) (6 diffs)

trunk/Ohana/src/relphot/src/relphot.c

@@ -8 +8 @@
   if (!mode) exit (2);
 
+  SkyList *skylist = NULL;
+
   SkyTable *sky = SkyTableLoadOptimal (CATDIR, NULL, NULL, TRUE, -1, VERBOSE);
   if (!sky) {
@@ -15 +17 @@
   SkyTableSetFilenames (sky, CATDIR, "cpt");
   
-  SkyList *skylist = NULL;
-  if (UserCatalog) {
-    int Nchar = strlen(UserCatalog);
-    if (!strcmp (&UserCatalog[Nchar-4], ".cpt")) UserCatalog[Nchar-4] = 0;
-    skylist = SkyListByName (sky, UserCatalog);
-  } else {
-    skylist = SkyListByPatch (sky, -1, &UserPatch);
-  }
-  if (!skylist) {
-    fprintf (stderr, "ERROR setting up skylist for %s\n", CATDIR);
-    exit (2);
+  if ((mode != PARALLEL_REGIONS) && (mode != PARALLEL_IMAGES)) {
+    skylist = NULL;
+    if (UserCatalog) {
+      int Nchar = strlen(UserCatalog);
+      if (!strcmp (&UserCatalog[Nchar-4], ".cpt")) UserCatalog[Nchar-4] = 0;
+      skylist = SkyListByName (sky, UserCatalog);
+    } else {
+      skylist = SkyListByPatch (sky, -1, &UserPatch);
+    }
+    if (!skylist) {
+      fprintf (stderr, "ERROR setting up skylist for %s\n", CATDIR);
+      exit (2);
+    }
   }
   
@@ -37 +41 @@
     case UPDATE_AVERAGES:
       // take the current set of detections and set the mean magnitudes
-      // DOES NOT LOAD THE IMAGE TABLE
-      relphot_objects (sky, skylist, 0, NULL);
+      relphot_objects (skylist, 0, NULL);
       relphot_free (sky, skylist);
       exit (0);
@@ -44 +47 @@
     case SYNTH_PHOT:
       // set the mean magnitudes ONLY for SYNPHOT objects
-      relphot_synthphot (0, NULL);
+      relphot_synthphot (skylist, 0, NULL);
       relphot_free (sky, skylist);
       exit (0);
@@ -50 +53 @@
     case PARALLEL_REGIONS:
       // run image updates in parallel across multiple remote machines
-      relphot_parallel_regions ();
+      relphot_parallel_regions (sky);
       relphot_free (sky, skylist);
       exit (0);
@@ -56 +59 @@
     case PARALLEL_IMAGES:
       // operation on the remote machines in the PARALLEL_REGION mode
-      relphot_parallel_images ();
+      relphot_parallel_images (sky);
       relphot_free (sky, skylist);
       exit (0);