Changeset 36578

Timestamp:

Mar 7, 2014, 2:44:39 PM (12 years ago)

Author:

eugene

Message:

correct handling of REGION_HOST_ID and neighbor; uniquify relastro temp data

Location:

branches/eam_branches/ipp-20140206/Ohana/src

Files:

• relastro/src/indexCatalogs.c (modified) (1 diff)
• relastro/src/load_catalogs.c (modified) (2 diffs)
• relastro/src/relastro_parallel_images.c (modified) (1 diff)
• relastro/src/share_images_pos.c (modified) (1 diff)
• relastro/src/share_mean_pos.c (modified) (1 diff)
• relphot/src/help.c (modified) (2 diffs)
• relphot/src/load_catalogs.c (modified) (1 diff)
• relphot/src/share_image_mags.c (modified) (1 diff)
• relphot/src/share_mean_mags.c (modified) (1 diff)

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/indexCatalogs.c

@@ -10 +10 @@
   int i;
   off_t j;
+
+  if (!Ncatalog) return TRUE;
 
   // find the max value of catID

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/load_catalogs.c

@@ -115 +115 @@
 Catalog *load_catalogs_parallel (SkyList *sky, int *Ncatalog) {
 
+  char uniquer[12];
+  int TIME = time(NULL);
+  int PID = getpid();
+  snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
+
   // load the list of hosts
   HostTable *table = HostTableLoad (CATDIR, sky->hosts);
@@ -131 +136 @@
 
     ALLOCATE (table->hosts[i].results, char, 1024);
-    snprintf (table->hosts[i].results, 1024, "%s/relastro.catalog.subset.dat", table->hosts[i].pathname);
+    snprintf (table->hosts[i].results, 1024, "%s/relastro.catalog.%s.dat", table->hosts[i].pathname, uniquer);
 
     // options / arguments that can affect relastro_client -load:

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -48 +48 @@
   MARKTIME("-- load catalog data: %f sec\n", dtime);
   
-  if (Ncatalog == 0) {
-    fprintf (stderr, "ERROR: no valid data for relastro, exiting\n");
-    exit (2);
-  }
-
   // generate tables go from catID,objID -> catSeq,objSeq
   indexCatalogs (catalog, Ncatalog);

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_images_pos.c

@@ -53 +53 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
+    if (REGION_HOST_ID && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagepos.sync");

branches/eam_branches/ipp-20140206/Ohana/src/relastro/src/share_mean_pos.c

@@ -67 +67 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
+    if (REGION_HOST_ID && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.sync");

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

@@ -2 +2 @@
 
 void relphot_usage (void) {
-  fprintf (stderr, "ERROR: USAGE: relphot (photcode[s]) -region RA RA DEC DEC\n");
-  fprintf (stderr, "       or:    relphot (photcode[s]) -catalog (name)\n");
-  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 -region-hosts (RegionFile)\n");
-  fprintf (stderr, "       or:    relphot -parallel-images (ImageTable) -region-hosts (RegionFile)\n");
+  fprintf (stderr, "ERROR: USAGE: relphot (photcodes) -images\n");
+  fprintf (stderr, "       or:    relphot -averages\n");
+  fprintf (stderr, "       or:    relphot -apply-offsets\n");
+  fprintf (stderr, "       or:    relphot (photcodes) -parallel-regions -region-hosts (RegionFile)\n");
+  fprintf (stderr, "       or:    relphot (photcodes) -parallel-images (ImageTable) -region-hosts (RegionFile)\n\n");
+  fprintf (stderr, "  regions:    -region RA RA DEC DEC)\n");
+  fprintf (stderr, "       or:    -catalog (name)\n");
   fprintf (stderr, "  use -h for more usage information\n");
   exit (2);
@@ -21 +22 @@
 
 show_help:
-  fprintf (stderr, "ERROR: USAGE: relphot (photcode[s]) -region RA RA DEC DEC\n");
-  fprintf (stderr, "       or:    relphot (photcode[s]) -catalog (name)\n");
-  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-images ()\n");
+  fprintf (stderr, "ERROR: USAGE: relphot (photcodes) -images\n");
+  fprintf (stderr, "       or:    relphot -averages\n");
+  fprintf (stderr, "       or:    relphot -apply-offsets\n");
+  fprintf (stderr, "       or:    relphot (photcodes) -parallel-regions -region-hosts (RegionFile)\n");
+  fprintf (stderr, "       or:    relphot (photcodes) -parallel-images (ImageTable) -region-hosts (RegionFile)\n\n");
+  fprintf (stderr, "  regions:    -region RA RA DEC DEC)\n");
+  fprintf (stderr, "       or:    -catalog (name)\n");
   fprintf (stderr, "  options: \n");
   fprintf (stderr, "  -time (start) (stop)\n");

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

@@ -89 +89 @@
 
   fprintf (stderr, "using "OFF_T_FMT" of "OFF_T_FMT" stars ("OFF_T_FMT" of "OFF_T_FMT" measurements)\n", Nstar, Nstar_total, Nmeas, Nmeas_total);
-  if (!hostID && (Nstar < 1)) Shutdown ("%s", "ERROR: no stars match the minimum requirements; exiting \n");
+  if (!hostID && !REGION_HOST_ID && (Nstar < 1)) Shutdown ("%s", "ERROR: no stars match the minimum requirements; exiting \n");
   // in regular relphot, we shutdown here; in relphot_client, we generate and return an empty table (for consistency)
-   
 
   // XXX consider only returning the populated catalogs

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

@@ -53 +53 @@
   for (i = 0; i < regionHosts->Nhosts; i++) {
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
+    if (REGION_HOST_ID && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "imagemags.sync");

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

@@ -77 +77 @@
     // if (not_neighbor(host[i])) continue;
     if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
-    if ((REGION_HOST_ID > -1) && !regionHosts->hosts[i].isNeighbor) continue;
+    if (REGION_HOST_ID && !regionHosts->hosts[i].isNeighbor) continue;
 
     char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanmags.sync");