Changeset 37665

Timestamp:

Nov 23, 2014, 9:37:13 AM (12 years ago)

Author:

eugene

Message:

fix measure & average object exchanges between region hosts

Location:

branches/eam_branches/ipp-20140904/Ohana/src/relastro

Files:

• Makefile (modified) (1 diff)
• include/relastro.h (modified) (4 diffs)
• src/ImageOps.c (modified) (2 diffs)
• src/MeasPosIO.c (added)
• src/launch_region_hosts.c (modified) (1 diff)
• src/markObjects.c (modified) (1 diff)
• src/relastro_parallel_images.c (modified) (3 diffs)
• src/relastro_parallel_regions.c (modified) (1 diff)
• src/share_images_pos.c (modified) (3 diffs)
• src/share_meas_pos.c (added)

branches/eam_branches/ipp-20140904/Ohana/src/relastro/Makefile

@@ -75 +75 @@
 $(SRC)/relastro_parallel_regions.$(ARCH).o \
 $(SRC)/MeanPosIO.$(ARCH).o \
+$(SRC)/MeasPosIO.$(ARCH).o \
 $(SRC)/share_mean_pos.$(ARCH).o \
+$(SRC)/share_meas_pos.$(ARCH).o \
 $(SRC)/share_images_pos.$(ARCH).o \
 $(SRC)/share_icrf_obj.$(ARCH).o \

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

@@ -34 +34 @@
 
 typedef struct {
-  float R;
-  float D;
+  double R;
+  double D;
   unsigned int objID;
   unsigned int catID;
 } MeanPos;
+
+typedef struct {
+  double R;
+  double D;
+  unsigned int objID;
+  unsigned int catID;
+  unsigned int imageID;
+} MeasPos;
 
 typedef struct {
@@ -451 +459 @@
 int setImageRaw (Catalog *catalog, int Ncatalog, off_t im, StarData *raw, off_t Nraw, CoordMode mode);
 off_t getImageByID (off_t ID);
+int updateImageRaw (Catalog *catalog, int Ncatalog, off_t im);
 
 Mosaic *getmosaics (off_t *N);
@@ -552 +561 @@
 MeanPos *MeanPosLoad(char *filename, off_t *nmeanpos);
 
+int share_meas_pos (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
+int slurp_meas_pos (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
+int set_meas_pos (MeasPos *measpos, Average *average, MeasureTiny *measure);
+MeasPos *merge_meas_pos (MeasPos *target, int *ntarget, MeasPos *source, int Nsource);
+
+int MeasPosSave(char *filename, MeasPos *measpos, off_t Nmeaspos);
+MeasPos *MeasPosLoad(char *filename, off_t *nmeaspos);
+
 int indexCatalogs (Catalog *catalog, int Ncatalog);
 int catID_and_objID_to_seq (int catID, int objID, int *catSeq, off_t *objSeq);
@@ -561 +578 @@
 
 int share_image_pos (RegionHostTable *regionHosts, int nloop);
-int slurp_image_pos (RegionHostTable *regionHosts, int nloop);
+int slurp_image_pos (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop);
 ImagePos *merge_image_pos (ImagePos *target, int *ntarget, ImagePos *source, int Nsource);
 int set_image_pos (ImagePos *image_pos, Image *image);

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

@@ -251 +251 @@
     return;
   }
+  measure->myDet = TRUE; // I 'own' this detection (I am calibrating its image)
 
   // index for (catalog, measure) -> image
@@ -906 +907 @@
       catalog[c].measure[m].R = raw[i].R;
       catalog[c].measure[m].D = raw[i].D;
+    }      
+  }
+  return TRUE;
+}
+
+// return StarData values for detections in the specified image, converting coordinates from the
+// chip positions: X,Y -> L,M -> P,Q -> R,D.  This function is used by the image fitting steps, for
+// which the detections have already been filtered when they were loaded (bcatalog)
+int updateImageRaw (Catalog *catalog, int Ncatalog, off_t im) {
+
+  off_t i, m, c;
+
+  for (i = 0; i < N_onImage[im]; i++) {
+    m = ImageToMeasure[im][i];
+    c = ImageToCatalog[im][i];
+
+    MeasureTiny *measure = &catalog[c].measureT[m];
+
+    /* apply the current image transformation or use the current value of R+dR, D+dD? */
+    double X = measure[0].Xccd;
+    double Y = measure[0].Yccd;
+    if (USE_FIXED_PIXCOORDS) {
+      if (isfinite(measure[0].Xfix) && isfinite(measure[0].Yfix)) {
+        float dX = measure[0].Xfix - measure[0].Xccd;
+        float dY = measure[0].Yfix - measure[0].Yccd;
+        if (hypot(dX,dY) < 2.0) {
+          X = measure[0].Xfix;
+          Y = measure[0].Yfix;
+        } 
+      }
+    }
+
+    double R, D;
+    XY_to_RD (&R, &D, X, Y, &image[im].coords);
+    measure->R = R;
+    measure->D = D;
+    if (catalog[c].measure) {
+      catalog[c].measure[m].R = R;
+      catalog[c].measure[m].D = D;
     }      
   }

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

@@ -8 +8 @@
   // clear the I/O files
   for (i = 0; i < regionHosts->Nhosts; i++) {
-    char *syncfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.sync");
-    if (truncate (syncfile, 0)) fprintf (stderr, "trouble clearing syncfile %s\n", syncfile);
-    free (syncfile);
-
-    char *fitsfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.fits");
-    if (truncate (fitsfile, 0)) fprintf (stderr, "trouble clearing fitsfile %s\n", fitsfile);
-    free (fitsfile);
+    char *meansync = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.sync");
+    if (truncate (meansync, 0)) fprintf (stderr, "trouble clearing meansync %s\n", meansync);
+    free (meansync);
+
+    char *meanfits = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "meanpos.fits");
+    if (truncate (meanfits, 0)) fprintf (stderr, "trouble clearing meanfits %s\n", meanfits);
+    free (meanfits);
+
+    char *meassync = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "measpos.sync");
+    if (truncate (meassync, 0)) fprintf (stderr, "trouble clearing meassync %s\n", meassync);
+    free (meassync);
+
+    char *measfits = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "measpos.fits");
+    if (truncate (measfits, 0)) fprintf (stderr, "trouble clearing measfits %s\n", measfits);
+    free (measfits);
 
     char *icrfsync = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "icrfobj.sync");

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

@@ -14 +14 @@
       int m = catalog[i].average[j].measureOffset;
       for (n = 0; n < catalog[i].average[j].Nmeasure; n++) {
-        if (!catalog[i].measureT[m+n].myDet) continue;
-        nOwn ++;
+        // this is a detection I own (it is on one of my images)
+        if (catalog[i].measureT[m+n].myDet) {
+          nOwn ++;
+          continue;
+        }
+        // 2MASS detections are counted as 'owned' (I completely control this object is nOwn_t == Nmeasure; no sharing needed)
+        if ((catalog[i].measureT[m+n].photcode == 2011) || 
+            (catalog[i].measureT[m+n].photcode == 2012) || 
+            (catalog[i].measureT[m+n].photcode == 2013)) {
+          nOwn ++;
+          continue;
+        }
       }
       catalog[i].nOwn_t[j] = nOwn;

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

@@ -99 +99 @@
         UpdateSimple (catalog, Ncatalog);
         share_image_pos (regionHosts, i);
-        slurp_image_pos (regionHosts, i);
+        slurp_image_pos (catalog, Ncatalog, regionHosts, i);
       }
       break;
@@ -112 +112 @@
         UpdateChips (catalog, Ncatalog);
         share_image_pos (regionHosts, i);
-        slurp_image_pos (regionHosts, i);
+        slurp_image_pos (catalog, Ncatalog, regionHosts, i);
+        share_meas_pos (catalog, Ncatalog, regionHosts, i);
+        slurp_meas_pos (catalog, Ncatalog, regionHosts, i);
         MARKTIME("update chips: %f sec\n", dtime);
       }
@@ -126 +128 @@
         UpdateMosaic (catalog, Ncatalog);
         share_image_pos (regionHosts, i);
-        slurp_image_pos (regionHosts, i);
+        slurp_image_pos (catalog, Ncatalog, regionHosts, i);
       }
       break;

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

@@ -49 +49 @@
 
   // retrieve updated image parameters from the remote hosts (also set Image.mcal)
-  if (!slurp_image_pos (regionHosts, -1)) Shutdown ("error loading image updates");
+  if (!slurp_image_pos (NULL, 0, regionHosts, -1)) Shutdown ("error loading image updates");
 
   if (!UPDATE) { 

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

@@ -51 +51 @@
 }
 
-int slurp_image_pos (RegionHostTable *regionHosts, int nloop) {
+int slurp_image_pos (Catalog *catalog, int Ncatalog, RegionHostTable *regionHosts, int nloop) {
 
   off_t Nimage, i, j;
@@ -91 +91 @@
     images[seq].flags      = image_pos[i].flags     ;
   }
-  free (image_pos);
 
   // load the astrometry offset maps, if they exist, and apply 
@@ -113 +112 @@
     }
   }
+
+  // apply the modified image parameters to my detections
+  for (i = 0; FALSE && (Ncatalog > 0) && (i < Nimage_pos); i++) {
+    off_t seq = getImageByID (image_pos[i].imageID);
+    if (seq < 0) continue;
+    updateImageRaw (catalog, Ncatalog, seq);
+  }
+  free (image_pos);
+
   fprintf (stderr, "DONE grabbing image mags from other hosts\n");