Changeset 32534 for trunk/ippScripts/scripts

Timestamp:

Oct 11, 2011, 1:40:52 PM (15 years ago)

Author:

watersc1

Message:

Check that the diff_id values match for exposures we've paired. If this isn't the case, do not set them as a pair. If we have not made any diffs, these will both be MAX_INT/NULL, and will therefore match each other.

This should prevent the creation of diffs that don't do anything.

File:

• trunk/ippScripts/scripts/lap_science.pl (modified) (1 diff)

trunk/ippScripts/scripts/lap_science.pl

@@ -457 +457 @@
             my $exp_B = ${ $exposures }[$indexing{$exp_id_B}];
             print "$exp_A $exp_B $exp_id_A $exp_id_B $indexing{$exp_id_A} $indexing{$exp_id_B}\n";
-            $exp_A->{pairwise} = 1;
-            $exp_A->{pair_id} = $exp_B->{chip_id};
-            
-            $exp_B->{pairwise} = 1;
-            $exp_B->{pair_id} = $exp_A->{chip_id};
-            
-            if ($verbose) {
-                print "LAP_DIFFS: $object: $exp_A->{exp_id} and $exp_B->{exp_id} are a pair\n";
+            if ($exp_A->{diff_id} == $exp_B->{diff_id}) {
+                $exp_A->{pairwise} = 1;
+                $exp_A->{pair_id} = $exp_B->{chip_id};
+                
+                $exp_B->{pairwise} = 1;
+                $exp_B->{pair_id} = $exp_A->{chip_id};
+                if ($verbose) {
+                    print "LAP_DIFFS: $object: $exp_A->{exp_id} and $exp_B->{exp_id} are a pair\n";
+                }
+            }
+            else {
+                $exp_A->{pairwise} = 0;
+                $exp_B->{pairwise} = 0;
             }
         }