Changeset 39432

Timestamp:

Mar 4, 2016, 1:51:25 PM (10 years ago)

Author:

eugene

Message:

skip warp detections for bcatalog (we do not calibration warp images); add a measurement of the stack systematic floor; apply the MeasPos information for each file as they are loaded (rather than accumulate)

Location:

branches/eam_branches/ohana.20160226/src/relastro

Files:

• Makefile (modified) (1 diff)
• include/relastro.h (modified) (1 diff)
• src/ImageOps.c (modified) (1 diff)
• src/UpdateMeasures.c (modified) (1 diff)
• src/UpdateStacks.c (added)
• src/bcatalog.c (modified) (1 diff)
• src/relastro_parallel_images.c (modified) (1 diff)
• src/share_meas_pos.c (modified) (2 diffs)

branches/eam_branches/ohana.20160226/src/relastro/Makefile

@@ -41 +41 @@
 $(SRC)/Shutdown.$(ARCH).o            \
 $(SRC)/UpdateChips.$(ARCH).o         \
+$(SRC)/UpdateStacks.$(ARCH).o         \
 $(SRC)/UpdateMosaic.$(ARCH).o        \
 $(SRC)/UpdateObjects.$(ARCH).o       \

branches/eam_branches/ohana.20160226/src/relastro/include/relastro.h

@@ -528 +528 @@
 int UpdateSimple (Catalog *catalog, int Ncatalog);
 int UpdateChips (Catalog *catalog, int Ncatalog, int Nloop);
+int UpdateStacks (Catalog *catalog, int Ncatalog);
 int UpdateMosaic (Catalog *catalog, int Ncatalog);
 int UpdateMeasures (Catalog *catalog, int Ncatalog);

branches/eam_branches/ohana.20160226/src/relastro/src/ImageOps.c

@@ -1 +1 @@
 # include "relastro.h"
-int isGPC1chip (int photcode);
 
 # define USE_IMAGE_ID 1

branches/eam_branches/ohana.20160226/src/relastro/src/UpdateMeasures.c

@@ -71 +71 @@
 
       double dR = 3600.0*fabs(csdec*(oldR - R));
-      double dD = 3600.0*fabs(oldD - R);
+      double dD = 3600.0*fabs(oldD - D);
 
       // complain if the new location is far from the old location

branches/eam_branches/ohana.20160226/src/relastro/src/bcatalog.c

@@ -184 +184 @@
       offset = catalog[0].average[i].measureOffset + j;
       
+      // we do not measure astrometry for the warps, so skip:
+      if (isGPC1warp(catalog[0].measure[offset].photcode)) continue;
+
       // filter objects based on user supplied criteria, including SIGMA_LIM
       if (!MeasFilterTest(&catalog[0].measure[offset], TRUE)) {

branches/eam_branches/ohana.20160226/src/relastro/src/relastro_parallel_images.c

@@ -141 +141 @@
         LOGRTIME("slurp_meas_pos loop %d on %s, host %d: %f sec\n", i, myHostName, REGION_HOST_ID, dtime);
       }
+
+      // measure scatter for stacks
+      UpdateStacks (catalog, Ncatalog);
+      LOGRTIME("UpdateStacks on %s, host %d: %f sec\n", myHostName, REGION_HOST_ID, dtime);
+
       // create summary plots of the process
       // relastroVisualSummaryChips();

branches/eam_branches/ohana.20160226/src/relastro/src/share_meas_pos.c

@@ -58 +58 @@
   off_t i, k;
 
-  int Nmeaspos = 0;
-  MeasPos *measpos = NULL;
-  ALLOCATE (measpos, MeasPos, 1);
-
   fprintf (stderr, "grabbing meas object pos from other hosts...\n");
 
@@ -78 +74 @@
     LOGRTIME("meas_load_sync host %d loop %d on %s, host %d: %f sec\n", i, nloop, myHostName, REGION_HOST_ID, dtime);
     
-    off_t Nsubset = 0;
+    off_t Nmeaspos = 0;
     char *posfile = make_filename (CATDIR, regionHosts->hosts[i].hostname, regionHosts->hosts[i].hostID, "measpos.fits");
-    MeasPos *measposSubset = MeasPosLoad (posfile, &Nsubset);
+    MeasPos *measpos = MeasPosLoad (posfile, &Nmeaspos);
     free (posfile);
     LOGRTIME("MeasPosLoad host %d loop %d on %s, host %d: %f sec\n", i, nloop, myHostName, REGION_HOST_ID, dtime);
 
-    // merge_meas_pos reallocs measpos and frees the input measposSubset
-    measpos = merge_meas_pos (measpos, &Nmeaspos, measposSubset, Nsubset);
-    LOGRTIME("merge_meas_pos host %d loop %d on %s, host %d: %f sec\n", i, nloop, myHostName, REGION_HOST_ID, dtime);
+    // apply the loaded measurement positions:
+    for (off_t j = 0; j < Nmeaspos; j++) {
+      int objID = measpos[j].objID;
+      int catID = measpos[j].catID;
+
+      // set the meas mag
+      int catSeq;
+      off_t objSeq;
+      if (!catID_and_objID_to_seq (catID, objID, &catSeq, &objSeq)) {
+        // XXX what should I do if this does not match?
+        continue;
+      }
+      myAssert (catSeq < Ncatalog, "oops");
+
+      off_t m = catalog[catSeq].average[objSeq].measureOffset;
+      for (k = 0; k < catalog[catSeq].average[objSeq].Nmeasure; k++, m++) {
+        if (catalog[catSeq].measureT[m].imageID != measpos[j].imageID) continue;
+        catalog[catSeq].measureT[m].R = measpos[j].R;
+        catalog[catSeq].measureT[m].D = measpos[j].D;
+        if (catalog[catSeq].measure) {
+          catalog[catSeq].measure[m].R = measpos[j].R;
+          catalog[catSeq].measure[m].D = measpos[j].D;
+        }
+      }
+    }
+    free (measpos);
+    LOGRTIME("match_catID_and_objID/meas loop %d on %s, host %d: %f sec\n", nloop, myHostName, REGION_HOST_ID, dtime);
   }
   LOGRTIME("meas_load_done loop %d on %s, host %d: %f sec\n", nloop, myHostName, REGION_HOST_ID, dtime);
-
-  for (i = 0; i < Nmeaspos; i++) {
-    int objID = measpos[i].objID;
-    int catID = measpos[i].catID;
-
-    // set the meas mag
-    int catSeq;
-    off_t objSeq;
-    if (!catID_and_objID_to_seq (catID, objID, &catSeq, &objSeq)) {
-        // XXX what should I do if this does not match?
-        continue;
-    }
-    myAssert (catSeq < Ncatalog, "oops");
-
-    off_t m = catalog[catSeq].average[objSeq].measureOffset;
-    for (k = 0; k < catalog[catSeq].average[objSeq].Nmeasure; k++, m++) {
-      if (catalog[catSeq].measureT[m].imageID != measpos[i].imageID) continue;
-      catalog[catSeq].measureT[m].R = measpos[i].R;
-      catalog[catSeq].measureT[m].D = measpos[i].D;
-      if (catalog[catSeq].measure) {
-        catalog[catSeq].measure[m].R = measpos[i].R;
-        catalog[catSeq].measure[m].D = measpos[i].D;
-      }
-    }
-  }
-  free (measpos);
-  LOGRTIME("match_catID_and_objID/meas loop %d on %s, host %d: %f sec\n", nloop, myHostName, REGION_HOST_ID, dtime);
 
   fprintf (stderr, "DONE grabbing meas object pos from other hosts...\n");