Changeset 36506

Timestamp:

Feb 11, 2014, 8:57:15 AM (12 years ago)

Author:

eugene

Message:

inching towards a working relphot -parallel-regions

Location:

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src

Files:

• args.c (modified) (1 diff)
• assign_images.c (modified) (3 diffs)
• help.c (modified) (1 diff)
• relphot_parallel_regions.c (modified) (3 diffs)
• share_mean_mags.c (modified) (1 diff)

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/args.c

@@ -359 +359 @@
     remove_argument (N, &argc, argv);
     mode = PARALLEL_REGIONS;
+    if (N >= argc) relphot_usage();
+    REGION_FILE = strcreate (argv[N])
+    remove_argument (N, &argc, argv);
   }
 

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/assign_images.c

@@ -3 +3 @@
 // This function generates a subset of the images based on selections.  Input db has already
 // been loaded with the raw fits table data
-SkyList *assign_images (FITS_DB *db, RegionHostTable *regionHosts) {
+int assign_images (FITS_DB *db, RegionHostTable *regionHosts) {
 
   off_t Nimage;
@@ -30 +30 @@
   select_images_hostregion (regionHosts, image, Nimage);
 
+  return TRUE;
 }
 
 # define D_NIMAGE 1000
 
+// assign images to the region hosts; at the end, each host will have its list of images
 int select_images_hostregion (RegionHostTable *hosts, Image *image, off_t Nimage) {
 
@@ -66 +68 @@
       continue;
     }
+
+    // XXX need to make sure mosaics for each saved image are also saved
+    // skip them here and add explicitly below.
 
     /* define image center - note the DIS images (mosaic phu) are special */

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/help.c

@@ -6 +6 @@
   fprintf (stderr, "       or:    relphot -averages -region RA RA DEC DEC\n");
   fprintf (stderr, "       or:    relphot -apply-offsets -region RA RA DEC DEC\n");
-  fprintf (stderr, "       or:    relphot -parallel-regions ()\n");
+  fprintf (stderr, "       or:    relphot -parallel-regions (RegionFile)\n");
   fprintf (stderr, "       or:    relphot -parallel-images ()\n");
   fprintf (stderr, "  use -h for more usage information\n");

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/relphot_parallel_regions.c

@@ -3 +3 @@
 // measure.M contains: -2.5*log(DN) + 2.5*log(exptime) + 25.0 
 
-int relphot_parallel_images () {
+int relphot_parallel_regions () {
 
   int i, status, Ncatalog;
@@ -13 +13 @@
 
   // load the RegionTable (UserRegion should not be used at this level)
-  RegionHostTable *regionHosts = RegionHostTableLoad (CATDIR, "RegionHostTable.dat");
+  RegionHostTable *regionHosts = RegionHostTableLoad (CATDIR, REGION_FILE);
 
   /* register database handle with shutdown procedure */
@@ -38 +38 @@
 
   /* assign the images to the different region hosts */
-  XXX = assign_images (&db, regionHosts);
+  if (!assign_images (&db, regionHosts)) Shutdown ("error assigning images to region hosts");
   MARKTIME("-- assign images: %f sec\n", dtime);
 

branches/eam_branches/ipp-20140206/Ohana/src/relphot/src/share_mean_mags.c

@@ -58 +58 @@
     catalog[catSeq].secfilt[objSeq*Nsec + Nsecfilt].mag = meanmags[i].mag;
   }
-  SaveMeanMags (meanmags, Nmeanmags, where);
 }