Changeset 33963 for trunk/Ohana/src/opihi/dvo/skycoverage.c

Timestamp:

May 30, 2012, 1:46:12 PM (14 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20120405

Location:

trunk

Files:

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

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

@@ -2 +2 @@
 
 // enum to define possible modes
-enum {COVERAGE, DENSITY, MIN_UBERCAL, MIN_DMAG_SYS, MIN_MCAL, MAX_MCAL};
+enum {COVERAGE, DENSITY, MIN_UBERCAL, MIN_DMAG_SYS, MIN_MCAL, MAX_MCAL, MIN_TIME, MAX_TIME};
 
 int wordhash (char *word);
@@ -23 +23 @@
   PhotCode *PhotcodeValue;
 
+  time_t TimeReference;
+  int TimeFormat;
+
+  GetTimeFormat (&TimeReference, &TimeFormat);
+
   WITH_MOSAIC = FALSE;
   if ((N = get_argument (argc, argv, "+mosaic"))) {
@@ -71 +76 @@
     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"))) {
@@ -231 +244 @@
           case MIN_DMAG_SYS:
           case MIN_MCAL:
-            V[ys*Nx + xs] = 1E6;
+          case MIN_TIME:
+            V[ys*Nx + xs] = 1E9;
             break;
           case MAX_MCAL:
-            V[ys*Nx + xs] = -1E6;
+          case MAX_TIME:
+            V[ys*Nx + xs] = -1E9;
             break;
         }
@@ -247 +262 @@
           case MIN_MCAL:
           case MAX_MCAL:
+          case MIN_TIME:
+          case MAX_TIME:
             V[ys*Nx + xs] = NAN;
             break;
@@ -323 +340 @@
               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; }
           }
         }