Changeset 36517

Timestamp:

Feb 16, 2014, 6:51:33 AM (12 years ago)

Author:

eugene

Message:

relphot parallel is ready to build

Location:

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

Files:

• doc/parallel.txt (modified) (2 diffs)
• src/ImageMagIO.c (added)
• src/indexCatalog.c (modified) (1 diff)
• src/share_image_mags.c (modified) (6 diffs)
• src/share_mean_mags.c (modified) (2 diffs)

branches/eam_branches/ipp-20140206/Ohana/src/relphot/doc/parallel.txt

@@ +1 @@
+
+2014.02.15
+
+Nearly done with the relphot mods.  some outstanding questions;
+
+ * image vs mosaic?
+ * how do decide which images need to be shared?
 
 2014.02.14
@@ -22 +29 @@
  * from which hosts do I slurp mean mags?
  o function to merge a new meanmag array into the existing one
- * how to go from (objID,catID) to a given catalog[i].average[j]
+ o how to go from (objID,catID) to a given catalog[i].average[j]
 
 2014.02.06

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

@@ -1 +1 @@
 # include "relphot.h"
+
+static int  *catIDseq = NULL;
+static int **objIDseq = NULL;
 
 int indexCatalogs (catalog, Ncatalog) {
 
-  // do I know 
+  // find the max value of catID
+  int catIDmax = 0;
+  for (i = 0; i < Ncatalog; i++) {
+    catIDmax = MAX (catalog[i].catID, catIDmax);
+  }
+
+  ALLOCATE (catIDseq, int, catIDmax + 1);
+  for (i = 0; i < catIDmax + 1; i++) {
+    catIDseq[i] = -1;
+  }
+
+  for (i = 0; i < Ncatalog; i++) {
+    int catID = catalog[i].catID;
+    catIDseq[catID] = i;
+  }
   
-  
+  ALLOCATE (objIDseq, int *, Ncatalog);
+  for (i = 0; i < Ncatalog; i++) {
+    int objIDmax = 0;
+    for (j = 0; j < catalog[i].Naverage; j++) {
+      objIDmax = MAX (catalog[i].average[j].objID, objIDmax);
+    }
+
+    ALLOCATE (objIDseq[i], int, objIDmax + 1);
+    for (j = 0; j < objIDmax + 1; j++) {
+      objIDseq[i][j] = -1;
+    }
+
+    for (j = 0; j < catalog[i].Naverage; j++) {
+      int objID = catalog[i].average[j].objID;
+      objIDseq[i][objID] = j;
+    }
+  }
+  return TRUE;
 }
+
+int catID_and_objID_to_seq (int catID, int objID, *catSeq, *objSeq) {
+
+  int cat = catIDseq[catID];
+  if (cat < 1) return FALSE;
+
+  int obj = objIDseq[cat][objID];
+  if (obj < 1) return FALSE;
+
+  *catSeq = cat;
+  *objSeq = obj;
+  return TRUE;
+}

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

@@ -3 +3 @@
 // we are sharing image calibrations mags for all images which (a) I own and (b) which have unowned detections
 
-// XXX Image vs Mosaic...
+# define D_NIMAGEMAGS 1000
 int share_image_mags (RegionHostTable *regionHosts, int nloop) {
 
-  Image *images = get_images (&Nimages);
+  Image *images = getimages (&Nimages, NULL);
 
+  off_t Nimage_mags = 0;
+  off_t NIMAGE_MAGS = D_NIMAGEMAGS;
+  
   ImageMag *image_mags = NULL;
   ALLOCATE (image_mags, ImageMag, NIMAGE_MAGS);
 
   for (i = 0; i < Nimages; i++) {
-    
-    // XXX do I need to test the center coordinates?
-
-    // does this object have missing detections (does someone else need it?)
-    // XXX : sky objects without missing detections
+    // XXX does this image have missing detections (does someone else need it?)
     if (imageExtra[i].Nmiss == 0) continue;
     
-    image_mags[Nimage_mags] = something(image[i]);
+    set_image_mags (&image_mags[Nimage_mags], &images[i]);
     Nimage_mags ++;
 
-    // check realloc..
+    CHECK_REALLOCATE (image_mags, ImageMag, NIMAGE_MAGS, Nimage_mags, D_NIMAGEMAGS);
   }
 
@@ -38 +37 @@
 }
 
-int slurp_image_mags (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop) {
+int slurp_image_mags (RegionHostTable *regionHosts, int nloop) {
 
+  Image *getimages (&Nimage, NULL);
+
+  int Nimage_mags = 0;
   ImageMag *image_mags = NULL;
-  ALLOCATE (image_mags, ImageMag, NIMAGE_MAGS);
+  ALLOCATE (image_mags, ImageMag, 1);
 
   for (i = 0; i < Nhost; i++) {
-    if (not_neighbor(host[i])) continue;
-    // XXX skip regions->hosts[i].hostID == REGION_HOST_ID
+    if (regionHosts->hosts.hostsID == REGION_HOST_ID) continue;
+    // XXX add neighbor check? : if (not_neighbor(host[i])) continue;
 
     check_imsync_file (regionHosts->hosts[i].hostname, nloop);
@@ -51 +53 @@
     char filename[1024];
     snprintf (filename, 1024, "%s/%s.imagemags.fits", CATDIR, regionHosts->hosts[i].hostname);
-    image_mags_subset = LoadImageMags (host[i], &Nsubset);
+    ImageMag *image_mags_subset = ImageMagLoad (host[i], &Nsubset);
 
     image_mags = merge_image_mags (image_mags, &Nimage_mags, image_mags_subset, Nsubset);
@@ -57 +59 @@
 
   for (i = 0; i < Nimage_mags; i++) {
-    seq = Image_ID_to_seq (image_mags[i].ID);
-    image[seq].mag = image_mags[i].mag;
+    seq = getImageByID (image_mags[i].ID);
+    if (seq < 0) {
+      // XXX is this a problem? (no, other hosts don't know which images I own)
+      continue;
+    }
+    image[seq].Mcal        = image_mags[i].Mcal;
+    image[seq].dMcal       = image_mags[i].dMcal;
+    image[seq].dMagSys     = image_mags[i].dMagSys;
+    image[seq].Xm          = image_mags[i].Xm;
+    image[seq].nFitPhotom  = image_mags[i].nFitPhotom;
+    image[seq].flags       = image_mags[i].flags;
+    image[seq].ubercalDist = image_mags[i].ubercalDist;
   }
 }
@@ -69 +81 @@
   sprintf (filename, "%s/%s.image.sync", CATDIR, hostname);
 
-  // XXX I need a rule to generate the filename for each host
   FILE *f = NULL; 
 
@@ -115 +126 @@
   return TRUE;
 }
+
+int clear_imsync_file (char *hostname) {
+
+  char filename[1024];
+  sprintf (filename, "%s/%s.image.sync", CATDIR, hostname);
+
+  // delete file contents
+  truncate (filename, 0);
+
+  return TRUE;
+}
+
+int set_image_mags (ImageMag *image_mags, Image *image) {
+
+  image_mags->M  = image->Mcal;
+
+  return TRUE;
+}
+
+ImageMag *merge_image_mags (ImageMag *target, int *ntarget, ImageMag *source, int Nsource) {
+
+  REALLOCATE (target, ImageMag, *ntarget + Nsource);
+  for (i = 0; i < Nsource; i++) {
+    int n = i + *ntarget;
+    target[n] = source[i];
+  }
+  
+  free (source);
+
+  *ntarget += Nsource;
+  return (target);
+}
+

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

@@ -80 +80 @@
 
     // set the mean mag
-    // XXX I need to figure out how to go from catID,objID to catSeq,objSeq
-    catSeq = catalog_ID_to_seq (catID);
-    objSeq = object_ID_to_seq (catID, objID);
+    if (!catID_and_objID_to_seq (catID, objID, &catSeq, &objSeq)) {
+        // XXX what should I do if this does not match?
+        continue;
+    }
 
     Nsecfit = photcode_to_secfilt (meanmags[i].photcode);
@@ -123 +124 @@
     return TRUE;
   }
+}
+
+int clear_sync_file (char *hostname) {
+
+  char filename[1024];
+  sprintf (filename, "%s/%s.meanmags.sync", CATDIR, hostname);
+
+  // delete file contents
+  truncate (filename, 0);
+
+  return TRUE;
 }