Changeset 40382

Timestamp:

Apr 8, 2018, 11:09:06 AM (8 years ago)

Author:

eugene

Message:

add new option to fit astrometry for stacks (previously relastro only measured the systematic floor)

Location:

trunk/Ohana/src/relastro

Files:

• Makefile (modified) (1 diff)
• include/relastro.h (modified) (2 diffs)
• src/UpdateStacksWithFit.c (added)
• src/args.c (modified) (1 diff)
• src/relastro_images.c (modified) (1 diff)
• src/relastro_parallel_images.c (modified) (1 diff)

trunk/Ohana/src/relastro/Makefile

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

trunk/Ohana/src/relastro/include/relastro.h

@@ -367 +367 @@
 int    USE_ICRF_POLE;
 
+int    FIT_STACKS;
 int    REPAIR_STACKS;
 int    USE_IMAGE_COORDS_FOR_REPAIR;
@@ -623 +624 @@
 int UpdateChips (Catalog *catalog, int Ncatalog, int Nloop);
 int UpdateStacks (Catalog *catalog, int Ncatalog);
+int UpdateStacksWithFit (Catalog *catalog, int Ncatalog);
 int UpdateMosaic (Catalog *catalog, int Ncatalog);
 int UpdateMeasures (Catalog *catalog, int Ncatalog);

trunk/Ohana/src/relastro/src/args.c

@@ -861 +861 @@
     remove_argument (N, &argc, argv);
     RELASTRO_OP = OP_REPAIR_WARPS;
+  }
+
+  // the default is to only measure the scatter for the stacks, not to perform a new fit
+  FIT_STACKS = FALSE;
+  if ((N = get_argument (argc, argv, "-fit-stacks"))) {
+    remove_argument (N, &argc, argv);
+    FIT_STACKS = TRUE;
   }
 

trunk/Ohana/src/relastro/src/relastro_images.c

@@ -87 +87 @@
       }
 
-      // measure scatter for stacks
-      UpdateStacks (catalog, Ncatalog);
+      if (FIT_STACKS) {
+        // model astrometry for stacks
+        UpdateStacksWithFit (catalog, Ncatalog);
+      } else {
+        // measure scatter for stacks
+        UpdateStacks (catalog, Ncatalog);
+      }
       MARKTIME("UpdateStacks: %f sec\n", dtime);
 

trunk/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -150 +150 @@
       }
 
-      // measure scatter for stacks
-      UpdateStacks (catalog, Ncatalog);
+      if (FIT_STACKS) {
+        // model astrometry for stacks
+        UpdateStacksWithFit (catalog, Ncatalog);
+      } else {
+        // measure scatter for stacks
+        UpdateStacks (catalog, Ncatalog);
+      }
       LOGRTIME("UpdateStacks on %s, host %d: %f sec\n", myHostName, REGION_HOST_ID, dtime);