Changeset 39353

Timestamp:

Feb 18, 2016, 6:23:49 AM (10 years ago)

Author:

eugene

Message:

allow reload run with parallel-manual; delete the targetted image tables (Image.NN.fits) on launch

Location:

trunk/Ohana/src/relphot/src

Files:

• assign_images.c (modified) (1 diff)
• launch_region_hosts.c (modified) (4 diffs)

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

@@ -26 +26 @@
   char mapfile[DVO_MAX_PATH];
   snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
-  table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
+  AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
 
   // assign images.coords.offsetMap -> table->map[i]
   if (table) {
     AstromOffsetTableMatchChips (image, Nimage, table);
-  } else {
-    table = AstromOffsetTableInit ();
   }
 

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

@@ -6 +6 @@
   int i;
 
-  // clear the I/O files
-  for (i = 0; i < regionHosts->Nhosts; i++) {
-    char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");
-    if (truncate (syncfile, 0)) fprintf (stderr, "trouble clearing syncfile %s\n", syncfile);
-    free (syncfile);
+  // do not remove the sync and fits files if we do a manual run -- user must clear if needed
+  if (!PARALLEL_REGIONS_MANUAL) {
+    // clear the I/O files
+    for (i = 0; i < regionHosts->Nhosts; i++) {
+      char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");
+      if (truncate (syncfile, 0)) fprintf (stderr, "trouble clearing syncfile %s\n", syncfile);
+      free (syncfile);
 
-    char *fitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.fits");
-    if (truncate (fitsfile, 0)) fprintf (stderr, "trouble clearing fitsfile %s\n", fitsfile );
-    free (fitsfile);
+      char *fitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.fits");
+      if (truncate (fitsfile, 0)) fprintf (stderr, "trouble clearing fitsfile %s\n", fitsfile );
+      free (fitsfile);
 
-    char *imsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");
-    if (truncate (imsyncfile, 0)) fprintf (stderr, "trouble clearing imsyncfile %s\n", imsyncfile);
-    free (imsyncfile);
+      char *imsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");
+      if (truncate (imsyncfile, 0)) fprintf (stderr, "trouble clearing imsyncfile %s\n", imsyncfile);
+      free (imsyncfile);
 
-    char *imfitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.fits");
-    if (truncate (imfitsfile, 0)) fprintf (stderr, "trouble clearing imfitsfile %s\n", imfitsfile);
-    free (imfitsfile);
+      char *imfitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.fits");
+      if (truncate (imfitsfile, 0)) fprintf (stderr, "trouble clearing imfitsfile %s\n", imfitsfile);
+      free (imfitsfile);
 
-    char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "loop.sync");
-    if (truncate (loopsyncfile, 0)) fprintf (stderr, "trouble clearing loopsyncfile %s\n", loopsyncfile);
-    free (loopsyncfile);
+      char *loopsyncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "loop.sync");
+      if (truncate (loopsyncfile, 0)) fprintf (stderr, "trouble clearing loopsyncfile %s\n", loopsyncfile);
+      free (loopsyncfile);
+    }
   }
 
@@ -37 +40 @@
     char filename[1024];
     snprintf (filename, 1024, "%s/Image.%d.fits", CATDIR, host->hostID);
+    if (unlink (filename)) fprintf (stderr, "trouble clearing image %s\n", filename);
 
     // write the image subset for this host
@@ -98 +102 @@
   }
 
+  int status = TRUE;
   if (PARALLEL_REGIONS_MANUAL) {
     fprintf (stderr, "run the relphot_client commands above.  when these are done, hit return\n");
@@ -103 +108 @@
   } else {
     RegionHostTableWaitJobsGetIO (regionHosts, __FILE__, __LINE__, VERBOSE);
-  }
- 
-  int status = TRUE;
-  for (i = 0; i < regionHosts->Nhosts; i++) {
-    status = status && (regionHosts->hosts[i].status == 0);
+
+    for (i = 0; i < regionHosts->Nhosts; i++) {
+      status = status && (regionHosts->hosts[i].status == 0);
+    }
   }