Changeset 25158 for branches/czw_branch/cleanup/ippScripts/scripts/publish_file.pl

Timestamp:

Aug 20, 2009, 12:42:13 PM (17 years ago)

Author:

watersc1

Message:

More merging

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (5 diffs)

branches/czw_branch/cleanup/ippScripts/scripts/publish_file.pl

@@ -83 +83 @@
 my %exp_id;                     # Exposure identifiers
 my %exp_name;                   # Exposure names
-my %direction;                  # Direction of subtraction
 {
     my $command;                # Command to run
@@ -115 +114 @@
         if ($stage eq 'diff') {
             my $skycell_id = $comp->{skycell_id};
-
-            # Positive direction
             $files{"$skycell_id.pos"} = $ipprc->filename( "PPSUB.OUTPUT.SOURCES", $path_base );
+            $files{"$skycell_id.neg"} = $ipprc->filename( "PPSUB.INVERSE.SOURCES", $path_base ) if
+                defined $comp->{bothways} and $comp->{bothways};
             $zp{"$skycell_id.pos"} = $zp;
+            $zp{"$skycell_id.neg"} = $zp if defined $comp->{bothways} and $comp->{bothways};
             $exp_id{"$skycell_id.pos"} = $comp->{exp_id_1};
+            $exp_id{"$skycell_id.neg"} = $comp->{exp_id_2} if defined $comp->{bothways} and $comp->{bothways};
             $exp_name{"$skycell_id.pos"} = $comp->{exp_name_1};
-            $direction{"$skycell_id.pos"} = 1;
-
-            # Negative direction
-            if (defined $comp->{bothways} and $comp->{bothways}) {
-                $files{"$skycell_id.neg"} = $ipprc->filename( "PPSUB.INVERSE.SOURCES", $path_base );
-                $zp{"$skycell_id.neg"} = $zp;
-                $exp_id{"$skycell_id.neg"} = $comp->{exp_id_2};
-                $direction{"$skycell_id.neg"} = 0;
-                $exp_name{"$skycell_id.neg"} = $comp->{exp_name_2};
-            }
-
+            $exp_name{"$skycell_id.neg"} = $comp->{exp_name_2} if defined $comp->{bothways} and $comp->{bothways};
         } elsif ($stage eq 'camera') {
             my $cam_id = $comp->{cam_id};
@@ -138 +129 @@
             $exp_id{$cam_id} = $comp->{exp_id};
             $exp_name{$cam_id} = $comp->{exp_name};
-            $direction{$cam_id} = 1;
         }
     }
@@ -155 +145 @@
     my $exp_id = $exp_id{$comp};
     my $exp_name = $exp_name{$comp};
-    my $direction = $direction{$comp};
     if ($product eq "IPP-MOPS") {
         my $outuri = "$outroot.$comp.fits";
@@ -161 +150 @@
             &my_die( "Unable to resolve output file $outuri", $pub_id, $PS_EXIT_SYS_ERROR);
 
-        my $command = "$ppMops $file $zp $exp_id $exp_name $direction $out";
+        my $command = "$ppMops $file $zp $exp_id $exp_name $out";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);