Changeset 5442

Timestamp:

Oct 24, 2005, 10:35:23 AM (21 years ago)

Author:

eugene

Message:

added skycat, mods to skyregion

Location:

trunk/Ohana/src/opihi

Files:

• dvo/Makefile (modified) (1 diff)
• dvo/find_regions.c (modified) (1 diff)
• dvo/init.c (modified) (2 diffs)
• dvo/pcat.c (modified) (5 diffs)
• dvo/skycat.c (added)
• include/dvo1.h (modified) (1 diff)
• include/dvo2.h (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/Makefile

@@ -80 +80 @@
 $(SDIR)/procks.$(ARCH).o                \
 $(SDIR)/skycoverage.$(ARCH).o           \
+$(SDIR)/skycat.$(ARCH).o                \
 $(SDIR)/showtile.$(ARCH).o              \
 $(SDIR)/simage.$(ARCH).o                \

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

@@ -15 +15 @@
   int NLINES, done, NREGIONS, nregion;
   
-  VarConfig ("SKYFILE", "%s", filename);
+  VarConfig ("GSCFILE", "%s", filename);
   f = fopen (filename, "r");
   if (f == NULL) {

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

@@ -43 +43 @@
 int procks          PROTO((int, char **));
 int showtile        PROTO((int, char **));
+int skycat          PROTO((int, char **));
 int skycoverage     PROTO((int, char **));
 int simage          PROTO((int, char **));
@@ -95 +96 @@
   {"procks",      procks,       "plot rocks"},
   {"showtile",    showtile,     "plot tile pattern"},
+  {"skycat",      skycat,       "show sky catalog boundaries"},
   {"skycoverage", skycoverage,  "measure image union on sky"},
   {"simage",      simage,       "plot stars in an image"},

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

@@ -1 +1 @@
 # include "dvo1.h"
+int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside);
 
 int pcat (int argc, char **argv) {
   
   double Radius;
-  int i, j, N, Nregions, ShowAll, NPTS, Npts;
+  int i, j, N, Nregions, ShowAll, NPTS, Npts, leftside;
   RegionFile *regions;
   char filename[128];
@@ -10 +11 @@
   Vector Xvec, Yvec;
   Graphdata graphmode;
-  double X[4], Y[4];
+  double X[4], Y[4], Rmin, Rmax, Rmid;
   char catdir[256];
-  int Ngraph;
+  int Ngraph, VERBOSE;
 
   VarConfig ("CATDIR", "%s", catdir);
+
+  VERBOSE = FALSE;
+  if ((N = get_argument (argc, argv, "-v"))) {
+    remove_argument (N, &argc, argv);
+    VERBOSE = TRUE;
+  }
 
   ShowAll = FALSE;
@@ -31 +38 @@
   regions = find_regions (graphmode.coords.crval1, graphmode.coords.crval2, Radius, &Nregions);
 
+  Rmin = graphmode.coords.crval1 - 180.0;
+  Rmax = graphmode.coords.crval1 + 180.0;
+  Rmid = 0.5*(Rmin + Rmax);
+
   NPTS = 200;
   ALLOCATE (Xvec.elements, float, NPTS);
@@ -39 +50 @@
     sprintf (filename, "%s/%s", catdir, regions[i].name);
     if (ShowAll || (stat (filename, &filestat) != -1)) {
-      fprintf (stderr, "%3d %s\n", i, regions[i].name);
-      RD_to_XY (&X[0], &Y[0], regions[i].RA0, regions[i].DEC0, &graphmode.coords);
-      RD_to_XY (&X[1], &Y[1], regions[i].RA0, regions[i].DEC1, &graphmode.coords);
-      RD_to_XY (&X[2], &Y[2], regions[i].RA1, regions[i].DEC1, &graphmode.coords);
-      RD_to_XY (&X[3], &Y[3], regions[i].RA1, regions[i].DEC0, &graphmode.coords);
-      for (j = 0; j < 4; j++) {
-        Xvec.elements[Npts + j*2] = X[j];
-        Yvec.elements[Npts + j*2] = Y[j];
-        if (j > 0) {
-          Xvec.elements[Npts+2*j - 1] = Xvec.elements[Npts+2*j];
-          Yvec.elements[Npts+2*j - 1] = Yvec.elements[Npts+2*j];
-        }
+      if (VERBOSE) fprintf (stderr, "%3d %s\n", i, regions[i].name);
+
+      leftside = -1;
+      RD_to_XYpic (&X[0], &Y[0], regions[i].RA0, regions[i].DEC0, &graphmode.coords, Rmin, Rmax, Rmid, &leftside);
+      RD_to_XYpic (&X[1], &Y[1], regions[i].RA0, regions[i].DEC1, &graphmode.coords, Rmin, Rmax, Rmid, &leftside);
+      RD_to_XYpic (&X[2], &Y[2], regions[i].RA1, regions[i].DEC1, &graphmode.coords, Rmin, Rmax, Rmid, &leftside);
+      RD_to_XYpic (&X[3], &Y[3], regions[i].RA1, regions[i].DEC0, &graphmode.coords, Rmin, Rmax, Rmid, &leftside);
+
+      Xvec.elements[Npts] = X[0];
+      Yvec.elements[Npts] = Y[0];
+      for (j = 1; j < 4; j++) {
+        Xvec.elements[Npts + j*2 - 0] = X[j];
+        Yvec.elements[Npts + j*2 - 0] = Y[j];
+        Xvec.elements[Npts + j*2 - 1] = X[j];
+        Yvec.elements[Npts + j*2 - 1] = Y[j];
       }
       Xvec.elements[Npts+7] = Xvec.elements[Npts];
@@ -81 +95 @@
 
 }
+
+int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside) {
+
+  while (r < Rmin) { r += 360.0; }
+  while (r > Rmax) { r -= 360.0; }
+
+  if (*leftside == -1) {
+    *leftside = (r < Rmid);
+  } else {
+    if (  *leftside && (r > Rmid + 90)) { r -= 360.0; }
+    if (! *leftside && (r < Rmid - 90)) { r += 360.0; }
+  }
+
+  RD_to_XY (x, y, r, d, coords);
+
+  return (TRUE);
+}

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

@@ -90 +90 @@
 CMPstars *cmpReadFits (FILE *f, int *nstars);
 CMPstars *cmpReadText (FILE *f, int *nstars);
+int RD_to_XYpic (double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside);
 
 # endif

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

@@ -11 +11 @@
   int Nregion;
   SkyRegion *region;
-} SkyRegionTable;
+} SkyTable;
 
 typedef struct {
   int Nregion;
   SkyRegion **region;
-} SkyRegionList;
+} SkyList;
 
 # if (0)