Changeset 39224 for branches/eam_branches/ipp-20151113/tools/bills/comparestackdetections

Timestamp:

Dec 3, 2015, 4:14:24 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20151113

Files:

• . (modified) (1 prop)
• tools/bills/comparestackdetections (modified) (6 diffs)

branches/eam_branches/ipp-20151113/tools/bills/comparestackdetections

@@ -22 +22 @@
 my $testdata;
 
-my ($checkdeltas, $verbose, $save_temps);
+my ($checkdeltas, $just_join, $verbose, $save_temps);
 
 my $label = 'SAS.20141118.sc8';
@@ -30 +30 @@
     "testdata=s"        =>  \$testdata,
     "join=s"            =>  \$joinType,
+    "just-join"         =>  \$just_join,
     "check"             =>  \$checkdeltas,
     "verbose|v"         =>  \$verbose,
@@ -90 +91 @@
     $command .= " --test" if $testdata;
     $command .= " --verbose" if $verbose;
+    # FITS has a limit of 999 for the number of columns in a table
+    # If we're adding the delta columns that's too many. So skip the
+    # joins (we heed to run joinstackcmf to add some columns that we need)
+    $command .= " --skip-joins" unless $just_join;
 
     runcommand($command);
@@ -112 +117 @@
     $input = $outfile;
 }
+
+if ($just_join) {
+    rename ($outfile, $out) or die "failed to rename $outfile to $out\n";
+    exit 0;
+}
+
 
 my @deltas;
@@ -141 +152 @@
 
 if ($checkdeltas) {
+    my ($fmt, $sep);
+    if ($out =~ /fits$/) {
+        $fmt = "-fits StackObjectAttributes";
+        $sep = "";
+    } elsif ($out =~ /csv$/) {
+        $fmt = "-csv";
+        $sep = ",";
+    } else {
+        die "don't know how to read $out. Use .fits or .csv\n";
+    }
     $save_temps = 1;
     my ($manafile, $mananame) = tempfile( "/var/tmp/manacmds.XXXX", UNLINK => !$save_temps);
@@ -172 +193 @@
 
     print $manafile "datafile $out\n";
-    print $manafile "read -fits StackObjectAttributes";
+    print $manafile "read $fmt";
+    my $first = 1;
     foreach my $col (@deltas) {
+        if ($sep and !$first) {
+            print $manafile $sep;
+        } else {
+            $first = 0;
+        }
         print $manafile " $col";
     }