Changeset 11742 for trunk/Ohana/src/relastro

Timestamp:

Feb 11, 2007, 11:55:41 AM (19 years ago)

Author:

eugene

Message:

working on relastro

Location:

trunk/Ohana/src/relastro

Files:

• doc/notes.txt (modified) (1 diff)
• src/UpdateImages.c (added)
• src/UpdateObjects.c (added)
• src/args.c (modified) (1 diff)
• src/relastro.c (modified) (3 diffs)

trunk/Ohana/src/relastro/doc/notes.txt

@@ -1 +1 @@
 
-2006.04.08 : relphot contemplations
+2007.02.11
+
+  relastro major modes:
+
+  - update the astrometry of objects in the images
+    - load objects within a region
+    - foreach object
+      - calculate average R,D
+      - update db tables (dR, dD)
+    - include external trends
+      - parallax factor
+      - atm trends
+
+  - update the astrometric parameters of images
+    - use the average R,D for objects, update image terms
+    * include external refs with adjustable weighting
+
+  - image parameter smoothing
+
+  - simultaneous fit of objects and images
+    - identify parameters to constrain
+    - limited number of internal objects?
+
+
+2006.04.08 : relastro contemplations
 
 relastro will perform the astrometry equivalent to relphot.  For

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

@@ -171 +171 @@
     remove_argument (N, &argc, argv);
     ImagSelect = TRUE;
+  }
+
+  /* possible operations */
+  UpdateObjects = FALSE;
+  if ((N = get_argument (argc, argv, "-update-objects"))) {
+    remove_argument (N, &argc, argv);
+    UpdateObjects = TRUE;
+  }
+  UpdateImages = FALSE;
+  if ((N = get_argument (argc, argv, "-update-images"))) {
+    remove_argument (N, &argc, argv);
+    UpdateImages = TRUE;
   }
 

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

@@ -1 @@
-# include "relphot.h"
+# include "relastro.h"
 
 int main (int argc, char **argv) {
@@ -50 +50 @@
   }
 
-  /* determine fit values */
-  for (i = 0; i < NLOOP; i++) {
-    setMrel  (catalog, Ncatalog);
-    setMcal  (catalog, FALSE);
-    setMmos  (catalog, FALSE);
-    setMgrid (catalog);
-    
-    if (PLOTSTUFF) {
+  /* major modes */
+  if (UpdateObjects) {
+    UpdateObjects (catalog, Ncatalog);
+  }
+  if (UpdateImages) {
+    UpdateImages (catalog, Ncatalog);
+  }
+
+  /* put these types of functions inside the update functions
       plot_scatter (catalog, Ncatalog); 
       plot_grid (catalog); 
@@ -64 +65 @@
       plot_stars (catalog, Ncatalog);
       plot_chisq (catalog, Ncatalog);
-    }
-    if ((i == 1) || (i == 5) || (i ==  9) || (i == 13)) clean_measures (catalog, Ncatalog, FALSE); 
-    if ((i == 2) || (i == 6) || (i == 10) || (i == 14)) clean_stars (catalog, Ncatalog);
-    if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_mosaics (catalog, Ncatalog);
-    if ((i == 4) || (i == 8) || (i == 12) || (i == 16)) clean_images ();
-    global_stats (catalog, Ncatalog);
-  }
+  */
 
-  SAVEPLOT = TRUE;
-  plot_scatter (catalog, Ncatalog); 
-  plot_grid (catalog); 
-  plot_mosaics ();
-  plot_images ();
-  plot_stars (catalog, Ncatalog);
-  plot_chisq (catalog, Ncatalog);
-
-  if (USE_GRID) dump_grid ();
   if (!UPDATE) exit (0);
 
-  /* set Mcal & Mmos for bad images */
-  setMcal  (catalog, TRUE);
-  setMmos  (catalog, TRUE);
-
-  /* at this point, we have correct cal coeffs in the image/mosaic structures */
-  for (i = 0; i < Ncatalog; i++) dvo_catalog_free (&catalog[i]);
-  freeImageBins (Ncatalog);
-  freeMosaicBins (Ncatalog);
-  freeGridBins (Ncatalog);
-
-  /* load catalog data from region files, update Mrel include all data */
-  reload_catalogs (skylist);
-  setMcalFinal ();
+  /* need to figure out how to update images, etc */
   dvo_image_update (&db, VERBOSE);
   dvo_image_unlock (&db);