Changeset 38282

Timestamp:

May 16, 2015, 5:32:17 AM (11 years ago)

Author:

eugene

Message:

add bisection func to libohana; add tycho correction code to setastrom

Location:

branches/eam_branches/ipp-20150419/Ohana/src

Files:

• libohana/Makefile (modified) (1 diff)
• libohana/include/ohana.h (modified) (1 diff)
• libohana/src/bisection.c (added)
• opihi/cmd.data/Makefile (modified) (1 diff)
• opihi/cmd.data/bisection.c (added)
• opihi/cmd.data/init.c (modified) (3 diffs)
• uniphot/include/setastrom.h (modified) (1 diff)
• uniphot/src/initialize_setastrom.c (modified) (6 diffs)
• uniphot/src/repair_tycho_setastrom.c (added)
• uniphot/src/setastrom.c (modified) (1 diff)
• uniphot/src/tyc_correction.c (added)
• uniphot/src/update_dvo_setastrom.c (modified) (2 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/libohana/Makefile

@@ -30 +30 @@
 $(SRC)/ohana_allocate.$(ARCH).o  \
 $(SRC)/sorts.$(ARCH).o           \
+$(SRC)/bisection.$(ARCH).o               \
 $(SRC)/string.$(ARCH).o          \
 $(SRC)/findexec.$(ARCH).o        \

branches/eam_branches/ipp-20150419/Ohana/src/libohana/include/ohana.h

@@ -478 +478 @@
 void VSHtermsForLM (VSHterms *terms, double R, double D, int l, int m);
 
-# endif
+/* in bisection.c */
+int ohana_bisection_double (double *values, int Nvalues, double threshold);
+
+# endif

branches/eam_branches/ipp-20150419/Ohana/src/opihi/cmd.data/Makefile

@@ -25 +25 @@
 $(SRC)/book.$(ARCH).o           \
 $(SRC)/book_commands.$(ARCH).o  \
+$(SRC)/bisection.$(ARCH).o              \
 $(SRC)/cast.$(ARCH).o           \
 $(SRC)/center.$(ARCH).o \

branches/eam_branches/ipp-20150419/Ohana/src/opihi/cmd.data/init.c

@@ -9 +9 @@
 int box              PROTO((int, char **));
 int book_command     PROTO((int, char **));
+int bisection        PROTO((int, char **));
 int center           PROTO((int, char **));
-int parity           PROTO((int, char **));
 int cast             PROTO((int, char **));
 int circstats        PROTO((int, char **));
@@ -89 +89 @@
 int plot             PROTO((int, char **));
 int dot              PROTO((int, char **));
+int parity           PROTO((int, char **));
 int point            PROTO((int, char **));
 int ps               PROTO((int, char **));
@@ -175 +176 @@
   {1, "applyfit2d",   applyfit2d,       "apply 2-d fit to new vector"},
   {1, "applyfit3d",   applyfit3d,       "apply 3-d fit to new vector"},
+  {1, "bisection",    bisection,        "use bisection to find threshold in vector"},
   {1, "book",         book_command,     "commands to manipulate book/page/word data"},
   {1, "box",          box,              "draw a box on the plot"},

branches/eam_branches/ipp-20150419/Ohana/src/uniphot/include/setastrom.h

@@ -49 +49 @@
 char        *DCR_FILE;
 char        *CAM_FILE;
+char        *TYC_FILE;
 
 int          KH_RESET;
 int          DCR_RESET;
 int          CAM_RESET;
+int          TYC_RESET;
 
 SkyRegion    UserPatch;

branches/eam_branches/ipp-20150419/Ohana/src/uniphot/src/initialize_setastrom.c

@@ -7 +7 @@
     fprintf (stderr, "    -DCR (file) : supply DCR correction splines\n");
     fprintf (stderr, "    -CAM (file) : supply camera-static correction file\n");
+    fprintf (stderr, "    -TYC (file) : supply tycho-fix file (no pm stars)\n");
     fprintf (stderr, "    -v : verbose mode\n");
     fprintf (stderr, "    -region Rmin Rmax Dmin Dmax\n");
@@ -91 +92 @@
   }
 
+  TYC_FILE = NULL;
+  if ((N = get_argument (argc, argv, "-TYC"))) {
+    remove_argument (N, &argc, argv);
+    char *tmpfile = strcreate (argv[N]);
+    TYC_FILE = abspath (tmpfile, DVO_MAX_PATH);
+    remove_argument (N, &argc, argv);
+  }
+  TYC_RESET = FALSE;
+  if ((N = get_argument (argc, argv, "-TYC-reset"))) {
+    remove_argument (N, &argc, argv);
+    TYC_RESET = TRUE;
+  }
+
   SINGLE_CPT = NULL;
   if ((N = get_argument (argc, argv, "-cpt"))) {
@@ -160 +174 @@
   }
 
-  if (!KH_FILE && !DCR_FILE && !CAM_FILE) {
-    fprintf (stderr, "WARNING: none of -CAM, -KH, -DCR supplied\n");
+  if (!KH_FILE && !DCR_FILE && !CAM_FILE && !TYC_FILE) {
+    fprintf (stderr, "WARNING: none of -CAM, -KH, -DCR, -TYC supplied\n");
   }
 
@@ -175 +189 @@
   fprintf (stderr, "    -DCR (file) : supply DCR correction splines\n");
   fprintf (stderr, "    -CAM (file) : supply camera-static correction file\n");
+  fprintf (stderr, "    -TYC (file) : supply tycho-fix file (no pm stars)\n");
   fprintf (stderr, "    -region Rmin Rmax Dmin Dmax\n");
   fprintf (stderr, "    -update-catformat (format) : change database schema on output\n");
@@ -247 +262 @@
     remove_argument (N, &argc, argv);
     CAM_RESET = TRUE;
+  }
+
+  TYC_FILE = NULL;
+  if ((N = get_argument (argc, argv, "-TYC"))) {
+    remove_argument (N, &argc, argv);
+    char *tmpfile = strcreate (argv[N]);
+    TYC_FILE = abspath (tmpfile, DVO_MAX_PATH);
+    remove_argument (N, &argc, argv);
+  }
+  TYC_RESET = FALSE;
+  if ((N = get_argument (argc, argv, "-TYC-reset"))) {
+    remove_argument (N, &argc, argv);
+    TYC_RESET = TRUE;
   }
 
@@ -308 +336 @@
   if (!CATDIR) usage_setastrom_client();
 
-  if (!KH_FILE && !DCR_FILE && !CAM_FILE) {
-    fprintf (stderr, "WARNING: none of -CAM, -KH, -DCR supplied\n");
+  if (!KH_FILE && !DCR_FILE && !CAM_FILE && !TYC_FILE) {
+    fprintf (stderr, "WARNING: none of -CAM, -KH, -DCR, -TYC supplied\n");
   }
 

branches/eam_branches/ipp-20150419/Ohana/src/uniphot/src/setastrom.c

@@ -8 +8 @@
   initialize_setastrom (argc, argv);
 
-  // argv[1] holds the correction file
-  status = update_dvo_setastrom (argv[1]);
+  status = update_dvo_setastrom ();
 
   if (!status) exit (1);

branches/eam_branches/ipp-20150419/Ohana/src/uniphot/src/update_dvo_setastrom.c

@@ -20 +20 @@
   if (DCR_FILE) if (!load_dcr_correction (DCR_FILE)) { fprintf (stderr, "failed to load DCR correction %s\n", DCR_FILE); exit (1); }
   if (CAM_FILE) if (!load_cam_correction (CAM_FILE)) { fprintf (stderr, "failed to load CAM correction %s\n", CAM_FILE); exit (1); }
+  if (TYC_FILE) if (!load_tyc_correction (TYC_FILE)) { fprintf (stderr, "failed to load TYC correction %s\n", TYC_FILE); exit (1); }
 
   // determine the populated SkyRegions overlapping the requested area (default depth)
@@ -56 +57 @@
     }
 
+    if (TYC_FILE) {
+      repair_tycho_setastrom (&catalog, skylist[0].regions[i]);
+    }
     update_catalog_setastrom (&catalog);