Changeset 33023 for branches/haf_add201112/ippScripts/scripts/addstar_run.pl

Timestamp:

Dec 24, 2011, 3:28:40 PM (15 years ago)

Author:

heather

Message:

smore changes: handles -uncensored properly (well for queuing, it queues
things regardless of magicked state, as we copy a backup of the uncensored
files), and some debugging to get minidvodb's relphot'd and resorted properly
(some typos)

File:

• branches/haf_add201112/ippScripts/scripts/addstar_run.pl (modified) (2 diffs)

branches/haf_add201112/ippScripts/scripts/addstar_run.pl

@@ -115 +115 @@
 # it was PSASTRO.OUTPUT
 
-my $fpaObjects;
+my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT", $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+
 if ($stage =~ /cam/) {
     # if it is cam stage we need to be careful when grabbing the filename. 
@@ -150 +151 @@
         #is this cam_id magicked or not?
         if ($magicked) {
-            $fpaObjects = $ipprc->destreak_filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
+            $fpaObjects = $ipprc->destreaked_filename("$fpaObjects") or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
             print "cam_id is magicked, using $fpaObjects for the cam smf\n";
         } else {
-            
-            $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
             print "cam_id is NOT magicked, using $fpaObjects for the cam smf\n";
         }
     }
-} else {
-    # for non cam stages, grabe the file name like this:
-    $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",     $stageroot) or &my_die("Missing entry from camera config", $add_id, $PS_EXIT_CONFIG_ERROR);
 }
 if (($stage =~/staticsky/) || ($stage =~/stack/)) {