Changeset 37664

Timestamp:

Nov 23, 2014, 5:04:15 AM (12 years ago)

Author:

eugene

Message:

pass chip astrom map back and forth in region host mode

Location:

branches/eam_branches/ipp-20140904/Ohana/src

Files:

• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/include/libdvo_astro.h (modified) (1 diff)
• libdvo/src/AstromOffsetMapUtils.c (modified) (1 diff)
• libdvo/src/RegionHostTable.c (modified) (1 diff)
• relastro/include/relastro.h (modified) (1 diff)
• relastro/src/assign_images.c (modified) (2 diffs)
• relastro/src/launch_region_hosts.c (modified) (1 diff)
• relastro/src/share_images_pos.c (modified) (4 diffs)
• relphot/src/ImageTable.c (modified) (1 diff)

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

@@ -306 +306 @@
   Image *image;
   off_t *imseq;
+
+  AstromOffsetTable *astromTable;
 
   int *neighbors;             // list of neighbor index values

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/libdvo_astro.h

@@ -173 +173 @@
 AstromOffsetTable *AstromOffsetTableInit();
 void AstromOffsetTableFree(AstromOffsetTable *table);
+int AstromOffsetTableAddMapFromImage (AstromOffsetTable *table, Image *image);
 
 # endif

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/AstromOffsetMapUtils.c

@@ -122 +122 @@
 }
 
+int AstromOffsetTableAddMapFromImage (AstromOffsetTable *table, Image *image) {
+
+  int Nmap = table->Nmap;
+
+  table->Nmap++;
+  REALLOCATE (table->map, AstromOffsetMap *, table->Nmap);
+
+  // find the imageID and update the IDtoSeq allocation if needed
+  off_t i;
+  if (image->imageID > table->MaxImageID) {
+    int oldMaxID = table->MaxImageID;
+    table->MaxImageID = image->imageID;
+    REALLOCATE (table->IDtoSeq, int, table->MaxImageID + 1);
+    for (i = oldMaxID + 1; i < table->MaxImageID + 1; i++) {
+      table->IDtoSeq[i] = -1;
+    }
+  }
+  myAssert (table->IDtoSeq[image->imageID] == -1, "table IDtoSeq not initiazed or image collision");
+  table->IDtoSeq[image->imageID] = Nmap;
+  
+  table->map[Nmap] = image[0].coords.offsetMap;
+  return TRUE;    
+}
+
 AstromOffsetTable *AstromOffsetTableInit() {
 

branches/eam_branches/ipp-20140904/Ohana/src/libdvo/src/RegionHostTable.c

@@ -31 +31 @@
     hosts[i].Nneighbors = 0;
     hosts[i].isNeighbor = FALSE;
+
+    hosts[i].astromTable = NULL;
   }
   return;

branches/eam_branches/ipp-20140904/Ohana/src/relastro/include/relastro.h

@@ -583 +583 @@
 int save_astrom_table ();
 AstromOffsetTable *get_astrom_table ();
+void put_astrom_table (AstromOffsetTable *myTable);
 
 int fit_map (AstromOffsetMap *map, StarData *raw, StarData *ref, int Npts);

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/assign_images.c

@@ -23 +23 @@
   BuildChipMatch (image, Nimage);
   MARKTIME("build chip match for %d images: %f sec\n", (int) Nimage, dtime);
+
+  char mapfile[DVO_MAX_PATH];
+  snprintf (mapfile, DVO_MAX_PATH, "%s/AstroMap.fits", CATDIR);
+  AstromOffsetTable *table = AstromOffsetMapLoad (mapfile, VERBOSE);
+
+  // assign images.coords.offsetMap -> table->map[i]
+  if (table) {
+    AstromOffsetTableMatchChips (image, Nimage, table);
+  } else {
+    table = AstromOffsetTableInit ();
+  }
+  put_astrom_table (table);
 
   initMosaics (image, Nimage);
@@ -160 +172 @@
         host->astromTable = AstromOffsetTableInit();
       }
-      AstromOffsetTableAddMapFromImage(host->astromTable, image[j]);
+      AstromOffsetTableAddMapFromImage(host->astromTable, &image[j]);
     }
   }

branches/eam_branches/ipp-20140904/Ohana/src/relastro/src/launch_region_hosts.c

@@ -66 +66 @@
 
       // write the image subset for this host
-      AstromOffsetMapTableSave (host->astromTable, mapname);
+      AstromOffsetMapSave (host->astromTable, mapname);
     }
 

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

@@ -41 +41 @@
     
     // write the image subset for this host
-    AstromOffsetMapTableSave (table, mapname);
+    AstromOffsetMapSave (table, mapname);
   }
 
@@ -53 +53 @@
 int slurp_image_pos (RegionHostTable *regionHosts, int nloop) {
 
-  off_t Nimage, i;
+  off_t Nimage, i, j;
   Image *images = getimages (&Nimage, NULL);
 
@@ -95 +95 @@
   // load the astrometry offset maps, if they exist, and apply 
   for (i = 0; i < regionHosts->Nhosts; i++) {
+    if (regionHosts->hosts[i].hostID == REGION_HOST_ID) continue;
+    if (REGION_HOST_ID && !regionHosts->hosts[i].isNeighbor) continue;
+
     char mapname[1024];
     snprintf (mapname, 1024, "%s/AstroMapUpdate.%d.fits", CATDIR, regionHosts->hosts[i].hostID);
@@ -103 +106 @@
     for (j = 0; j < table->Nmap; j++) {
       off_t seq = getImageByID (table->map[j][0].imageID);
+      // I do not necessarily own all images listed in the table.  skip if not found
+      if (seq < 0) continue;
+
       images[seq].coords.offsetMap = table->map[j];
       // is this sufficient?

branches/eam_branches/ipp-20140904/Ohana/src/relphot/src/ImageTable.c

@@ -32 +32 @@
   }
 
-  // XXX do not make the chip match -- we have not loaded the PHU entries
+  // XXX do not make the chip match -- we have not loaded the PHU entries (and do not need them here)
   // BuildChipMatch (image, Nimage);