Changeset 34041 for branches/meh_branches/ppstack_test/Ohana/src/opihi/dvo/skycoverage.c

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/skycoverage.c (modified) (6 diffs)

branches/meh_branches/ppstack_test/Ohana/src/opihi/dvo/skycoverage.c

@@ -1 +1 @@
 # include "dvoshell.h"
 
+// enum to define possible modes
+enum {COVERAGE, DENSITY, MIN_UBERCAL, MIN_DMAG_SYS, MIN_MCAL, MAX_MCAL, MIN_TIME, MAX_TIME};
+
 int wordhash (char *word);
 
 int skycoverage (int argc, char **argv) {
 
-  int WITH_MOSAIC, SOLO_MOSAIC, ShowDensity;
+  int WITH_MOSAIC, SOLO_MOSAIC, mode;
   off_t i, Nimage;
   int N, status, TimeSelect, ByName, xs, ys;
@@ -20 +23 @@
   PhotCode *PhotcodeValue;
 
+  time_t TimeReference;
+  int TimeFormat;
+
+  GetTimeFormat (&TimeReference, &TimeFormat);
+
   WITH_MOSAIC = FALSE;
   if ((N = get_argument (argc, argv, "+mosaic"))) {
@@ -60 +68 @@
   }
 
-  ShowDensity = FALSE;
+  mode = COVERAGE;
   if ((N = get_argument (argc, argv, "-density"))) {
     remove_argument (N, &argc, argv);
-    ShowDensity = TRUE;
+    mode = DENSITY;
+  }
+  if ((N = get_argument (argc, argv, "-min-ubercal"))) {
+    remove_argument (N, &argc, argv);
+    mode = MIN_UBERCAL;
+  }
+  if ((N = get_argument (argc, argv, "-min-time"))) {
+    remove_argument (N, &argc, argv);
+    mode = MIN_TIME;
+  }
+  if ((N = get_argument (argc, argv, "-max-time"))) {
+    remove_argument (N, &argc, argv);
+    mode = MAX_TIME;
+  }
+  if ((N = get_argument (argc, argv, "-min-dmag-sys"))) {
+    remove_argument (N, &argc, argv);
+    mode = MIN_DMAG_SYS;
+  }
+  if ((N = get_argument (argc, argv, "-min-mcal"))) {
+    remove_argument (N, &argc, argv);
+    mode = MIN_MCAL;
+  }
+  if ((N = get_argument (argc, argv, "-max-mcal"))) {
+    remove_argument (N, &argc, argv);
+    mode = MAX_MCAL;
   }
 
@@ -194 +226 @@
   V = (float *)buf[0].matrix.buffer;
 
+  // init the V array (depends on mode)
   for (ys = 0; ys < Ny; ys++) {
     for (xs = 0; xs < Nx; xs++) {
@@ -199 +232 @@
       status &= (r >= 0);
       status &= (r <= 360);
+      // are we in a part of the projection covering the sky or not?
       if (status) {
-        V[ys*Nx + xs] = ShowDensity ?  0 : 2;
+        switch (mode) {
+          case COVERAGE:
+            V[ys*Nx + xs] = 2;
+            break;
+          case DENSITY:
+            V[ys*Nx + xs] = 0;
+            break;
+          case MIN_UBERCAL:
+          case MIN_DMAG_SYS:
+          case MIN_MCAL:
+          case MIN_TIME:
+            V[ys*Nx + xs] = 1E9;
+            break;
+          case MAX_MCAL:
+          case MAX_TIME:
+            V[ys*Nx + xs] = -1E9;
+            break;
+        }
       } else {
-        V[ys*Nx + xs] = ShowDensity ? NAN : 0;
+        switch (mode) {
+          case COVERAGE:
+            V[ys*Nx + xs] = 0;
+            break;
+          case DENSITY:
+          case MIN_UBERCAL:
+          case MIN_DMAG_SYS:
+          case MIN_MCAL:
+          case MAX_MCAL:
+          case MIN_TIME:
+          case MAX_TIME:
+            V[ys*Nx + xs] = NAN;
+            break;
+        }
       }
     }
@@ -257 +321 @@
           xs = (int)Xs;
           ys = (int)Ys;
-          if (ShowDensity) {
+          switch (mode) {
+            case COVERAGE:
+              V[ys*Nx + xs] = 1;
+              break;
+            case DENSITY:
               V[ys*Nx + xs] += 1;
-          } else {
-              V[ys*Nx + xs] = 1;
+              break;
+            case MIN_UBERCAL:
+              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].ubercalDist);
+              break;
+            case MIN_DMAG_SYS:
+              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].dMagSys);
+              break;
+            case MIN_MCAL:
+              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], image[i].Mcal);
+              break;
+            case MAX_MCAL:
+              V[ys*Nx + xs] = MAX(V[ys*Nx + xs], image[i].Mcal);
+              break;
+            case MIN_TIME: {
+              double timeVal = TimeValue (image[i].tzero, TimeReference, TimeFormat);
+              V[ys*Nx + xs] = MIN(V[ys*Nx + xs], timeVal);
+              break; }
+            case MAX_TIME: {
+              double timeVal = TimeValue (image[i].tzero, TimeReference, TimeFormat);
+              V[ys*Nx + xs] = MAX(V[ys*Nx + xs], timeVal);
+              break; }
           }
         }