Changeset 41163

Timestamp:

Nov 27, 2019, 11:13:56 AM (7 years ago)

Author:

eugene

Message:

support changed API to WriteVectorTableFITS; remove some cruft from images command; add cimages command to fill in images with a color

Location:

trunk/Ohana/src/opihi/dvo

Files:

• Makefile (modified) (1 diff)
• avextract.c (modified) (1 diff)
• avmatch.c (modified) (2 diffs)
• avperiodomatch.c (modified) (1 diff)
• avselect.c (modified) (2 diffs)
• cimages.c (copied) (copied from branches/eam_branches/ohana.20190329/src/opihi/dvo/cimages.c )
• dvo_host_utils.c (modified) (1 diff)
• images.c (modified) (4 diffs)
• init.c (modified) (2 diffs)
• mextract.c (modified) (1 diff)
• mmatch.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/Makefile

@@ -67 +67 @@
 $(SRC)/gstar.$(ARCH).o                  \
 $(SRC)/hosts.$(ARCH).o          \
+$(SRC)/cimages.$(ARCH).o                \
 $(SRC)/images.$(ARCH).o         \
 $(SRC)/imbox.$(ARCH).o                  \

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

@@ -272 +272 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", NULL, vec, Nreturn, FALSE, FALSE, NULL, 0);
     if (!status) {
       goto escape;

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

@@ -114 +114 @@
 
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", NULL, vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
     }
@@ -301 +301 @@
       vec[i][0].Nelements = Nfound;
     }
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields + 1, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", NULL, vec, Nfields + 1, FALSE, FALSE, NULL, 0);
     free (vec[Nfields]->elements.Int);
     free (vec[Nfields]);

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

@@ -99 +99 @@
 
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", NULL, vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
       free (vec);

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

@@ -132 +132 @@
 
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", NULL, vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
     }
@@ -327 +327 @@
       vec[NfieldsOut-1] = RADvec;
     }
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, NfieldsOut, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", NULL, vec, NfieldsOut, FALSE, FALSE, NULL, 0);
     if (!status) goto escape;
   }

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

@@ -233 +233 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (ResultFile) {
-    int status = WriteVectorTableFITS (ResultFile, "RESULT", vec, Nvec, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (ResultFile, "RESULT", NULL, vec, Nvec, FALSE, FALSE, NULL, 0);
     if (!status) {
       gprint (GP_ERR, "failed to write result file %s\n", ResultFile);

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

@@ -12 +12 @@
 
   off_t i, Nimage, Nmosaic;
-  int j, status, InPic, leftside, *plist, TimeSelect, ByName;
+  int j, status, InPic, leftside, TimeSelect, ByName;
+  // int *plist, n, npts; -- what is/was plist?
   int WITH_MOSAIC, SOLO_MOSAIC;
   time_t tzero, tend;
-  int N, NPTS, n, npts, Npts, kapa, *foundMosaic;
+  int n, N, NPTS, Npts, kapa, *foundMosaic;
   Vector Xvec, Yvec;
   double r[8], d[8], x[8], y[8], Rmin, Rmax, Rmid, trange, Radius;
@@ -148 +149 @@
   int TrianglePts  = wordhash ("TRI-");
 
-  npts = NPTS = 200;
+  // npts = 200
+  NPTS = 200;
   SetVector (&Xvec, OPIHI_FLT, NPTS);
   SetVector (&Yvec, OPIHI_FLT, NPTS);
@@ -154 +156 @@
   Image *mosaic = NULL;
 
-  ALLOCATE (plist, int, NPTS);
-  n = N = 0;
+  /******** stage 1 : find the images to plot *********/
+
+  // ALLOCATE (plist, int, NPTS);
+  n = 0; // tracks number of images
+  N = 0; // tracks number of vertices
   for (i = 0; i < Nimage; i++) {
     if (ByName && strncmp (image[i].name, name, strlen(name))) continue;
@@ -335 +340 @@
     if (!InPic) continue;
 
-    plist[n] = i;
-    n++;
-    if (n > npts - 1) {
-      npts += 200;
-      REALLOCATE (plist, int, npts);
-    }
-    N+=2*Npts;
+    // plist[n] = i;
+    // n++;
+    // if (n > npts - 1) {
+    //   npts += 200;
+    //   REALLOCATE (plist, int, npts);
+    // }
+    n ++;
+    N += 2*Npts;
     if (N + 16 >= NPTS) {  /* need to leave room for 8 point image */
       NPTS += 400;

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

@@ -14 +14 @@
 int catdir_define   PROTO((int, char **));
 int ccd             PROTO((int, char **));
+int cimages         PROTO((int, char **));
 int cmatch          PROTO((int, char **));
 int cmd             PROTO((int, char **));
@@ -80 +81 @@
   {1, "catdir",      catdir_define,"re-define CATDIR"},
 //  {1, "ccd",         ccd,          "plot color-color diagram"},
+  {1, "cimages",     cimages,      "fill image boxes with a color"},
   {1, "cmatch",      cmatch,       "match two catalogs"},
 //  {1, "cmd",         cmd,          "plot cmd of stars in current region"},

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

@@ -352 +352 @@
   // write vectors to a table (this is used by parallel dvo operations, but can be used elsewhere)
   if (RESULT_FILE && !SKIP_RESULTS) {
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nreturn, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", NULL, vec, Nreturn, FALSE, FALSE, NULL, 0);
     if (!status) goto escape;
   }

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

@@ -148 +148 @@
       // XXX this is now set for both cases...
       CoordsFile = abspath("coords.fits", 1024);
-      int status = WriteVectorTableFITS (CoordsFile, "COORDS", vec, 2, FALSE, FALSE, NULL, 0);
+      int status = WriteVectorTableFITS (CoordsFile, "COORDS", NULL, vec, 2, FALSE, FALSE, NULL, 0);
       if (!status) goto escape;
     }
@@ -349 +349 @@
       vec[Nfields-1] = IDXvec;
     }
-    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", vec, Nfields, FALSE, FALSE, NULL, 0);
+    int status = WriteVectorTableFITS (RESULT_FILE, "RESULT", NULL, vec, Nfields, FALSE, FALSE, NULL, 0);
     if (!status) goto escape;
   }