Changeset 37657

Timestamp:

Nov 21, 2014, 8:21:30 AM (12 years ago)

Author:

eugene

Message:

adding frame correction I/O stuff

Location:

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

Files:

• FrameCorrection.c (modified) (2 diffs)
• FrameCorrectionIO.c (added)
• ICRFobjIO.c (added)
• load_catalogs.c (modified) (1 diff)
• relastro_parallel_images.c (modified) (1 diff)
• share_icrf_obj.c (added)

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

@@ -1 +1 @@
 # include "relastro.h"
+
 int FrameCorrectionWriteImageSH (FrameCorrectionType *frame, char *filename, int raDirection);
 
@@ -15 +16 @@
 
 */
+
+FrameCorrectionSet *FrameCorrectionSetInit () {
+
+  FrameCorrectionSet *set = NULL;
+  ALLOCATE (set, FrameCorrectionType, 1);
+
+  set->frame = NULL;
+  set->map = NULL;
+  return set;
+}
+
+void FrameCorrectionSetFree (FrameCorrectionSet *set) {
+
+  if (!set) return;
+
+  FrameCorrectionFree(set->frame);
+  AstromOffsetMapFree (set->map);
+  free set;
+}
 
 FrameCorrectionType *FrameCorrectionInit (double scale) {

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

@@ -171 +171 @@
     if (FlagOutlier)   strextend (command, "-clip %d", CLIP_THRESH);
     if (ExcludeBogus)  strextend (command, "-exclude-bogus %f", ExcludeBogusRadius);
+    if (USE_ICRF_CORRECT) strextend (command, "-D USE_ICRF_CORRECT %d", USE_ICRF_CORRECT);
+    if (USE_GALAXY_MODEL) strextend (command, "-D USE_GALAXY_MODEL %d", USE_GALAXY_MODEL);
     
     if (DCR_BLUE_COLOR_POS && DCR_BLUE_COLOR_NEG) {

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

@@ -88 +88 @@
       for (i = 0; i < NLOOP; i++) {
         UpdateObjects (catalog, Ncatalog, (i > 0));
+        share_icrf_obj (catalog, Ncatalog, regionHosts, i); 
+        applyFrameCorr (catalog, Ncatalog, regionHosts, i); // read and apply the frame correction
         share_mean_pos (catalog, Ncatalog, regionHosts, i);
         // XXX FrameCorrection (catalog, Ncatalog); -- this needs to happen on the master machine?