Changeset 39225 for trunk/Ohana

Timestamp:

Dec 3, 2015, 4:16:29 PM (11 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20151113

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/Makefile (modified) (1 diff)
• Ohana/src/dvomerge/Makefile (modified) (2 diffs)
• Ohana/src/dvomerge/include/dvomerge.h (modified) (1 diff)
• Ohana/src/dvomerge/include/dvoutils.h (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvorepair.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvorepairFixStackIDs.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/src/dvorepairFixStackIDs.c )
• Ohana/src/dvomerge/src/dvoutils.c (modified) (1 diff)
• Ohana/src/dvomerge/src/dvoutils_args.c (modified) (2 diffs)
• Ohana/src/dvomerge/src/dvoutils_check_images.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/dvomerge/src/dvoutils_check_images.c )
• Ohana/src/dvomerge/src/help.c (modified) (1 diff)
• Ohana/src/kapa2/include/constants.h (modified) (1 diff)
• Ohana/src/kapa2/include/globals.h (modified) (1 diff)
• Ohana/src/kapa2/src/CheckVisual.c (modified) (2 diffs)
• Ohana/src/kapa2/src/args.c (modified) (3 diffs)
• Ohana/src/libautocode/def/measure.d (modified) (1 diff)
• Ohana/src/libdvo/src/coordops.c (modified) (1 diff)
• Ohana/src/libkapa/src/KapaOpen.c (modified) (1 diff)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.astro/Makefile (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/cneedles.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/cneedles.c )
• Ohana/src/opihi/cmd.astro/drizzle.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/init.c (modified) (4 diffs)
• Ohana/src/opihi/cmd.astro/region.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.astro/wcs.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.astro/wcs.c )
• Ohana/src/opihi/cmd.data/Makefile (modified) (1 diff)
• Ohana/src/opihi/cmd.data/init.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.data/needles.c (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/opihi/cmd.data/needles.c )
• Ohana/src/opihi/dvo/avmatch.c (modified) (1 diff)
• Ohana/src/opihi/dvo/imlist.c (modified) (4 diffs)
• Ohana/src/opihi/include/dvomath.h (modified) (1 diff)
• Ohana/src/opihi/lib.shell/VectorOps.c (modified) (2 diffs)
• Ohana/src/relastro/include/relastro.h (modified) (2 diffs)
• Ohana/src/relastro/src/BrightCatalog.c (modified) (10 diffs)
• Ohana/src/relastro/src/ConfigInit.c (modified) (1 diff)
• Ohana/src/relastro/src/GetAstromError.c (modified) (2 diffs)
• Ohana/src/relastro/src/args.c (modified) (3 diffs)
• Ohana/src/relastro/src/bcatalog.c (modified) (1 diff)
• Ohana/src/relastro/src/launch_region_hosts.c (modified) (1 diff)
• Ohana/src/relastro/src/load_catalogs.c (modified) (2 diffs)
• Ohana/src/uniphot/doc/galmotion.sh (copied) (copied from branches/eam_branches/ipp-20151113/Ohana/src/uniphot/doc/galmotion.sh )
• Ohana/src/uniphot/src/initialize_setgalmodel.c (modified) (1 diff)
• Ohana/src/uniphot/src/setgalmodel.c (modified) (1 diff)
• Ohana/src/uniphot/src/setgalmodel_client.c (modified) (1 diff)
• Ohana/src/uniphot/src/update_catalog_setgalmodel.c (modified) (1 diff)
• Ohana/src/uniphot/src/update_dvo_setgalmodel.c (modified) (1 diff)

trunk/Ohana/src/addstar/Makefile

@@ -39 +39 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar sedstar loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadsupercos
-SERVER  = addstar_client addstarc addstard addstart
+INSTALL = addstar addstar_client sedstar loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadsupercos
+SERVER  = addstarc addstard addstart
 
 all: $(INSTALL)

trunk/Ohana/src/dvomerge/Makefile

@@ -125 +125 @@
 $(SRC)/dvorepairFixCPT.$(ARCH).o \
 $(SRC)/dvorepairFixWarpIDs.$(ARCH).o \
+$(SRC)/dvorepairFixStackIDs.$(ARCH).o \
 $(SRC)/dvorepairImagesVsMeasures.$(ARCH).o \
 $(SRC)/dvorepairDeleteImageList.$(ARCH).o \
@@ -171 +172 @@
 $(SRC)/SetSignals.$(ARCH).o \
 $(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/LoadImages.$(ARCH).o \
 $(SRC)/dvoutils.$(ARCH).o \
 $(SRC)/dvoutils_args.$(ARCH).o \
 $(SRC)/dvoutils_uniq_images.$(ARCH).o \
+$(SRC)/dvoutils_check_images.$(ARCH).o \
 $(SRC)/dvoutils_load_image_index.$(ARCH).o
 

trunk/Ohana/src/dvomerge/include/dvomerge.h

@@ -252 +252 @@
 int dvorepair_by_objID (int argc, char **argv);
 int dvorepairFixWarpIDs (int argc, char **argv);
-
+int dvorepairFixStackIDs (int argc, char **argv);
+

trunk/Ohana/src/dvomerge/include/dvoutils.h

@@ -20 +20 @@
   DVOUTILS_NONE,
   DVOUTILS_UNIQ_IMAGES,
+  DVOUTILS_CHECK_IMAGES,
 } DVOUTILS_OP_TYPE;
 
@@ -32 +33 @@
 
 char *IMAGES_LIST;
+char *CATDIR;
+char *EXTERN_ID_LIST;
 
 int main (int argc, char **argv);
 int dvoutils_args (int *argc, char **argv);
 int dvoutils_uniq_images (char *filename);
+int dvoutils_check_images (void);
 
 ImageData *dvoutils_load_image_index (char *filename);

trunk/Ohana/src/dvomerge/src/dvorepair.c

@@ -11 +11 @@
   
   if (!strcmp(argv[1], "-fix-warp-ids")) dvorepairFixWarpIDs(argc, argv);
+  if (!strcmp(argv[1], "-fix-stack-ids")) dvorepairFixStackIDs(argc, argv);
 
   if (!strcmp(argv[1], "-fix-cpt")) dvorepairFixCPT(argc, argv);

trunk/Ohana/src/dvomerge/src/dvoutils.c

@@ -13 +13 @@
       exit (0);
 
+    case DVOUTILS_CHECK_IMAGES:
+      dvoutils_check_images();
+      exit (0);
+
     default:
       fprintf (stderr, "ERROR: unknown option\n");

trunk/Ohana/src/dvomerge/src/dvoutils_args.c

@@ -22 +22 @@
     remove_argument (N, argc, argv);
   }
+  if ((N = get_argument (*argc, argv, "-check-images"))) {
+    DVOUTILS_OP = DVOUTILS_CHECK_IMAGES;
+    remove_argument (N, argc, argv);
+    CATDIR = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+    EXTERN_ID_LIST = strcreate (argv[N]);
+    remove_argument (N, argc, argv);
+  }
+
+  if (*argc != 1) {
+    fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
+    fprintf (stderr, "USAGE: dvoutils -check-images (catdir) (externIDs) [-v,-verbose]\n\n");
+    fprintf (stderr, "  -v : VERBOSE\n");
+    exit (2);
+  }
 
   if (DVOUTILS_OP == DVOUTILS_NONE) {
@@ -28 +43 @@
   }
 
-  if (*argc != 1) {
-    fprintf (stderr, "USAGE: dvoutils -uniq-images (filename) [-v,-verbose]\n\n");
-    fprintf (stderr, "  -v : VERBOSE\n");
-    exit (2);
-  }
-
   return TRUE;
 }

trunk/Ohana/src/dvomerge/src/help.c

@@ -172 +172 @@
 
   fprintf (stderr, "USAGE\n");
-  fprintf (stderr, "  dvorepair -fix-warp-ids (catdir) (idfile) - regenerate images.dat warp_skyfile_ids (EXTERN_ID) values\n");
+  fprintf (stderr, "  dvorepair -fix-warp-ids (catdir.list) (idfile) - regenerate images.dat warp_skyfile_ids (EXTERN_ID) values\n");
+  fprintf (stderr, "  dvorepair -fix-stack-ids (catdir.list) - regenerate images.dat stackID (EXTERN_ID) values\n");
   fprintf (stderr, "  dvorepair -fix-cpt (images) (rootlist) - regenerate cpt & cps files from the cpm files\n");
   fprintf (stderr, "  dvorepair -images-vs-measures (catdir) (Ntol) - find images with too many missing detections\n");

trunk/Ohana/src/kapa2/include/constants.h

@@ -11 +11 @@
 
 # define NCHANNELS 10
-# define NPIXELS_DYNAMIC 128
-
-// XXX for the moment, this is set to match the values in SetColorScale3D_CC
-# define NPIXELS_STATIC 128
-// # define NPIXELS_STATIC 4600 -- if we want fullcolor to work, need this
 
 # define PAD1  3

trunk/Ohana/src/kapa2/include/globals.h

@@ -11 +11 @@
 int   NAN_GREEN;
 int   NAN_BLUE;
+
+int   NPIXELS_DYNAMIC;
+int   NPIXELS_STATIC;
 
 /* these should be absorbed into KapaImageWidget 

trunk/Ohana/src/kapa2/src/CheckVisual.c

@@ -131 +131 @@
   }
 
+  Npixels = NPIXELS_STATIC;
   if (graphic[0].dynamicColors) {
     Npixels = NPIXELS_DYNAMIC;
-    if ((N = get_argument (*argc, argv, "-ncolors"))) {
-      remove_argument(N, argc, argv);
-      Npixels = atoi (argv[N]);
-      remove_argument(N, argc, argv);
-    } 
 
     /* allocate color cells */
@@ -181 +177 @@
     }
   } else {
-    Npixels = NPIXELS_STATIC;
-    if ((N = get_argument (*argc, argv, "-ncolors"))) {
-      remove_argument(N, argc, argv);
-      Npixels = atoi (argv[N]);
-      remove_argument(N, argc, argv);
-    } 
-
     // XXX allocate the unsigned long *pixels here and above
     ALLOCATE (graphic[0].pixels, unsigned long, Npixels);

trunk/Ohana/src/kapa2/src/args.c

@@ -1 +1 @@
 # include "Ximage.h"
+
+void help(void);
 
 int args (int *argc, char **argv) {
 
   int N;
+
+  if ((N = get_argument (*argc, argv, "-h"))) help();
+  if ((N = get_argument (*argc, argv, "-help"))) help();
+  if ((N = get_argument (*argc, argv, "--h"))) help();
+  if ((N = get_argument (*argc, argv, "--help"))) help();
 
   MAP_WINDOW = TRUE;
@@ -37 +44 @@
   }
 
+  NPIXELS_DYNAMIC = 128;
+  NPIXELS_STATIC = 128;
+  if ((N = get_argument (*argc, argv, "-ncolors"))) {
+    remove_argument(N, argc, argv);
+    NPIXELS_DYNAMIC = atoi (argv[N]);
+    NPIXELS_STATIC = NPIXELS_DYNAMIC;
+    remove_argument(N, argc, argv);
+  } 
+
   NAN_RED   = 0;
   NAN_GREEN = 0xffff;
@@ -56 +72 @@
   return (TRUE);
 }
+
+void help (void) {
+
+  fprintf (stderr, "USAGE: kapa [options]\n");
+  fprintf (stderr, "OPTIONS: \n");
+  fprintf (stderr, "-h, -help, --h, --help : this listing\n");
+  fprintf (stderr, "-nomap : use X but do not generate a window\n");
+  fprintf (stderr, "-name : name for the X window bar\n");
+  fprintf (stderr, "-noX : do not use an X window\n");
+  fprintf (stderr, "-debug : report debug info\n");
+  fprintf (stderr, "-fg : define the foreground color (X color style)\n");
+  fprintf (stderr, "-ncolors : set the number of colors (pixels) available (128 default)\n");
+  fprintf (stderr, "-nan (red) (green) (blue) : set NaN pixels to this color (hex values)\n");
+  exit (2);
+}

trunk/Ohana/src/libautocode/def/measure.d

@@ -45 +45 @@
 # XXX I can deprecate these as I am going to apply the correct uR,uD offset
 # XXX not sure how to use this yet...
+# XXX replace RoffGall with Moff -> static component of the zpt correction
 FIELD RoffGAL,        R_OFF_GAL,     float,          RA offset from correction,    arcsec
 FIELD DoffGAL,        D_OFF_GAL,     float,          DEC offset from correction,   arcsec

trunk/Ohana/src/libdvo/src/coordops.c

@@ -990 +990 @@
 
 OhanaProjection GetProjection (char *ctype) {
-  if (!strcmp(&ctype[4], "-ZEA")) return PROJ_ZEA;
-  if (!strcmp(&ctype[4], "-ZPL")) return PROJ_ZPL;
-  if (!strcmp(&ctype[4], "-ZPN")) return PROJ_ZPN;
-  if (!strcmp(&ctype[4], "-ARC")) return PROJ_ARC;
-  if (!strcmp(&ctype[4], "-STG")) return PROJ_STG;
-  if (!strcmp(&ctype[4], "-SIN")) return PROJ_SIN;
-  if (!strcmp(&ctype[0], "MM"))   return PROJ_SIN; // note ctype[0]
-  if (!strcmp(&ctype[4], "-TAN")) return PROJ_TAN;
-  if (!strcmp(&ctype[4], "-TNX")) return PROJ_TNX;
-  if (!strcmp(&ctype[4], "-DIS")) return PROJ_DIS;
-  if (!strcmp(&ctype[4], "-LIN")) return PROJ_LIN;
-  if (!strcmp(&ctype[0], "GENE")) return PROJ_LIN; // note ctype[0]
-  if (!strcmp(&ctype[4], "-PLY")) return PROJ_PLY;
-  if (!strcmp(&ctype[4], "-WRP")) return PROJ_WRP;
-  if (!strcmp(&ctype[4], "-AIT")) return PROJ_AIT;
-  if (!strcmp(&ctype[4], "-GLS")) return PROJ_GLS;
-  if (!strcmp(&ctype[4], "-PAR")) return PROJ_PAR;
+  if (!strncmp(&ctype[4], "-ZEA", 4)) return PROJ_ZEA;
+  if (!strncmp(&ctype[4], "-ZPL", 4)) return PROJ_ZPL;
+  if (!strncmp(&ctype[4], "-ZPN", 4)) return PROJ_ZPN;
+  if (!strncmp(&ctype[4], "-ARC", 4)) return PROJ_ARC;
+  if (!strncmp(&ctype[4], "-STG", 4)) return PROJ_STG;
+  if (!strncmp(&ctype[4], "-SIN", 4)) return PROJ_SIN;
+  if (!strncmp(&ctype[0], "MM", 2))   return PROJ_SIN; // note ctype[0]
+  if (!strncmp(&ctype[4], "-TAN", 4)) return PROJ_TAN;
+  if (!strncmp(&ctype[4], "-TNX", 4)) return PROJ_TNX;
+  if (!strncmp(&ctype[4], "-DIS", 4)) return PROJ_DIS;
+  if (!strncmp(&ctype[4], "-LIN", 4)) return PROJ_LIN;
+  if (!strncmp(&ctype[0], "GENE", 4)) return PROJ_LIN; // note ctype[0]
+  if (!strncmp(&ctype[4], "-PLY", 4)) return PROJ_PLY;
+  if (!strncmp(&ctype[4], "-WRP", 4)) return PROJ_WRP;
+  if (!strncmp(&ctype[4], "-AIT", 4)) return PROJ_AIT;
+  if (!strncmp(&ctype[4], "-GLS", 4)) return PROJ_GLS;
+  if (!strncmp(&ctype[4], "-PAR", 4)) return PROJ_PAR;
   return PROJ_NONE;
 }

trunk/Ohana/src/libkapa/src/KapaOpen.c

@@ -2 +2 @@
 
 // kapa connection timeout is N_RETRY * 10000 usec
-# define N_RETRY 2000
+# define N_RETRY 5000
 
 # define MY_PORT 2500

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -23 +23 @@
 $(SRC)/cdot.$(ARCH).o              \
 $(SRC)/cline.$(ARCH).o             \
+$(SRC)/cneedles.$(ARCH).o                  \
 $(SRC)/cplot.$(ARCH).o             \
 $(SRC)/csystem.$(ARCH).o           \
@@ -76 +77 @@
 $(SRC)/vshimage.$(ARCH).o         \
 $(SRC)/shimage.$(ARCH).o         \
+$(SRC)/wcs.$(ARCH).o         \
 $(SRC)/imsub.$(ARCH).o             \
 $(SRC)/imfit.$(ARCH).o             \

trunk/Ohana/src/opihi/cmd.astro/drizzle.c

@@ -141 +141 @@
 
           if (Vmk && Vmk[Ni]) continue;
+          if (!isfinite(Vin[Ni])) continue;
+
           Vout[No] += Vin[Ni];
           Vwt[No] ++;
@@ -195 +197 @@
 
           if (Vmk && Vmk[Ni]) continue;
+          if (!isfinite(Vin[Ni])) continue;
           Vout[No] += Vin[Ni];
           Vwt[No] ++;

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -7 +7 @@
 int cdot                    PROTO((int, char **));
 int cline                   PROTO((int, char **));
+int cneedles                PROTO((int, char **));
 int cplot                   PROTO((int, char **));
 int csystem                 PROTO((int, char **));
@@ -66 +67 @@
 int vshimage                PROTO((int, char **));
 int shimage                 PROTO((int, char **));
+int wcs                     PROTO((int, char **));
 
 static Command cmds[] = {  
@@ -74 +76 @@
   {1, "cdot",        cdot,         "plot point in sky coordinates"},
   {1, "cline",       cline,        "plot line connecting two sky coordinates"},
+  {1, "cneedles",    cneedles,     "plot vectors in sky coordinates"},
   {1, "cplot",       cplot,        "plot vectors in sky coordinates"},
   {1, "csystem",     csystem,      "convert between coordinate systems"},
@@ -131 +134 @@
   {1, "vshimage",    vshimage,     "generate images for vector spherical harmonic terms"},
   {1, "shimage",     shimage,      "generate images for spherical harmonic terms"},
+  {1, "wcs",         wcs,          "set the wcs for the given image"},
 }; 
 

trunk/Ohana/src/opihi/cmd.astro/region.c

@@ -74 +74 @@
   }
 
+  float Angle = 0.0;
+  if ((N = get_argument (argc, argv, "-angle"))) {
+    remove_argument (N, &argc, argv);
+    Angle = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
   if ((argc != 4) && (argc != 5)) {
     gprint (GP_ERR, "USAGE: region Ra Dec Radius [projection] [orientation]\n");
-    gprint (GP_ERR, "  [-image] [-ew] [+ew] [-ns] [+ns] [-no-clear]\n");
+    gprint (GP_ERR, "  [-image] [-ew] [+ew] [-ns] [+ns] [-no-clear] [-angle theta]\n");
     gprint (GP_ERR, " current: %f %f (%f x %f) (%s)\n", 
              graphmode.coords.crval1, graphmode.coords.crval2, 
@@ -111 +118 @@
   graphmode.coords.crval2 = Dec;
 
-  graphmode.coords.pc1_1 = (graphmode.flipeast) ? -1 : 1;
-  graphmode.coords.pc2_2 = (graphmode.flipnorth) ? -1 : 1;
+  float pc1_1 = (graphmode.flipeast)  ? -1 : 1;
+  float pc2_2 = (graphmode.flipnorth) ? -1 : 1;
+
+  graphmode.coords.pc1_1 =  cos(Angle*RAD_DEG)*pc1_1;
+  graphmode.coords.pc1_2 =  sin(Angle*RAD_DEG)*pc2_2;
+  graphmode.coords.pc2_1 = -sin(Angle*RAD_DEG)*pc1_1;
+  graphmode.coords.pc2_2 =  cos(Angle*RAD_DEG)*pc2_2;
 
   /* ask kapa for coordinate limits, to get the right aspect ratio */

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -97 +97 @@
 $(SRC)/medimage_commands.$(ARCH).o \
 $(SRC)/mset.$(ARCH).o           \
+$(SRC)/needles.$(ARCH).o                \
 $(SRC)/peak.$(ARCH).o           \
 $(SRC)/periodogram.$(ARCH).o    \

trunk/Ohana/src/opihi/cmd.data/init.c

@@ -86 +86 @@
 int medimage_command PROTO((int, char **));
 int mset             PROTO((int, char **));
+int needles          PROTO((int, char **));
 int peak             PROTO((int, char **));
 int periodogram      PROTO((int, char **));
@@ -261 +262 @@
   {1, "mset",         mset,             "insert a vector in an image"},
   {1, "imset",        mset,             "insert a vector in an image"},
+  {1, "needles",      needles,          "plot vectors needles"},
   {1, "parity",       parity,           "set image parity"},
   {1, "peak",         peak,             "find vector peak in range"},

trunk/Ohana/src/opihi/dvo/avmatch.c

@@ -328 +328 @@
   gprint (GP_ERR, "USAGE: avmatch (RA) (DEC) (RADIUS) field[,field,field...]\n");
   gprint (GP_ERR, "   OR: avmatch -coords (filename.fits) (RADIUS) field[,field,field...]\n");
+  gprint (GP_ERR, "   RADIUS is in arcseconds\n");
 
   if ((argc > N + 1) && !strcasecmp (argv[N+1], "fields")) {

trunk/Ohana/src/opihi/dvo/imlist.c

@@ -21 +21 @@
   }
 
+  int VERBOSE = TRUE;
+  if ((N = get_argument (argc, argv, "-quiet"))) {
+    VERBOSE = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-q"))) {
+    VERBOSE = FALSE;
+    remove_argument (N, &argc, argv);
+  }
+
   TimeSelect = FALSE;
   if ((N = get_argument (argc, argv, "-time"))) {
@@ -35 +45 @@
     remove_argument (N, &argc, argv);
     TimeSelect = TRUE;
-    gprint (GP_ERR, "plotting in range %ds - %ds (%f seconds)\n", (int)tzero, (int)(tzero + trange), trange);
+    if (VERBOSE) gprint (GP_ERR, "plotting in range %ds - %ds (%f seconds)\n", (int)tzero, (int)(tzero + trange), trange);
   }
 
@@ -88 +98 @@
   GetTimeFormat (&TimeReference, &TimeFormat);
 
+  int Nfound = 0;
+
   for (j = 0; j < MAX_LIST; j++) {
     i = subset[j];
@@ -104 +116 @@
       XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
     }
-    gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", 
-            (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
+    if (VERBOSE) gprint (GP_LOG, "%3lld %s %8lld %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n", 
+                         (long long) i, image[i].name, (long long) image[i].imageID, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
+
+    char name[80];
+    sprintf (name, "imlist:%d", Nfound);
+    set_str_variable (name, image[i].name);
+    Nfound ++;
   }
+  set_int_variable ("imlist:n", Nfound);
 
   FreeImagesDVO(image);

trunk/Ohana/src/opihi/include/dvomath.h

@@ -147 +147 @@
 Vector       *InitVector            PROTO((void));
 void          FreeVectorArray       PROTO((Vector **vec, int Nvec));
+void          FreeVector            PROTO((Vector *vec));
 int           CopyVector            PROTO((Vector *out, Vector *in));
 int           ResetVector           PROTO((Vector *vec, char type, int Nelements));

trunk/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -15 +15 @@
 
 // this function is NOT thread protected : it is only used in startup and/or shutdown
+void FreeVector (Vector *vec) {
+
+  if (!vec) return;
+  if (vec->elements.Int) {
+    free (vec->elements.Int);
+  }
+  free (vec);
+}
+
+// this function is NOT thread protected : it is only used in startup and/or shutdown
 void FreeVectorArray (Vector **vec, int Nvec) {
 
@@ -21 +31 @@
   if (!vec) return;
   for (i = 0; i < Nvec; i++) {
-    if (!vec[i]) continue;
-    if (vec[i]->elements.Int) {
-      free (vec[i]->elements.Int);
-    }
-    free (vec[i]);
+    FreeVector (vec[i]);
   }
   free (vec);

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

@@ -254 +254 @@
 int SRC_MEAS_TOOFEW; //catalog objects wich fewer detections then this are ignored
 double MIN_ERROR;
+
+double MIN_DISTANCE_MOD;  
+double MAX_DISTANCE_MOD;  
+double MAX_DISTANCE_MOD_ERR;
 
 int    IMFIT_TOO_FEW; // need more than this number of stars to fit an image
@@ -323 +327 @@
 PhotCode     *DCR_RED_PHOTCODE_POS, *DCR_RED_PHOTCODE_NEG; 
 int           DCR_RED_NSEC_POS,      DCR_RED_NSEC_NEG; 
+
+float *LoopWeight2MASS;
+float *LoopWeightTycho;
 
 int ImagSelect;

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

@@ -159 +159 @@
     GET_COLUMN(uR,             "U_RA",           float);
     GET_COLUMN(uD,             "U_DEC",          float);
-    GET_COLUMN(duR,            "V_RA_ERR",       float);
-    GET_COLUMN(duD,            "V_DEC_ERR",      float);
+    GET_COLUMN(duR,            "U_RA_ERR",       float);
+    GET_COLUMN(duD,            "U_DEC_ERR",      float);
+    GET_COLUMN(uRgal,          "U_RA_GAL",       float);
+    GET_COLUMN(uDgal,          "U_DEC_GAL",      float);
     GET_COLUMN(P,              "PAR",            float);
     GET_COLUMN(dP,             "PAR_ERR",        float);
@@ -189 +191 @@
     ALLOCATE (average, Average, Nrow);
     for (i = 0; i < Nrow; i++) {
+      dvo_average_init (&average[i]);
       average[i].R               = R[i]               ;
       average[i].D               = D[i]               ;
@@ -197 +200 @@
       average[i].duR             = duR[i]             ;
       average[i].duD             = duD[i]             ;
+      average[i].uRgal           = uRgal[i]           ;
+      average[i].uDgal           = uDgal[i]           ;
       average[i].P               = P[i]               ;
       average[i].dP              = dP[i]              ;
@@ -230 +235 @@
     free (duR);
     free (duD);
+    free (uRgal);
+    free (uDgal);
     free (P);
     free (dP);
@@ -489 +496 @@
     gfits_define_bintable_column (&theader, "E", "U_RA",           "RA*cos(D) proper-motion",                             "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "U_DEC",          "DEC proper-motion",                                   "", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "V_RA_ERR",       "RA*cos(D) p-m error",                                 "", 1.0, 0.0);
-    gfits_define_bintable_column (&theader, "E", "V_DEC_ERR",      "DEC p-m error",                                       "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_RA_ERR",       "RA*cos(D) p-m error",                                 "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_DEC_ERR",      "DEC p-m error",                                       "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_RA_GAL",       "RA*cos(D) p-m error",                                 "", 1.0, 0.0);
+    gfits_define_bintable_column (&theader, "E", "U_DEC_GAL",      "DEC p-m error",                                       "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "PAR",            "parallax",                                            "", 1.0, 0.0);
     gfits_define_bintable_column (&theader, "E", "PAR_ERR",        "parallax error",                                      "", 1.0, 0.0);
@@ -526 +535 @@
     float    *duR           ; ALLOCATE (duR           , float   , catalog->Naverage);
     float    *duD           ; ALLOCATE (duD           , float   , catalog->Naverage);
+    float    *uRgal         ; ALLOCATE (uRgal         , float   , catalog->Naverage);
+    float    *uDgal         ; ALLOCATE (uDgal         , float   , catalog->Naverage);
     float    *P             ; ALLOCATE (P             , float   , catalog->Naverage);
     float    *dP            ; ALLOCATE (dP            , float   , catalog->Naverage);
@@ -560 +571 @@
       duR[i]             = average[i].duR             ;
       duD[i]             = average[i].duD             ;
+      uRgal[i]           = average[i].uRgal           ;
+      uDgal[i]           = average[i].uDgal           ;
       P[i]               = average[i].P               ;
       dP[i]              = average[i].dP              ;
@@ -591 +604 @@
     gfits_set_bintable_column (&theader, &ftable, "U_RA",           uR,              catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "U_DEC",          uD,              catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "V_RA_ERR",       duR,             catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "V_DEC_ERR",      duD,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_RA_ERR",       duR,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_DEC_ERR",      duD,             catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_RA_GAL",       uRgal,           catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "U_DEC_GAL",      uDgal,           catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "PAR",            P,               catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "PAR_ERR",        dP,              catalog->Naverage);
@@ -604 +619 @@
     gfits_set_bintable_column (&theader, &ftable, "NMEASURE",       Nmeasure,        catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "NMISSING",       Nmissing,        catalog->Naverage);
-    gfits_set_bintable_column (&theader, &ftable, "NGALPHOT",      Ngalphot,       catalog->Naverage);
+    gfits_set_bintable_column (&theader, &ftable, "NGALPHOT",       Ngalphot,        catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MEASURE",    measureOffset,   catalog->Naverage);
     gfits_set_bintable_column (&theader, &ftable, "OFF_MISSING",    missingOffset,   catalog->Naverage);
@@ -624 +639 @@
     free (duR);
     free (duD);
+    free (uRgal);
+    free (uDgal);
     free (P);
     free (dP);

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

@@ -35 +35 @@
   if (!ScanConfig (config, "RELASTRO_DPOS_MAX",      "%lf", 0, &DPOS_MAX))         DPOS_MAX = 6.0;    
   if (!ScanConfig (config, "ADDSTAR_RADIUS",         "%lf", 0, &ADDSTAR_RADIUS))   ADDSTAR_RADIUS = 1.0;
+
+  if (!ScanConfig (config, "RELASTRO_MIN_DISTANCE_MOD",     "%lf", 0, &MIN_DISTANCE_MOD))     MIN_DISTANCE_MOD     =  7.5;
+  if (!ScanConfig (config, "RELASTRO_MAX_DISTANCE_MOD",     "%lf", 0, &MAX_DISTANCE_MOD))     MAX_DISTANCE_MOD     = 15.0;
+  if (!ScanConfig (config, "RELASTRO_MAX_DISTANCE_MOD_ERR", "%lf", 0, &MAX_DISTANCE_MOD_ERR)) MAX_DISTANCE_MOD_ERR =  1.0;
 
   if (!ScanConfig (config, "USE_FIXED_PIXCOORDS", "%d", 0, &USE_FIXED_PIXCOORDS))  USE_FIXED_PIXCOORDS = FALSE;

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

@@ -73 +73 @@
   int has2MASS = USE_GALAXY_MODEL &&  isImage && (measure[0].dbFlags & ID_MEAS_OBJECT_HAS_2MASS);
 
-  // serious hack: if the object has 2MASS, we set this internal bit and adjust the
+  // modest hack: if the object has 2MASS or Tycho, we set this internal bit and adjust the
   // weight to ensure the image is tied down to the 2mass frame
 
-  if (has2MASS) {
-    switch (Nloop) {
-      case 0:
-        dPtotal = dPtotal / 1000.0;
-        break;
-      case 1:
-        dPtotal = dPtotal / 300.0;
-        break;
-      case 2:
-        dPtotal = dPtotal / 100.0;
-        break;
-      case 3:
-        dPtotal = dPtotal / 30.0;
-        break;
-      case 4:
-        dPtotal = dPtotal / 10.0;
-        break;
-      case 5:
-        dPtotal = dPtotal / 10.0;
-        break;
-      default:
-        break;
-    }
+  if (has2MASS && LoopWeight2MASS) {
+    dPtotal = dPtotal / LoopWeight2MASS[Nloop];
   }
-  if (is2MASS) {
-    switch (Nloop) {
-      case 0:
-        dPtotal = dPtotal / 1000.0;
-        break;
-      case 1:
-        dPtotal = dPtotal / 300.0;
-        break;
-      case 2:
-        dPtotal = dPtotal / 100.0;
-        break;
-      case 3:
-        dPtotal = dPtotal / 30.0;
-        break;
-      case 4:
-        dPtotal = dPtotal / 10.0;
-        break;
-      case 5:
-        dPtotal = dPtotal / 10.0;
-        break;
-      default:
-        break;
-    }
+  if (is2MASS && LoopWeight2MASS) {
+    dPtotal = dPtotal / LoopWeight2MASS[Nloop];
   }
-  if (isTycho) {
-    switch (Nloop) {
-      case 0:
-      case 1:
-        dPtotal = dPtotal / 200.0;
-        break;
-      case 2:
-      case 3:
-        dPtotal = dPtotal / 100.0;
-        break;
-      case 4:
-      case 5:
-        dPtotal = dPtotal / 50.0;
-        break;
-      default:
-        break;
-    }
+  if (isTycho && LoopWeightTycho) {
+    dPtotal = dPtotal / LoopWeightTycho[Nloop];
   }
-
   return (dPtotal);
 }
@@ -197 +139 @@
 
   dPtotal = MAX (dPtotal, MIN_ERROR);
+
+  // early on, we want 2MASS and Tycho to have a very high weight.  This will force images
+  // to match the 2MASS / Tycho / ICRS reference frame.  As Nloop gets higher, the weight
+  // needs to drop to allow the ps1 measurements to drive the solution
+  int is2MASS  = USE_GALAXY_MODEL && !isImage && (measure[0].photcode >= 2011) && (measure[0].photcode <= 2013);
+  int isTycho  = USE_GALAXY_MODEL && !isImage && (measure[0].photcode >= 2020) && (measure[0].photcode <= 2021);
+  int has2MASS = USE_GALAXY_MODEL &&  isImage && (measure[0].dbFlags & ID_MEAS_OBJECT_HAS_2MASS);
+
+  // modest hack: if the object has 2MASS or Tycho, we set this internal bit and adjust the
+  // weight to ensure the image is tied down to the 2mass frame
+
+  if (has2MASS && LoopWeight2MASS) {
+    dPtotal = dPtotal / LoopWeight2MASS[Nloop];
+  }
+  if (is2MASS && LoopWeight2MASS) {
+    dPtotal = dPtotal / LoopWeight2MASS[Nloop];
+  }
+  if (isTycho && LoopWeightTycho) {
+    dPtotal = dPtotal / LoopWeightTycho[Nloop];
+  }
+
   return (dPtotal);
 }
 
-/* for a long time, psphot was either not reported position errors, or was reporting
+/* for a long time, psphot was either not reporting position errors, or was reporting
  * completely wrong astrometry errors.  This function lets us handle, in the
  * configuration, different strategies to generating a position error 

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

@@ -4 +4 @@
 void usage_merge_source (void);
 void usage_merge_source_id (char *name);
+float *ParseLoopWeights (char *rawlist);
 
 int args (int argc, char **argv) {
@@ -529 +530 @@
     remove_argument (N, &argc, argv);
     NLOOP = atof (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  // e.g., -loop-weights-2mass 1000,300,300,200,200,100
+  // NOTE: this must come after -nloop above
+  LoopWeight2MASS = NULL;
+  if ((N = get_argument (argc, argv, "-loop-weights-2mass"))) {
+    remove_argument (N, &argc, argv);
+    LoopWeight2MASS = ParseLoopWeights (argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  LoopWeightTycho = NULL;
+  if ((N = get_argument (argc, argv, "-loop-weights-tycho"))) {
+    remove_argument (N, &argc, argv);
+    LoopWeightTycho = ParseLoopWeights (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -999 +1015 @@
 }
 
+float *ParseLoopWeights (char *rawlist) {
+
+  float *weights = NULL;
+  ALLOCATE (weights, float, NLOOP);
+
+  int Nloop = 0;
+
+  /* parse the comma-separated list of photcodes */
+  char *myList = strcreate(rawlist);
+  char *list = myList;
+  char *entry = NULL;
+  char *ptr = NULL;
+  while ((Nloop < NLOOP) && ((entry = strtok_r (list, ",", &ptr)) != NULL)) {
+    list = NULL; // pass NULL on successive strtok_r calls
+
+    weights[Nloop] = atof(entry);
+    Nloop ++;
+  }
+  free (myList);
+
+  if (Nloop == 0) {
+    fprintf (stderr, "syntax error parsing weights: %s\n", rawlist);
+    exit (3);
+  }
+
+  while (Nloop < NLOOP) {
+    weights[Nloop] = weights[Nloop - 1];
+    Nloop ++;
+  }
+  return weights;
+}

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

@@ -117 +117 @@
       if (!isfinite(catalog[0].average[i].uRgal)) continue;
       if (!isfinite(catalog[0].average[i].uDgal)) continue;
+      
+      // filter stars which are not well-handled by the galactic motion model
+      int mStarpar = catalog[0].average[i].starparOffset;
+      myAssert (mStarpar < catalog[0].Nstarpar, "oops");
+      
+      StarPar *starpar = &catalog[0].starpar[mStarpar];
+      if (starpar->DistMag  < MIN_DISTANCE_MOD) continue;
+      if (starpar->DistMag  > MAX_DISTANCE_MOD) continue;
+      if (starpar->dDistMag > MAX_DISTANCE_MOD_ERR) continue;
     }
 

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

@@ -134 +134 @@
     if (MaxMeanOffset != 10.0) strextend (&command, "-max-mean-offset  %f", MaxMeanOffset);
 
+    if (LoopWeight2MASS) {
+      char *weightline = NULL;
+      for (i = 0; i < NLOOP; i++) {
+        strextend (&weightline, "%f,", LoopWeight2MASS[i]);
+      }
+      strextend (&command, "-loop-weights-2mass %s", weightline);
+      free (weightline);
+    }
+    if (LoopWeightTycho) {
+      char *weightline = NULL;
+      for (i = 0; i < NLOOP; i++) {
+        strextend (&weightline, "%f,", LoopWeightTycho[i]);
+      }
+      strextend (&command, "-loop-weights-tycho %s", weightline);
+      free (weightline);
+    }
+
     strextend (&command, "-D RELASTRO_SRC_MEAS_TOOFEW %d", SRC_MEAS_TOOFEW);
     strextend (&command, "-D RELASTRO_SIGMA_LIM %f", SIGMA_LIM);

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

@@ -44 +44 @@
     pcatalog->catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT; // don't need to load all data at this point
     pcatalog->Nsecfilt  = GetPhotcodeNsecfilt ();
+
+    if (USE_GALAXY_MODEL) {
+      pcatalog->catflags = pcatalog->catflags | DVO_LOAD_STARPAR;
+    }
 
     // loads Average, Measure, SecFilt
@@ -171 +175 @@
     strextend (&command, " -minerror %f", MIN_ERROR);
     strextend (&command, " -D RELASTRO_SIGMA_LIM %f", SIGMA_LIM);
+    strextend (&command, " -D RELASTRO_MIN_DISTANCE_MOD %f",     MIN_DISTANCE_MOD);
+    strextend (&command, " -D RELASTRO_MAX_DISTANCE_MOD %f",     MAX_DISTANCE_MOD);
+    strextend (&command, " -D RELASTRO_MAX_DISTANCE_MOD_ERR %f", MAX_DISTANCE_MOD_ERR);
 
     if (FIT_MODE == FIT_PM_ONLY)         strextend (&command, "-pm");

trunk/Ohana/src/uniphot/src/initialize_setgalmodel.c

@@ -45 +45 @@
 
   // XXX add to config?
-  if (!InitGalaxyModel ("ROESER")) {
+  if (!InitGalaxyModel ("FEAST-HIPPARCOS")) {
     fprintf (stderr, "failed to init galaxy model\n");
     exit (2);

trunk/Ohana/src/uniphot/src/setgalmodel.c

@@ -11 +11 @@
   status = update_dvo_setgalmodel ();
 
-  if (!status) exit (1);
+  if (!status) {
+    fprintf (stderr, "ERROR: problem running setgalmodel\n");
+    exit (1);
+  }
+  fprintf (stderr, "SUCCESS running setgalmodel\n");
   exit (0);
 }

trunk/Ohana/src/uniphot/src/setgalmodel_client.c

@@ -17 +17 @@
 
   update_dvo_setgalmodel ();
+  fprintf (stderr, "SUCCESS running setgalmodel_client\n");
 
   exit (0);

trunk/Ohana/src/uniphot/src/update_catalog_setgalmodel.c

@@ -28 +28 @@
     if (fabs(starpar->FeH) > 99.0) continue;
 
-    double distance = pow(10.0, 0.2*(starpar->DistMag + 5.0));
+    // NOTE: distance is in kiloparsec
+    double distance = pow(10.0, 0.2*(starpar->DistMag + 5.0)) / 1000.0;
 
     double Lrad = starpar->galLon * RAD_DEG;

trunk/Ohana/src/uniphot/src/update_dvo_setgalmodel.c

@@ -37 +37 @@
     dvo_catalog_init (&catalog, TRUE);
     catalog.filename  = HOST_ID ? localFilename : skylist[0].filename[i];
-    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT | DVO_LOAD_STARPAR;
+    catalog.catflags  = DVO_LOAD_AVERAGE | DVO_LOAD_STARPAR;
     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();