Changeset 38464

Timestamp:

Jun 12, 2015, 10:27:23 PM (11 years ago)

Author:

eugene

Message:

merge changes from EAM branch ipp-20150419

Location:

trunk/Ohana/src/uniphot

Files:

• Makefile (modified) (2 diffs)
• include/setastrom.h (modified) (2 diffs)
• src/initialize_setastrom.c (modified) (6 diffs)
• src/repair_tycho_setastrom.c (copied) (copied from branches/eam_branches/ipp-20150419/Ohana/src/uniphot/src/repair_tycho_setastrom.c )
• src/setastrom.c (modified) (1 diff)
• src/setphot.c (modified) (1 diff)
• src/tyc_correction.c (copied) (copied from branches/eam_branches/ipp-20150419/Ohana/src/uniphot/src/tyc_correction.c )
• src/update_dvo_setastrom.c (modified) (2 diffs)

trunk/Ohana/src/uniphot/Makefile

@@ -112 +112 @@
 $(SRC)/setastrom.$(ARCH).o          \
 $(SRC)/initialize_setastrom.$(ARCH).o \
+$(SRC)/tyc_correction.$(ARCH).o \
 $(SRC)/cam_correction.$(ARCH).o \
 $(SRC)/dcr_correction.$(ARCH).o \
 $(SRC)/kh_correction.$(ARCH).o \
 $(SRC)/astrom_correction.$(ARCH).o \
+$(SRC)/repair_tycho_setastrom.$(ARCH).o \
 $(SRC)/update_dvo_setastrom.$(ARCH).o \
 $(SRC)/update_catalog_setastrom.$(ARCH).o \
@@ -128 +130 @@
 $(SRC)/update_dvo_setastrom.$(ARCH).o \
 $(SRC)/update_catalog_setastrom.$(ARCH).o \
+$(SRC)/tyc_correction.$(ARCH).o \
 $(SRC)/cam_correction.$(ARCH).o \
 $(SRC)/dcr_correction.$(ARCH).o \
 $(SRC)/kh_correction.$(ARCH).o \
+$(SRC)/repair_tycho_setastrom.$(ARCH).o \
 $(SRC)/astrom_correction.$(ARCH).o \
 $(SRC)/initialize_setastrom.$(ARCH).o

trunk/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;
@@ -91 +93 @@
 int load_cam_correction (char *filename);
 int get_cam_correction (int chipID, int filter, float Xccd, float Yccd, double *dX, double *dY);
+
+int load_tyc_correction (char *filename);
+int get_tyc_correction (double **R, double **D, int *N);
+int repair_tycho_setastrom (Catalog *catalog, SkyRegion *region);

trunk/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");
   }
 

trunk/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);

trunk/Ohana/src/uniphot/src/setphot.c

@@ -21 +21 @@
   if (UBERCAL) {
     zpts = load_zpt_ubercal (argv[1], &Nzpts, &flatcorrTable);
+    if (!zpts) Shutdown ("failed to load zero points from ubercal table");
 
     char flatcorrfile[DVO_MAX_PATH];

trunk/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);