Changeset 33616

Timestamp:

Mar 28, 2012, 8:49:26 AM (14 years ago)

Author:

eugene

Message:

cleanups for parallel ops

Location:

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo

Files:

• mextract.c (modified) (7 diffs)
• region_list.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

@@ -25 +25 @@
   selection = NULL;
 
-  fprintf (stderr, "start...");
+  // fprintf (stderr, "start...");
   if ((N = get_argument (argc, argv, "-h"))) goto help;
   if ((N = get_argument (argc, argv, "--help"))) goto help;
@@ -39 +39 @@
     remove_argument (N, &argc, argv);
     PARALLEL = TRUE;
+  }
+
+  // this is used to NOT save the results in the results file
+  // use this option when mextract is used in a script which does its
+  // own job of packaging the results
+  int SKIP_RESULTS = FALSE;
+  if ((N = get_argument (argc, argv, "-skip-results"))) {
+    remove_argument (N, &argc, argv);
+    SKIP_RESULTS = TRUE;
   }
 
@@ -146 +155 @@
   interrupt = FALSE;
 
-  fprintf (stderr, "done setup...");
+  // fprintf (stderr, "done setup...");
 
   for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
@@ -171 +180 @@
     /* XXX need to call dvo_catalog_chipcoords here passing the loaded images */
 
-    fprintf (stderr, "done read...");
+    // fprintf (stderr, "done read...");
 
     for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
@@ -223 +232 @@
   interrupt = FALSE;
 
-  fprintf (stderr, "done load...");
+  // fprintf (stderr, "done load...");
 
   for (n = 0; n < Nreturn; n++) {
@@ -230 +239 @@
 
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
-  if (RESULT_FILE) {
+  if (RESULT_FILE && !SKIP_RESULTS) {
     int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, NULL);
     if (!status) goto escape;
@@ -244 +253 @@
   FreeSkyRegionSelection (selection);
 
-  fprintf (stderr, "done extr...\n");
+  // fprintf (stderr, "done extr...\n");
   return (TRUE);
 

branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/region_list.c

@@ -183 +183 @@
   /* determine region-file names */
   if (selection->name != NULL) {
-    char filename[256];
-    char *CATDIR = dvo_get_catdir();
-
-    ALLOCATE (skylist, SkyList, 1);
-    ALLOCATE (skylist[0].regions, SkyRegion *, 1);
-    ALLOCATE (skylist[0].regions[0], SkyRegion, 1);
-    ALLOCATE (skylist[0].filename, char *, 1);
-    skylist[0].ownElements = TRUE; // free these elements when freeing the list
-    
-    strcpy (skylist[0].regions[0][0].name, selection->name);
-    sprintf (filename, "%s/%s.cpt", CATDIR, selection->name);
-    skylist[0].filename[0] = strcreate (filename);
-    skylist[0].Nregions = 1;
+    skylist = SkyListByName (sky, selection->name);
     return (skylist);
   }