Changeset 34358 for trunk

Timestamp:

Aug 25, 2012, 4:56:08 PM (14 years ago)

Author:

bills

Message:

look for stacks with both major lap labels

File:

• trunk/tools/dlapstacks (modified) (4 diffs)

trunk/tools/dlapstacks

@@ -13 +13 @@
 # allow mask and variance images to be displayed as well
 
-my $label   = 'LAP.ThreePi.20110809';
+my $label;
+my $label1  = 'LAP.ThreePi.20120706';
+my $label2  = 'LAP.ThreePi.20110809';
 my $tess_id = 'RINGS.V3';
 
@@ -55 +57 @@
 $ra = shift;
 $dec = shift;
+# if neither label or data_group were supplied set default label
+if (!$label and !$data_group) {
+    $label = $label1;
+} else {
+    # drop label2
+    $label2 = undef;
+}
+    
 
 pod2usage( -msg => 'if ra is suplied <dec> must be supplied as well', -exitval => 2)
@@ -90 +100 @@
 # don't allow MD label unless it's a refstack.
 # Nightly stacks have too many images
-if (($data_group && ($data_group =~ /MD/)) or ($label =~ /^MD/)) {
+if (($data_group && ($data_group =~ /MD/)) or (defined $label and $label =~ /^MD/)) {
     unless ($data_group or uc($label) =~ /REF/) {
         die "cannot use this program for label $label without data_group because that will most likely select nightly stacks and we will match an unreasonably large number of matches. Talk to Bill\n";
@@ -124 +134 @@
 if ($data_group) {
     $query .= " AND data_group = '$data_group'";
+} elsif ($label2) {
+    $query .= " AND (label = '$label' OR label = '$label2')";
 } else {
     $query .= " AND label = '$label'";