Changeset 27517 for branches/eam_branches/20100225/tools/delete_convolved_diff.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• tools/delete_convolved_diff.pl (modified) (3 diffs)

branches/eam_branches/20100225/tools/delete_convolved_diff.pl

@@ -12 +12 @@
 use constant EXT => [ 'inConv.fits', 'inConv.mk.fits', 'inConv.wt.fits',
                       'refConv.fits', 'refConv.mk.fits', 'refConv.wt.fits' ]; # Extensions to delete
+
+my $hostname = `hostname`;      # Name of host
+chomp $hostname;
+
 
 my ($db_host, $db_name, $db_user, $db_pw); # Database details
@@ -42 +46 @@
 my @files;                      # Files to clean up
 {
-    my $sql = "SELECT path_base FROM diffSkyfile JOIN diffRun USING(diff_id) JOIN magicRun USING(diff_id) WHERE diffRun.state IN ('full', 'drop') AND magicRun.state IN ('full', 'drop', 'censored')";
+
+    my $sql = <<SQL_DONE;
+SELECT path_base
+FROM diffRun
+JOIN diffSkyfile USING(diff_id)
+JOIN magicRun USING(diff_id)
+WHERE diffRun.state IN ('full', 'drop')
+    AND magicRun.state IN ('full', 'drop', 'censored')
+    AND diffRun.bothways = 0
+    AND diffSkyfile.hostname = '$hostname'
+UNION
+SELECT path_base
+FROM diffRun
+JOIN diffSkyfile USING(diff_id)
+JOIN magicRun AS magicPositive
+    ON magicPositive.diff_id = diffRun.diff_id
+    AND magicPositive.inverse = 0
+JOIN magicRun AS magicNegative
+    ON magicNegative.diff_id = diffRun.diff_id
+    AND magicNegative.inverse = 1
+WHERE diffRun.state IN ('full', 'drop')
+    AND magicPositive.state IN ('full', 'drop', 'censored')
+    AND magicNegative.state IN ('full', 'drop', 'censored')
+    AND diffRun.bothways = 1
+    AND diffSkyfile.hostname = '$hostname'
+SQL_DONE
+
     my $results = $db->selectall_arrayref( $sql ) or die "Unable to execute SQL: $DBI::errstr";
     foreach my $result ( @$results ) {
@@ -52 +82 @@
             print "$file\n";
             eval { $neb->delete($file); };
+#            $file = eval { $neb->find($file); };
+#            print "--> $file\n";
         }
     }