Changeset 31092

Timestamp:

Mar 30, 2011, 9:46:36 AM (15 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20110213/Ohana/src

Files:

• addstar/include/skycells.h (modified) (1 diff)
• addstar/src/args_skycells.c (modified) (2 diffs)
• addstar/src/sky_tessalation.c (modified) (1 diff)
• gcompare/Makefile (modified) (1 diff)
• gcompare/include/gcompare.h (modified) (1 diff)
• gcompare/src/gc_compare.c (copied) (copied from trunk/Ohana/src/gcompare/src/gc_compare.c )
• gcompare/src/gcompare.c (modified) (5 diffs)
• opihi/cmd.astro/Makefile (modified) (1 diff)
• opihi/cmd.astro/cline.c (copied) (copied from trunk/Ohana/src/opihi/cmd.astro/cline.c )
• opihi/cmd.astro/init.c (modified) (2 diffs)

branches/eam_branches/ipp-20110213/Ohana/src/addstar/include/skycells.h

@@ -69 +69 @@
 double CELLSIZE;
 int    LEVEL;
+char   PROJECTION_NUMBER[8];
 
 double CENTER_RA, CENTER_DEC;

branches/eam_branches/ipp-20110213/Ohana/src/addstar/src/args_skycells.c

@@ -93 +93 @@
       remove_argument (N, &argc, argv);
       OVERLAP_DEC  = atof (argv[N]);
+      remove_argument (N, &argc, argv);
+    }
+    PROJECTION_NUMBER[0] = 0;
+    if ((N = get_argument (argc, argv, "-projection-number"))) {
+      remove_argument (N, &argc, argv);
+      int projection_number = atoi(argv[N]);
+      // We store projection number as a string, but range check as a number
+      if (projection_number > 10000) {
+        fprintf (stderr, "maximum projection-number value is 10000\n");
+        help();
+      } else if (projection_number < 0) {
+        fprintf (stderr, "projection-number value must be > 0\n");
+        help();
+      }
+      strcpy(PROJECTION_NUMBER, argv[N]);
       remove_argument (N, &argc, argv);
     }
@@ -208 +223 @@
   fprintf (stderr, "  -nx Nx                      : subdivide skycell projection in x by Nx\n");
   fprintf (stderr, "  -ny Ny                      : subdivide skycell projection in y by Ny\n");
+  fprintf (stderr, "  -projection-number Np       : set projection-number (local mode only)\n");
   fprintf (stderr, "  -help                       : this list\n");
   fprintf (stderr, "  -h                          : this list\n\n");

branches/eam_branches/ipp-20110213/Ohana/src/addstar/src/sky_tessalation.c

@@ -208 +208 @@
   sky_rectangle_local (&rectangle);
   strcpy (rectangle.name, "skycell");
+
+  if (strlen(PROJECTION_NUMBER) > 0) {
+    // We store projection number as a string so one can pass in
+    // values like 00, 01, etc. 
+    strcat(rectangle.name, ".");
+    strcat(rectangle.name, PROJECTION_NUMBER);
+  }
 
   // subdivide each image (Nx x Ny subcells)

branches/eam_branches/ipp-20110213/Ohana/src/gcompare/Makefile

@@ -24 +24 @@
 $(SRC)/compare.$(ARCH).o                        $(SRC)/sort.$(ARCH).o                   \
 $(SRC)/count_neighbors.$(ARCH).o                $(SRC)/nextline.$(ARCH).o               \
-$(SRC)/nextword.$(ARCH).o                       $(SRC)/gcompare.$(ARCH).o
+$(SRC)/nextword.$(ARCH).o                       $(SRC)/gcompare.$(ARCH).o               \
+$(SRC)/gc_compare.$(ARCH).o
 
 $(GCOMPARE): $(INC)/gcompare.h

branches/eam_branches/ipp-20110213/Ohana/src/gcompare/include/gcompare.h

@@ -26 +26 @@
 data_type          input             PROTO((char *, int, int, int));
 match_type        *compare           PROTO((data_type, data_type, int *, double, double, double, double));
+match_type        *gc_compare        PROTO((data_type, data_type, int *, double, double, double, double));
 int                get_argument      PROTO((int, char **, char *));
 int                remove_argument   PROTO((int, int *, char **));

branches/eam_branches/ipp-20110213/Ohana/src/gcompare/src/gcompare.c

@@ -6 +6 @@
   
   int Nskip1, Nskip2, Nmatches, N;
-  int X1, X2, Y1, Y2, deltas, match, nomatch1, nomatch2;
+  int X1, X2, Y1, Y2, deltas, match, nomatch1, nomatch2, greatcircle;
   data_type data1, data2;
   match_type *matches;
@@ -12 +12 @@
 
   DX = DY = Nskip1 = Nskip2 = 0;
-  noauto = match = nomatch1 = nomatch2 = deltas = FALSE;
+  noauto = match = nomatch1 = nomatch2 = deltas = greatcircle = FALSE;
 
   if (remove_argument(get_argument (argc, argv, "-d"), &argc, argv))
@@ -26 +26 @@
   if (remove_argument(get_argument (argc, argv, "-n2"), &argc, argv))
     nomatch2 = TRUE;
+  if (remove_argument(get_argument (argc, argv, "-C"), &argc, argv))
+    greatcircle = TRUE;
   if (!(match || deltas || nomatch1 || nomatch2)) {
     fprintf (stderr, "no output mode, use at least one of -d, -m, -n1, or -n2\n");
@@ -75 +77 @@
 
   fprintf (stderr, "noauto: %e\n", noauto);
-  matches = compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  if (greatcircle) {
+    matches = gc_compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  }
+  else {
+    matches = compare (data1, data2, &Nmatches, radius, DX, DY, noauto);
+  }
+
 
   output (data1, data2, matches, Nmatches, match, deltas, nomatch1, nomatch2);
@@ -90 +98 @@
   fprintf (stderr, "  -d      return delta coords\n");
   fprintf (stderr, "  -m      return matched lines\n");
+  fprintf (stderr, "  -C      uses great circle calculation\n");
   fprintf (stderr, "  -n1     return unmatched lines, file 1\n");
   fprintf (stderr, "  -n2     return unmatched lines, file 2\n");

branches/eam_branches/ipp-20110213/Ohana/src/opihi/cmd.astro/Makefile

@@ -22 +22 @@
 $(SRC)/coords.$(ARCH).o    \
 $(SRC)/cdot.$(ARCH).o              \
+$(SRC)/cline.$(ARCH).o             \
 $(SRC)/cplot.$(ARCH).o             \
 $(SRC)/csystem.$(ARCH).o           \

branches/eam_branches/ipp-20110213/Ohana/src/opihi/cmd.astro/init.c

@@ -6 +6 @@
 int coords                  PROTO((int, char **));
 int cdot                    PROTO((int, char **));
+int cline                   PROTO((int, char **));
 int cplot                   PROTO((int, char **));
 int csystem                 PROTO((int, char **));
@@ -53 +54 @@
   {1, "coords",      coords,       "load coordinates for buffer from file"},
   {1, "cdot",        cdot,         "plot point in sky coordinates"},
+  {1, "cline",       cline,        "plot line connecting two sky coordinates"},
   {1, "cplot",       cplot,        "plot vectors in sky coordinates"},
   {1, "csystem",     csystem,      "convert between coordinate systems"},