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

Timestamp:

Aug 20, 2009, 11:49:09 AM (17 years ago)

Author:

watersc1

Message:

 

File:

• branches/czw_branch/cleanup/ippScripts/scripts/publish_file.pl (modified) (7 diffs)

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

@@ -39 +39 @@
 
 # Parse the command-line arguments
-my ( $pub_id, $exp_id, $camera, $stage, $stage_id, $format, $product, $workdir );
+my ( $pub_id, $camera, $stage, $stage_id, $format, $product, $workdir );
 my ( $dbname, $verbose, $no_update, $save_temps, $redirect );
 
 GetOptions(
     'pub_id=s'          => \$pub_id, # Publish identifier
-    'exp_id=s'          => \$exp_id, # Exposure identifier
     'camera=s'          => \$camera, # Camera name
     'stage=s'           => \$stage,       # Stage of interest
@@ -58 +57 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --pub_id --exp_id --camera --stage --stage_id --product --workdir",
+pod2usage( -msg => "Required options: --pub_id --camera --stage --stage_id --product --workdir",
            -exitval => $PS_EXIT_CONFIG_ERROR) unless
     defined $pub_id and
-    defined $exp_id and
     defined $camera and
     defined $product and
@@ -68 +66 @@
     defined $workdir;
 
-my $outroot = "$workdir/$product.$pub_id.$exp_id"; # Output root name
+my $outroot = "$workdir/$product.$pub_id"; # Output root name
 
 my $ipprc = PS::IPP::Config->new( $camera ) or
@@ -83 +81 @@
 my %files;                      # Input filenames
 my %zp;                         # Zero points
+my %exp_id;                     # Exposure identifiers
+my %exp_name;                   # Exposure names
+my %direction;                  # Direction of subtraction
 {
     my $command;                # Command to run
@@ -114 +115 @@
         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_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};
+            }
+
         } elsif ($stage eq 'camera') {
             my $cam_id = $comp->{cam_id};
             $files{$cam_id} = $ipprc->filename( "PSASTRO.OUTPUT", $path_base );
             $zp{$cam_id} = $zp;
+            $exp_id{$cam_id} = $comp->{exp_id};
+            $exp_name{$cam_id} = $comp->{exp_name};
+            $direction{$cam_id} = 1;
         }
     }
@@ -137 +153 @@
 
     my $zp = $zp{$comp};
+    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";
@@ -142 +161 @@
             &my_die( "Unable to resolve output file $outuri", $pub_id, $PS_EXIT_SYS_ERROR);
 
-        my $command = "$ppMops $file $zp $out";
+        my $command = "$ppMops $file $zp $exp_id $exp_name $direction $out";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);