Changeset 38986 for trunk/Ohana/src/relphot

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relphot/include/relphot.h (modified) (2 diffs)
• src/relphot/src/Shutdown.c (modified) (1 diff)
• src/relphot/src/args.c (modified) (2 diffs)
• src/relphot/src/load_catalogs.c (modified) (2 diffs)
• src/relphot/src/load_images.c (modified) (1 diff)
• src/relphot/src/reload_catalogs.c (modified) (2 diffs)
• src/relphot/src/relphot.c (modified) (1 diff)
• src/relphot/src/relphot_client.c (modified) (1 diff)
• src/relphot/src/relphot_objects.c (modified) (2 diffs)
• src/relphot/src/relphot_parallel_images.c (modified) (2 diffs)
• src/relphot/src/relphot_synthphot.c (modified) (1 diff)
• src/relphot/src/setMrelCatalog.c (modified) (1 diff)

trunk/Ohana/src/relphot/include/relphot.h

@@ -14 +14 @@
 // # define IDX_T off_t
 # define IDX_T int 
+
+typedef enum {
+  STAGE_CHIP  = 0x01,
+  STAGE_WARP  = 0x02,
+  STAGE_STACK = 0x04,
+} RelphotStages;
 
 typedef enum {
@@ -327 +333 @@
 int USE_BASIC_CHECK;
 int USE_FULL_OVERLAP;
+
+RelphotStages STAGES;
 
 # ifdef GRID_V1

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

@@ -21 +21 @@
   va_end (argp);
 
-  SetProtect (TRUE);
-  if (db) gfits_db_close (db);
   fprintf (stderr, "ERROR: relphot halted\n");
   exit (1);

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

@@ -344 +344 @@
   }
 
+  STAGES = STAGE_CHIP | STAGE_WARP | STAGE_STACK;
+  if ((N = get_argument (argc, argv, "-skip-chip"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_CHIP;
+  }
+  if ((N = get_argument (argc, argv, "-skip-warp"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_WARP;
+  }
+  if ((N = get_argument (argc, argv, "-skip-stack"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_STACK;
+  }
+  if (!STAGES) {
+    fprintf (stderr, "ERROR: no valid stages selected\n");
+    exit (3);
+  }
+
   REGION_FILE = NULL;
   if ((N = get_argument (argc, argv, "-region-hosts"))) {
@@ -664 +682 @@
   }
 
+  STAGES = STAGE_CHIP | STAGE_WARP | STAGE_STACK;
+  if ((N = get_argument (argc, argv, "-skip-chip"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_CHIP;
+  }
+  if ((N = get_argument (argc, argv, "-skip-warp"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_WARP;
+  }
+  if ((N = get_argument (argc, argv, "-skip-stack"))) {
+    remove_argument (N, &argc, argv);
+    STAGES &= ~STAGE_STACK;
+  }
+  if (!STAGES) {
+    fprintf (stderr, "ERROR: no valid stages selected\n");
+    exit (3);
+  }
+
   if ((MODE == MODE_SYNTH_PHOT)  && (argc == 1)) return TRUE;
   if ((MODE == MODE_UPDATE_OBJECTS)  && (argc == 1)) return TRUE;

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

@@ -253 +253 @@
   Catalog *catalog = catalogs->catalog;
   *Ncatalog = catalogs->Ncatalog;
-  BrightCatalogSplitFree (catalogs);
 
   int Nmeasure = 0;
@@ -263 +262 @@
 
   fprintf (stderr, "loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
+  client_logger_message ("loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
+
+  BrightCatalogSplitFree (catalogs);
 
   return (catalog);

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

@@ -31 +31 @@
   MARKTIME("build chip match for %d images: %f sec\n", (int) Nimage, dtime);
 
+  // XXX consider allowing relphot to skip the AstroMap load (do we need precise astrometry here?)
+
   char mapfile[DVO_MAX_PATH];
   snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
-  AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, VERBOSE);
+  AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, 100000, VERBOSE);
 
   // assign images.coords.offsetMap -> table->map[i]

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

@@ -105 +105 @@
     free (moddate);
 
-    dvo_catalog_save (&catalog, VERBOSE); 
-    dvo_catalog_unlock (&catalog);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
+    SetProtect (FALSE);
 
     free_tiny_values(&catalog);
@@ -244 +246 @@
     if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
 
+    if (!(STAGES & STAGE_CHIP))  { strextend (&command, "-skip-chip"); }
+    if (!(STAGES & STAGE_WARP))  { strextend (&command, "-skip-warp"); }
+    if (!(STAGES & STAGE_STACK)) { strextend (&command, "-skip-stack"); }
+
     // deprecate
     // if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", SET_MREL_VERSION); } // XXXX deprecate this...

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

@@ -4 +4 @@
 
   // get configuration info, args
+  SetSignals ();
   RelphotMode mode = initialize (argc, argv);
   if (!mode) exit (2);

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

@@ -18 +18 @@
 
   // get configuration info, args, lockfile (set CATDIR, HOST_ID, HOSTDIR, etc) 
+  SetSignals ();
   initialize_client (argc, argv);
   client_logger_init (HOSTDIR);

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

@@ -101 +101 @@
     // but it would be better to define a dvo crawler program to do this
     // catalog.catformat = DVO_FORMAT_PS1_V1;  
-    dvo_catalog_save (&catalog, VERBOSE); 
-    dvo_catalog_unlock (&catalog);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
+    SetProtect (FALSE);
     free_tiny_values(&catalog);
     dvo_catalog_free (&catalog);
@@ -155 +157 @@
     if (SYNTH_ZERO_POINTS) { strextend (&command, "-synthphot-zpts %s", SYNTH_ZERO_POINTS); }
 
+    if (!(STAGES & STAGE_CHIP))  { strextend (&command, "-skip-chip"); }
+    if (!(STAGES & STAGE_WARP))  { strextend (&command, "-skip-warp"); }
+    if (!(STAGES & STAGE_STACK)) { strextend (&command, "-skip-stack"); }
+
     // if (SET_MREL_VERSION != 1) { strextend (&command, "-set-mrel-version %d", SET_MREL_VERSION); } 
 

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

@@ -34 +34 @@
     exit (2);
   }
+  client_logger_message ("loaded images\n");
 
   // once we have read this table, we should remove it for repeat runs
@@ -53 +54 @@
   // the following function correctly chooses the sky regions on the 0,360 boundary
   SkyList *skylist = SkyListByBounds (sky, -1, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
+  client_logger_message ("prepare to load catalogs\n");
 
   /* load catalog data from region files (hostID is 0 since we are not a client */

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

@@ -71 +71 @@
     // but it would be better to define a dvo crawler program to do this
     // catalog.catformat = DVO_FORMAT_PS1_V1;  
-    dvo_catalog_save (&catalog, VERBOSE); 
-    dvo_catalog_unlock (&catalog);
+    SetProtect (TRUE);
+    if (!dvo_catalog_save (&catalog, VERBOSE)) { fprintf (stderr, "ERROR: failed to save %s\n", catalog.filename); exit (1); }
+    if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
+    SetProtect (FALSE);
     dvo_catalog_free (&catalog);
   }

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

@@ -52 +52 @@
   for (j = 0; j < catalog[Nc].Naverage; j++) {
 
-    setMrelAverageExposure (&catalog[Nc], Nc, j, Nsecfilt, isSetMrelFinal, flatcorr, results);
+    if (STAGES & STAGE_CHIP) {
+      setMrelAverageExposure (&catalog[Nc], Nc, j, Nsecfilt, isSetMrelFinal, flatcorr, results);
+    }
 
     // only apply Stack operation on setMrelFinal in first pass 
-    if (isSetMrelFinal && !IS_DIFF_DB) {
+    if (isSetMrelFinal && (STAGES & STAGE_STACK) && !IS_DIFF_DB) {
       setMrelAverageStack (&catalog[Nc], Nc, j, Nsecfilt, flatcorr);
     }
 
     // only measure force-warp mean values if issetMrelFinal (make it optional?)
-    if (isSetMrelFinal) {
+    if (isSetMrelFinal && (STAGES & STAGE_WARP)) {
       setMrelAverageForcedWarp (&catalog[Nc], Nc, j, Nsecfilt, flatcorr, results);
     }