Changeset 39150 for trunk

Timestamp:

Nov 17, 2015, 10:01:24 AM (11 years ago)

Author:

bills

Message:

started to add code to handle csv files but it doesn't work.
Add option to skip adding the delta columns.
For a full stack batch we have more than 999 columns and that doesn't work. So in that case
tell joinstackcmf to skip the joins to xsrc and xfit tables. The comparision code doesn't
use them.

File:

• trunk/tools/bills/comparestackdetections (modified) (6 diffs)

trunk/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";
     }