Changeset 39115 for trunk

Timestamp:

Nov 12, 2015, 2:50:33 PM (11 years ago)

Author:

bills

Message:

when checking for outliers, read in the original column and then only
look at deltas where the values are not -999

File:

• trunk/tools/bills/adddeltacolumns (modified) (5 diffs)

trunk/tools/bills/adddeltacolumns

@@ -46 +46 @@
 # foreach my $line (<C>) {
 my @deltas;
+my @columns;
 foreach my $line (@lines) {
     next if $line =~ '^#';
@@ -61 +62 @@
     $cmd .=  "addcol -after $p2 $dcol $equation;";
     push @deltas, $dcol;
+    push @columns, $p2;
 }
 $cmd .= "'";
@@ -80 +82 @@
 output /dev/null
 macro checkdelta
-    \$col = \$1
+    \$dcol = \$1
+    \$col = \$2
     \$thislimit = \$limit
-    \$length = \$col[]
+    set goodmask = \$col != -999
+    subset good = \$dcol where goodmask == 1
+    \$length = good[]
     for i 0 10
-        subset d = \$col where abs(\$col) > \$thislimit
+        subset d = good where abs(good) > \$thislimit
         \$noutliers = d[]
         if (\$noutliers > 0) 
-            echo \$col has \$noutliers out of \$length with difference > \$thislimit
+            echo \$dcol has \$noutliers out of \$length with difference > \$thislimit
             \$thislimit = \$thislimit * 10
         else
@@ -97 +102 @@
 
     print $manafile "\nmacro dotests\n";
-    foreach my $col (@deltas) {
-        print $manafile "    checkdelta $col\n";
+    my $n = scalar @deltas;
+    for (my $i=0; $i < $n; $i++) {
+        my $col = $columns[$i];
+        my $dcol = $deltas[$i];
+        print $manafile "    checkdelta $dcol $col\n";
     }
     print $manafile "end\n";
@@ -105 +113 @@
     print $manafile "read -fits Joined";
     foreach my $col (@deltas) {
+        print $manafile " $col";
+    }
+    print $manafile "\n";
+    print $manafile "read -fits Joined";
+    foreach my $col (@columns) {
         print $manafile " $col";
     }