Changeset 37694

Timestamp:

Nov 29, 2014, 3:29:29 AM (12 years ago)

Author:

eugene

Message:

delay frame correction until after 2 loops (if we are doing galaxy model correction)

Location:

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

Files:

• FrameCorrection.c (modified) (1 diff)
• relastro_parallel_images.c (modified) (1 diff)

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

@@ -21 +21 @@
   int i;
   for (i = 0; i < NLOOP; i++) {
-    ICRFobj *icrfobj = slurp_icrf_obj (regionHosts, i);
-    FrameCorrectionSet *set = FrameCorrectionMeasure (icrfobj);
-
-    char *filename = make_filename (CATDIR, "master", 0, "frame.corr.fits");
-    FrameCorrectionSetSave (filename, set);
-    free (filename);
-
-    char *syncfile = make_filename (CATDIR, "master", 0, "frame.corr.sync");
-    update_sync_file (syncfile, i);
-    free (syncfile);
+    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.
+
+      ICRFobj *icrfobj = slurp_icrf_obj (regionHosts, i);
+      FrameCorrectionSet *set = FrameCorrectionMeasure (icrfobj);
+      
+      char *filename = make_filename (CATDIR, "master", 0, "frame.corr.fits");
+      FrameCorrectionSetSave (filename, set);
+      free (filename);
+      
+      char *syncfile = make_filename (CATDIR, "master", 0, "frame.corr.sync");
+      update_sync_file (syncfile, i);
+      free (syncfile);
+    }
   }
 

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

@@ -104 +104 @@
       for (i = 0; i < NLOOP; i++) {
         UpdateObjects (catalog, Ncatalog, (i > 0));
-        FrameCorrectionParallelSlave (catalog, Ncatalog, regionHosts, i); 
+        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); 
+        }
         share_mean_pos (catalog, Ncatalog, regionHosts, i);
         slurp_mean_pos (catalog, Ncatalog, regionHosts, i);