Changeset 18153 for branches/cleanup/ippTools/src/dettool.c

Timestamp:

Jun 16, 2008, 1:49:43 PM (18 years ago)

Author:

jhoblitt

Message:

MERGE from HEAD

File:

• branches/cleanup/ippTools/src/dettool.c (modified) (4 diffs)

branches/cleanup/ippTools/src/dettool.c

@@ -535 +535 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
+    PXOPT_LOOKUP_BOOL(randomSubset, config->args, "-random_subset", false);
+    PXOPT_LOOKUP_S32(randomLimit, config->args, "-random_limit", false, false);
+
     PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
     PXOPT_LOOKUP_TIME(time_begin, config->args, "-time_begin", false, false);
@@ -549 +552 @@
     PXOPT_COPY_STR(config->args, where, "-select_uri", "uri", "==");
     PXOPT_COPY_TIME(config->args, where, "-select_dateobs_begin", "dateobs", ">=");
-    PXOPT_COPY_TIME(config->args, where, "-select_dateobs_end", "dateobs", "<");
+    PXOPT_COPY_TIME(config->args, where, "-select_dateobs_end", "dateobs", "<=");
     PXOPT_COPY_F32(config->args, where, "-select_airmass_min", "airmass", ">=");
     PXOPT_COPY_F32(config->args, where, "-select_airmass_max", "airmass", "<=");
@@ -557 +560 @@
     PXOPT_COPY_F32(config->args, where, "-select_ccd_temp_min", "ccd_temp", ">=");
     PXOPT_COPY_F32(config->args, where, "-select_ccd_temp_max", "ccd_temp", "<=");
+    PXOPT_COPY_F32(config->args, where, "-select_pon_time_min", "pon_time", ">=");
+    PXOPT_COPY_F32(config->args, where, "-select_pon_time_max", "pon_time", "<=");
     PXOPT_COPY_F32(config->args, where, "-select_posang_min", "posang", ">=");
     PXOPT_COPY_F32(config->args, where, "-select_posang_max", "posang", "<=");
@@ -584 +589 @@
         psFree(detrendExps);
         return true;
+    }
+
+    if (randomSubset && (randomLimit < detrendExps->n)) {
+      // generate a random-valued vector, return an index sorted by the random values
+      psVector *randomVector = psVectorAlloc(detrendExps->n, PS_TYPE_F32); // random values
+      psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0);
+      for (int i = 0; i < randomVector->n; i++) {
+        randomVector->data.F32[i] = psRandomUniform(rng);
+      }
+      psVector *indexVector = psVectorSortIndex(NULL, randomVector);
+
+      // accept for first n of the sequence
+      psArray *subset = psArrayAlloc (randomLimit);
+      for (int i = 0; i < randomLimit; i++ ){
+        int j = indexVector->data.S32[i];
+        subset->data[i] = psMemIncrRefCounter (detrendExps->data[j]);
+      }
+      psFree (detrendExps);
+      detrendExps = subset;
     }