Changeset 37431

Timestamp:

Sep 24, 2014, 10:57:13 AM (12 years ago)

Author:

eugene

Message:

adding -camera to ppMops options

File:

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

trunk/ippScripts/scripts/publish_file.pl

@@ -252 +252 @@
                      warp_id => $comp->{warp1},
                      diff_id => $comp->{diff_id},
+                     camera => $comp->{camera},
                      output_format => $comp->{output_format},
                      direction => 1,
@@ -291 +292 @@
                          warp_id => $comp->{warp2},
                          diff_id => $comp->{diff_id},
+                         camera => $comp->{camera},
+                         # missing output_format?
                          direction => 0,
                          comment => $reg_comp->{comment},
@@ -359 +362 @@
     my $name = shift;           # Name of component
 
-    $data->{zp} = $comp->{zp} unless defined $data->{zp};
-    $data->{zp_err} = $comp->{zp_err} unless defined $data->{zp_err};
-    $data->{astrom} = $comp->{astrom} unless defined $data->{astrom};
-    $data->{exp_name} = $comp->{exp_name} unless defined $data->{exp_name};
-    $data->{exp_id} = $comp->{exp_id} unless defined $data->{exp_id};
-    $data->{chip_id} = $comp->{chip_id} unless defined $data->{chip_id};
-    $data->{cam_id} = $comp->{cam_id} unless defined $data->{cam_id};
-    $data->{fake_id} = $comp->{fake_id} unless defined $data->{fake_id};
-    $data->{warp_id} = $comp->{warp_id} unless defined $data->{warp_id};
-    $data->{diff_id} = $comp->{diff_id} unless defined $data->{diff_id};
+    $data->{zp}        = $comp->{zp}        unless defined $data->{zp};
+    $data->{zp_err}    = $comp->{zp_err}    unless defined $data->{zp_err};
+    $data->{astrom}    = $comp->{astrom}    unless defined $data->{astrom};
+    $data->{exp_name}  = $comp->{exp_name}  unless defined $data->{exp_name};
+    $data->{exp_id}    = $comp->{exp_id}    unless defined $data->{exp_id};
+    $data->{chip_id}   = $comp->{chip_id}   unless defined $data->{chip_id};
+    $data->{cam_id}    = $comp->{cam_id}    unless defined $data->{cam_id};
+    $data->{fake_id}   = $comp->{fake_id}   unless defined $data->{fake_id};
+    $data->{warp_id}   = $comp->{warp_id}   unless defined $data->{warp_id};
+    $data->{diff_id}   = $comp->{diff_id}   unless defined $data->{diff_id};
+    $data->{camera}    = $comp->{camera}    unless defined $data->{camera};
+    # missing output_format?
     $data->{direction} = $comp->{direction} unless defined $data->{direction};
-    $data->{comment} = $comp->{comment} unless defined $data->{comment};
-    $data->{obsmode} = $comp->{obsmode} unless defined $data->{obsmode};
-    $data->{difftype} = $comp->{difftype} unless defined $data->{difftype};
-    $data->{sky} = $comp->{sky} unless defined $data->{sky};
-    $data->{shutoutc} = $comp->{shutoutc} unless defined $data->{shutoutc};
+    $data->{comment}   = $comp->{comment}   unless defined $data->{comment};
+    $data->{obsmode}   = $comp->{obsmode}   unless defined $data->{obsmode};
+    $data->{difftype}  = $comp->{difftype}  unless defined $data->{difftype};
+    $data->{sky}       = $comp->{sky}       unless defined $data->{sky};
+    $data->{shutoutc}  = $comp->{shutoutc}  unless defined $data->{shutoutc};
 
     &my_die("zp value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{zp} and $comp->{zp} != $data->{zp};
@@ -386 +391 @@
     &my_die("warp_id value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{warp_id} and $comp->{warp_id} != $data->{warp_id};
     &my_die("diff_id value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{diff_id} and $comp->{diff_id} != $data->{diff_id};
+    &my_die("camera value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{camera} and $comp->{camera} ne $data->{camera};
     &my_die("direction value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{direction} and $comp->{direction} != $data->{direction};
     &my_die("comment value for $name doesn't match", $pub_id, $PS_EXIT_SYS_ERROR) if defined $data->{comment} and $comp->{comment} ne $data->{comment};
@@ -414 +420 @@
     $command .= " -warp_id " . $data->{warp_id} if defined $data->{warp_id};
     $command .= " -diff_id " . $data->{diff_id} if defined $data->{diff_id};
+    $command .= " -camera " . $data->{camera} if defined $data->{camera};
     $command .= " -inverse" if defined $data->{direction} and $data->{direction} == 0;
     $command .= " -zp " . $data->{zp} if defined $data->{zp};