Changeset 37631

Timestamp:

Nov 18, 2014, 8:23:10 PM (12 years ago)

Author:

eugene

Message:

tweaks on the galaxy model

Location:

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

Files:

• ImageOps.c (modified) (1 diff)
• UpdateChips.c (modified) (1 diff)
• UpdateObjectOffsets.c (modified) (1 diff)
• UpdateObjects.c (modified) (1 diff)
• relastro_images.c (modified) (1 diff)

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

@@ -814 +814 @@
     ref[i].D = catalog[c].average[n].D;
 
-    // XXX subtract off dR,dD GAL here
+    // if we are correcting for the Galaxy Motion Model, we assume the mean R,D is at the J2000 epoch position
     if (USE_GALAXY_MODEL) {
       myAssert (!isnan(measure[0].RoffGAL), "oops");

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

@@ -141 +141 @@
     // apply the modified R,D back to the measures
     setImageRaw (catalog, Ncatalog, i, raw, Nraw, MODE_MOSAIC);
+    if (USE_GALAXY_MODEL) {
+      image[i].flags |= ID_IMAGE_ASTROM_GMM;
+    }
 
     saveCenter (image, &Ro[i], &Do[i], i);

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

@@ -59 +59 @@
 
     // uses MeasureTiny values, but will also update Measure values when populated
-    UpdateObjects (&catalog, 1, 0);
+    // if Galaxy Motion Model correction is active, do not apply at this last stage 
+    UpdateObjects (&catalog, 1, FALSE);
 
     free_tiny_values(&catalog);

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

@@ -209 +209 @@
     double Di = getMeanD (&measure[k], average, secfilt);
 
-    if (USE_GALAXY_MODEL && (Nloop > 0)) {
+    // if we are correcting for the Galaxy Motion Model, only should apply it here 
+    // (a) when we are working to correct the images (mean R,D assumed to be at J2000) and
+    // (b) if we think the measure R,D is already at the image epoch position
+    if (USE_GALAXY_MODEL && applyGalaxyOffset) {
       Ri -= measure[k].RoffGAL / 3600.0;
       Di -= measure[k].DoffGAL / 3600.0;

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

@@ -73 +73 @@
       for (i = 0; i < NLOOP; i++) {
         // XXX is is really possible that I do not update the measure.R,D on each loop?? 
-        UpdateObjects (catalog, Ncatalog, i); // calculate <R>,<D>
+        UpdateObjects (catalog, Ncatalog, (i > 0)); // calculate <R>,<D>; if (i > 0), apply Galaxy Motion Model (if desired)
         FrameCorrection (catalog, Ncatalog);
         // if (i > 2) FrameCorrection (catalog, Ncatalog);