Changeset 31450 for trunk/Ohana/src/opihi

Timestamp:

May 5, 2011, 10:43:45 AM (15 years ago)

Author:

eugene

Message:

various improvements to relphot, related support

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (1 diff)
• cmd.data/gridify.c (modified) (3 diffs)
• cmd.data/init.c (modified) (2 diffs)
• cmd.data/vshift.c (copied) (copied from branches/eam_branches/ipp-20110404/Ohana/src/opihi/cmd.data/vshift.c )
• dvo/Makefile (modified) (1 diff)
• dvo/avextract.c (modified) (3 diffs)
• dvo/init.c (modified) (2 diffs)
• dvo/objectcoverage.c (copied) (copied from branches/eam_branches/ipp-20110404/Ohana/src/opihi/dvo/objectcoverage.c )

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

@@ -141 +141 @@
 $(SRC)/vpop.$(ARCH).o              \
 $(SRC)/vroll.$(ARCH).o             \
+$(SRC)/vshift.$(ARCH).o            \
 $(SRC)/vsmooth.$(ARCH).o           \
 $(SRC)/vstats.$(ARCH).o            \

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

@@ -4 +4 @@
 
   int i, Nx, Ny, Xb, Yb, Normalize, N;
-  float Xmin, Xmax, dX, Ymin, Ymax, dY;
+  float Xmin, Xmax, dX, Ymin, Ymax, dY, initValue;
   float *buf, *val;
   int *Nval;
@@ -15 +15 @@
     remove_argument (N, &argc, argv);
     Normalize = FALSE;
+  }
+
+  initValue = 0.0;
+  if ((N = get_argument (argc, argv, "-init-value"))) {
+    remove_argument (N, &argc, argv);
+    initValue = atof(argv[N]);
+    remove_argument (N, &argc, argv);
   }
 
@@ -69 +76 @@
   buf = (float *) bf[0].matrix.buffer;
   for (i = 0; i < Nx*Ny; i++) {
+    buf[i] = initValue;
     if (Normalize) {
       if (Nval[i] == 0) {
-        buf[i] = 0;
         continue;
       }

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

@@ -130 +130 @@
 int vstats           PROTO((int, char **));
 int vroll            PROTO((int, char **));
+int vshift           PROTO((int, char **));
 int vpop             PROTO((int, char **));
 int vsmooth          PROTO((int, char **));
@@ -274 +275 @@
   {1, "vmaxwell",     vmaxwell,         "fit a Maxwellian to a vector"},
   {1, "vpop",         vpop,             "remove first element of a vector"},
-  {1, "vroll",        vroll,            "roll vector elements"},
+  {1, "vroll",        vroll,            "roll vector elements by 1 entry"},
+  {1, "vshift",       vshift,           "shift vector elements by arbitrary amount"},
   {1, "vsmooth",      vsmooth,          "Gaussian smooth of a vector"},
   {1, "vstats",       vstats,           "statistics on a vector"},

trunk/Ohana/src/opihi/dvo/Makefile

@@ -80 +80 @@
 $(SRC)/mextract.$(ARCH).o               \
 $(SRC)/mmextract.$(ARCH).o              \
+$(SRC)/objectcoverage.$(ARCH).o         \
 $(SRC)/photcodes.$(ARCH).o              \
 $(SRC)/pmeasure.$(ARCH).o               \

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

@@ -5 +5 @@
   off_t i, j, n, m;
   int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
-  int Nsecfilt, mode, VERBOSE;
+  int Nsecfilt, mode, VERBOSE, needMeasures;
   char **cstack, name[1024];
   void *Signal;
@@ -101 +101 @@
   }
 
+  // check the requested fields : are all average/secfilt entries, or do we need measures?
+  needMeasures = FALSE;
+  for (i = 0; !needMeasures && (i < Nfields); i++) {
+    if (fields[i].magMode == MAG_NONE) continue;
+    if (fields[i].photcode == NULL) continue; // assert this?
+    if (fields[i].photcode[0].type == PHOT_REF) needMeasures = TRUE;
+    if (fields[i].photcode[0].type == PHOT_DEP) needMeasures = TRUE;
+  }
+
   // grab data from all selected sky regions
   Signal = signal (SIGINT, handle_interrupt);
@@ -107 +116 @@
     /* lock, load, unlock catalog */
     catalog.filename = skylist[0].filename[i];
-    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+    catalog.catflags = LOAD_AVES | LOAD_SECF;
+    if (needMeasures) {
+      catalog.catflags |= LOAD_MEAS;
+    }
     catalog.Nsecfilt = 0;
 

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

@@ -40 +40 @@
 int lightcurve      PROTO((int, char **));
 int mextract        PROTO((int, char **));
-int mmextract        PROTO((int, char **));
+int mmextract       PROTO((int, char **));
+int objectcoverage  PROTO((int, char **));
 int pcat            PROTO((int, char **));
 int photcodes       PROTO((int, char **));
@@ -92 +93 @@
   {1, "mextract",    mextract,     "extract measure data values"},
   {1, "mmextract",   mmextract,    "extract joined measurements"},
+  {1, "objectcoverage", objectcoverage, "plot catalog boundaries"},
   {1, "pcat",        skycat,       "plot catalog boundaries"},
   {1, "photcodes",   photcodes,    "list photometry codes"},