Changeset 38664

Timestamp:

Aug 5, 2015, 9:18:16 AM (11 years ago)

Author:

eugene

Message:

do not apply frame correction

Location:

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

Files:

• UpdateChips.c (modified) (1 diff)
• relastro_images.c (modified) (1 diff)
• relastro_parallel_images.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/UpdateChips.c

@@ -148 +148 @@
     setImageRaw (catalog, Ncatalog, i, raw, Nraw, MODE_MOSAIC);
     if (USE_GALAXY_MODEL) {
+      // XXX DEPRECATE?
       image[i].flags |= ID_IMAGE_ASTROM_GMM;
     }

branches/eam_branches/ipp-20150625/Ohana/src/relastro/src/relastro_images.c

@@ -74 +74 @@
       for (i = 0; i < NLOOP; i++) {
         UpdateObjects (catalog, Ncatalog, (i > 0)); // calculate <R>,<D>; if (i > 0), apply Galaxy Motion Model (if desired)
-        if ((i > 1) || !USE_GALAXY_MODEL) {
-          // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
-          // applied the galaxy model a couple of times.
-          FrameCorrectionSerial (catalog, Ncatalog);
-        }
         UpdateChips (catalog, Ncatalog);   // measure.X,Y -> R,D, fit image.coords
         MARKTIME("update chips: %f sec\n", dtime);

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

@@ -122 +122 @@
         UpdateObjects (catalog, Ncatalog, (i > 0));
         LOGRTIME("UpdateObjects loop %d on %s, host %d: %f sec\n", i, myHostName, REGION_HOST_ID, dtime);
-        if ((i > 1) || !USE_GALAXY_MODEL) {
-          // if GALAXY_MODEL is selected, we want to delay the frame correction until we have 
-          // applied the galaxy model a couple of times.
-          FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
-          LOGRTIME("FrameCorrection loop %d on %s, host %d: %f sec\n", i, myHostName, REGION_HOST_ID, dtime);
-        }
+
         share_mean_pos (catalog, Ncatalog, regionHosts, i);
         LOGRTIME("share_mean_pos loop %d on %s, host %d: %f sec\n", i, myHostName, REGION_HOST_ID, dtime);