Changeset 23688 for trunk/ippScripts/scripts
- Timestamp:
- Apr 2, 2009, 2:51:37 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 28 edited
-
. (modified) (1 prop)
-
ippScripts/scripts/camera_exp.pl (modified) (4 diffs)
-
ippScripts/scripts/chip_imfile.pl (modified) (3 diffs)
-
ippScripts/scripts/detrend_correct_imfile.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_norm_apply.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_norm_calc.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_norm_exp.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_process_exp.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_process_imfile.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_reject_exp.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_resid_exp.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_resid_imfile.pl (modified) (1 diff)
-
ippScripts/scripts/detrend_stack.pl (modified) (1 diff)
-
ippScripts/scripts/diff_skycell.pl (modified) (3 diffs)
-
ippScripts/scripts/dist_advancerun.pl (modified) (1 diff)
-
ippScripts/scripts/dist_component.pl (modified) (1 diff)
-
ippScripts/scripts/fake_imfile.pl (modified) (1 diff)
-
ippScripts/scripts/flatcorr_proc.pl (modified) (1 diff)
-
ippScripts/scripts/magic_destreak.pl (modified) (1 diff)
-
ippScripts/scripts/magic_mask.pl (modified) (1 diff)
-
ippScripts/scripts/magic_process.pl (modified) (1 diff)
-
ippScripts/scripts/magic_tree.pl (modified) (1 diff)
-
ippScripts/scripts/register_exp.pl (modified) (1 diff)
-
ippScripts/scripts/register_imfile.pl (modified) (2 diffs)
-
ippScripts/scripts/stack_skycell.pl (modified) (3 diffs)
-
ippScripts/scripts/summit_copy.pl (modified) (1 diff)
-
ippScripts/scripts/warp_overlap.pl (modified) (1 diff)
-
ippScripts/scripts/warp_skycell.pl (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/pap (added) merged: 23511,23520-23521,23532,23578-23581,23596-23599,23603-23604,23606-23608,23619-23621,23638-23639,23641,23646-23648,23651-23653,23656,23672-23674,23677-23684
- Property svn:mergeinfo changed
-
trunk/ippScripts/scripts/camera_exp.pl
r23295 r23688 263 263 &my_die("Unable to perform psastro: $error_code", $cam_id, $error_code); 264 264 } 265 # XXX do we want to give an error if astrometry fails here? 266 &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects); 267 265 266 my $quality; # Quality flag 268 267 if ($do_stats) { 269 268 my $fpaStatsReal = $ipprc->file_resolve($fpaStats); … … 282 281 } 283 282 chomp $cmdflags; 283 284 ($quality) = $cmdflags =~ /-quality (\d+)/; 285 } 286 287 if (!$quality) { 288 &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects); 284 289 } 285 290 … … 375 380 $command .= " -addprocessedexp"; 376 381 $command .= " -uri UNKNOWN"; 377 $command .= " - code$exit_code";382 $command .= " -fault $exit_code"; 378 383 $command .= " -path_base $outroot"; 379 384 $command .= " -path_base $outroot" if defined $outroot; … … 381 386 } else { 382 387 $command .= " -updateprocessedexp"; 383 $command .= " - code$exit_code";388 $command .= " -fault $exit_code"; 384 389 } 385 390 $command .= " -hostname $host" if defined $host; -
trunk/ippScripts/scripts/chip_imfile.pl
r23588 r23688 181 181 ## allow the output images to be optional, depending on the recipe / reduction class 182 182 my $outputImageExpect = metadataLookupBool($recipeData, 'CHIP.FITS'); 183 if ($outputImageExpect) {184 &my_die("Couldn't find expected output file: $outputImage\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);185 }186 187 183 my $outputMaskExpect = metadataLookupBool($recipeData, 'CHIP.MASK.FITS'); 188 if ($outputMaskExpect) {189 &my_die("Couldn't find expected output file: $outputMask\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);190 }191 192 184 my $outputWeightExpect = metadataLookupBool($recipeData, 'CHIP.VARIANCE.FITS'); 193 if ($outputWeightExpect) { 194 &my_die("Couldn't find expected output file: $outputWeight\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight); 195 } 196 197 &my_die("Couldn't find expected output file: $outputBin1\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1); 198 &my_die("Couldn't find expected output file: $outputBin2\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2); 199 185 186 my $quality; # Quality flag 200 187 if ($do_stats) { 201 188 my $outputStatsReal = $ipprc->file_resolve($outputStats); … … 214 201 } 215 202 chomp $cmdflags; 216 } 203 ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 204 } 205 206 if (!$quality) { 207 &my_die("Couldn't find expected output file: $outputImage\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputImageExpect or $ipprc->file_exists($outputImage); 208 &my_die("Couldn't find expected output file: $outputMask\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputMaskExpect or $ipprc->file_exists($outputMask); 209 &my_die("Couldn't find expected output file: $outputWeight\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless !$outputWeightExpect or $ipprc->file_exists($outputWeight); 210 &my_die("Couldn't find expected output file: $outputBin1\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1); 211 &my_die("Couldn't find expected output file: $outputBin2\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2); 212 } 213 217 214 } 218 215 … … 277 274 $command .= " -chip_id $chip_id"; 278 275 $command .= " -class_id $class_id"; 279 $command .= " - code$exit_code";276 $command .= " -fault $exit_code"; 280 277 $command .= " -dbname $dbname" if defined $dbname; 281 278 system ($command); -
trunk/ippScripts/scripts/detrend_correct_imfile.pl
r23295 r23688 132 132 $command .= " -class_id $class_id"; 133 133 $command .= " -path_base $outroot"; 134 $command .= " - code$exit_code";134 $command .= " -fault $exit_code"; 135 135 $command .= " -dbname $dbname" if defined $dbname; 136 136 system ($command); -
trunk/ippScripts/scripts/detrend_norm_apply.pl
r23464 r23688 206 206 $command .= " -class_id $class_id"; 207 207 $command .= " -path_base $outroot"; 208 $command .= " - code$exit_code";208 $command .= " -fault $exit_code"; 209 209 $command .= " -dbname $dbname" if defined $dbname; 210 210 system ($command); -
trunk/ippScripts/scripts/detrend_norm_calc.pl
r23464 r23688 239 239 $command .= " -iteration $iter"; 240 240 # XXX EAM : we should add this to the db : $command .= " -path_base $outroot"; 241 $command .= " - code$exit_code";241 $command .= " -fault $exit_code"; 242 242 $command .= " -dbname $dbname" if defined $dbname; 243 243 system ($command); -
trunk/ippScripts/scripts/detrend_norm_exp.pl
r23295 r23688 191 191 $command .= " -iteration $iter"; 192 192 $command .= " -path_base $outroot "; 193 $command .= " - code$exit_code";193 $command .= " -fault $exit_code"; 194 194 $command .= " -dbname $dbname" if defined $dbname; 195 195 system ($command); -
trunk/ippScripts/scripts/detrend_process_exp.pl
r23295 r23688 205 205 $command .= " -det_id $det_id"; 206 206 $command .= " -exp_id $exp_id"; 207 $command .= " - code$exit_code";207 $command .= " -fault $exit_code"; 208 208 $command .= " -path_base $outroot"; 209 209 $command .= " -dbname $dbname" if defined $dbname; -
trunk/ippScripts/scripts/detrend_process_imfile.pl
r23464 r23688 195 195 $command .= " -class_id $class_id"; 196 196 $command .= " -path_base $outroot"; 197 $command .= " - code$exit_code";197 $command .= " -fault $exit_code"; 198 198 $command .= " -dbname $dbname" if defined $dbname; 199 199 system ($command); -
trunk/ippScripts/scripts/detrend_reject_exp.pl
r23295 r23688 344 344 $command .= " -iteration $iter"; 345 345 # XXX EAM : we should add this to the db : $command .= " -path_base $outroot"; 346 $command .= " - code$exit_code";346 $command .= " -fault $exit_code"; 347 347 $command .= " -dbname $dbname" if defined $dbname; 348 348 system ($command); -
trunk/ippScripts/scripts/detrend_resid_exp.pl
r23427 r23688 651 651 $command .= " -exp_id $exp_id"; 652 652 $command .= " -path_base $outroot"; 653 $command .= " - code$exit_code";653 $command .= " -fault $exit_code"; 654 654 $command .= " -dbname $dbname" if defined $dbname; 655 655 system ($command); -
trunk/ippScripts/scripts/detrend_resid_imfile.pl
r23464 r23688 265 265 $command .= " -class_id $class_id"; 266 266 $command .= " -path_base $outroot"; 267 $command .= " - code$exit_code";267 $command .= " -fault $exit_code"; 268 268 $command .= " -dbname $dbname" if defined $dbname; 269 269 system ($command); -
trunk/ippScripts/scripts/detrend_stack.pl
r23464 r23688 262 262 $command .= " -class_id $class_id"; 263 263 # XXX EAM : we should add this to the db : $command .= " -path_base $outroot"; 264 $command .= " - code$exit_code";264 $command .= " -fault $exit_code"; 265 265 $command .= " -dbname $dbname" if defined $dbname; 266 266 system ($command); -
trunk/ippScripts/scripts/diff_skycell.pl
r23438 r23688 248 248 &my_die("Unable to perform ppSub: $error_code", $diff_id, $skycell_id, $error_code); 249 249 } 250 &my_die("Couldn't find expected output file: $outputName", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);251 &my_die("Couldn't find expected output file: $outputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);252 &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);253 # &my_die("Couldn't find expected output file: $outputSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);254 # &my_die("Couldn't find expected output file: $bin1Name", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);255 # &my_die("Couldn't find expected output file: $bin2Name", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);256 250 257 251 my $outputStatsReal = $ipprc->file_resolve($outputStats); … … 270 264 } 271 265 chomp $cmdflags; 266 267 my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 268 269 if (!$quality) { 270 &my_die("Couldn't find expected output file: $outputName", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 271 &my_die("Couldn't find expected output file: $outputMask", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 272 &my_die("Couldn't find expected output file: $outputVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance); 273 # &my_die("Couldn't find expected output file: $outputSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 274 # &my_die("Couldn't find expected output file: $bin1Name", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name); 275 # &my_die("Couldn't find expected output file: $bin2Name", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name); 276 } 272 277 } 273 278 … … 304 309 warn($msg); 305 310 if (defined $diff_id and defined $skycell_id and not $no_update) { 306 my $command = "$difftool -adddiffskyfile -diff_id $diff_id -skycell_id $skycell_id - code$exit_code";311 my $command = "$difftool -adddiffskyfile -diff_id $diff_id -skycell_id $skycell_id -fault $exit_code"; 307 312 $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400)); 308 313 $command .= " -hostname $host" if defined $host; -
trunk/ippScripts/scripts/dist_advancerun.pl
r23295 r23688 134 134 my $command = "$disttool -updaterun"; 135 135 $command .= " -dist_id $dist_id"; 136 $command .= " - code$exit_code";136 $command .= " -fault $exit_code"; 137 137 $command .= " -dbname $dbname" if defined $dbname; 138 138 -
trunk/ippScripts/scripts/dist_component.pl
r23441 r23688 304 304 $command .= " -dist_id $dist_id"; 305 305 $command .= " -component $component"; 306 $command .= " - code$exit_code";306 $command .= " -fault $exit_code"; 307 307 $command .= " -dbname $dbname" if defined $dbname; 308 308 -
trunk/ippScripts/scripts/fake_imfile.pl
r23295 r23688 216 216 $command .= " -path_base $outroot"; 217 217 $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400)); 218 $command .= " - code$exit_code";218 $command .= " -fault $exit_code"; 219 219 $command .= " -dbname $dbname" if defined $dbname; 220 220 system ($command); -
trunk/ippScripts/scripts/flatcorr_proc.pl
r20540 r23688 320 320 my $command = "$flatcorr -addprocess"; 321 321 $command .= " -corr_id $corr_id"; 322 $command .= " - code$exit_code";322 $command .= " -fault $exit_code"; 323 323 $command .= " -hostname $host" if defined $host; 324 324 $command .= " -dbname $dbname" if defined $dbname; -
trunk/ippScripts/scripts/magic_destreak.pl
r23636 r23688 274 274 $command .= " -magic_ds_id $magic_ds_id"; 275 275 $command .= " -component $component"; 276 $command .= " - code$exit_code";276 $command .= " -fault $exit_code"; 277 277 $command .= " -dbname $dbname" if defined $dbname; 278 278 -
trunk/ippScripts/scripts/magic_mask.pl
r23295 r23688 152 152 my $command = "$magictool -addmask"; 153 153 $command .= " -magic_id $magic_id"; 154 $command .= " - code$exit_code";154 $command .= " -fault $exit_code"; 155 155 $command .= " -dbname $dbname" if defined $dbname; 156 156 system($command); -
trunk/ippScripts/scripts/magic_process.pl
r23637 r23688 343 343 $command .= " -magic_id $magic_id"; 344 344 $command .= " -node $node"; 345 $command .= " - code$exit_code";345 $command .= " -fault $exit_code"; 346 346 $command .= " -dbname $dbname" if defined $dbname; 347 347 system($command); -
trunk/ippScripts/scripts/magic_tree.pl
r23295 r23688 296 296 my $command = "$magictool -inputtree"; 297 297 $command .= " -magic_id $magic_id"; 298 $command .= " - code$exit_code";298 $command .= " -fault $exit_code"; 299 299 $command .= " -dbname $dbname" if defined $dbname; 300 300 system($command); -
trunk/ippScripts/scripts/register_exp.pl
r23295 r23688 191 191 carp($msg); 192 192 if (defined $exp_id and not $no_update) { 193 my $command = "$regtool -addprocessedexp -exp_id $exp_id - code$exit_code";193 my $command = "$regtool -addprocessedexp -exp_id $exp_id -fault $exit_code"; 194 194 $command .= " -hostname $host" if defined $host; 195 195 $command .= " -dbname $dbname" if defined $dbname; -
trunk/ippScripts/scripts/register_imfile.pl
r23540 r23688 112 112 113 113 # we require at a minimum: -telescope, -inst, -filelevel, -class_id, -exp_type 114 if (uc(&value_for_flag ($cmdflags, " NULL", "-telescope")) eq "NULL") { &my_die ("telescope not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }115 if (uc(&value_for_flag ($cmdflags, " NULL", "-inst")) eq "NULL") { &my_die ("inst not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }116 if (uc(&value_for_flag ($cmdflags, " NULL", "-filelevel")) eq "NULL") { &my_die ("filelevel not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }117 if (uc(&value_for_flag ($cmdflags, " NULL", "-class_id")) eq "NULL") { &my_die ("class_id not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }118 if (uc(&value_for_flag ($cmdflags, " NULL", "-exp_type")) eq "NULL") { &my_die ("exp_type not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); }114 if (uc(&value_for_flag ($cmdflags, "-telescope")) eq "NULL") { &my_die ("telescope not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); } 115 if (uc(&value_for_flag ($cmdflags, "-inst")) eq "NULL") { &my_die ("inst not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); } 116 if (uc(&value_for_flag ($cmdflags, "-filelevel")) eq "NULL") { &my_die ("filelevel not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); } 117 if (uc(&value_for_flag ($cmdflags, "-class_id")) eq "NULL") { &my_die ("class_id not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); } 118 if (uc(&value_for_flag ($cmdflags, "-exp_type")) eq "NULL") { &my_die ("exp_type not found", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR); } 119 119 120 120 my $command = "$regtool -addprocessedimfile"; … … 226 226 $command .= " -inst UNKNOWN"; 227 227 $command .= " -class_id $tmp_class_id"; 228 $command .= " - code$exit_code";228 $command .= " -fault $exit_code"; 229 229 $command .= " -hostname $host" if defined $host; 230 230 $command .= " -dbname $dbname" if defined $dbname; -
trunk/ippScripts/scripts/stack_skycell.pl
r23380 r23688 232 232 &my_die("Unable to perform ppStack: $error_code", $stack_id, $error_code); 233 233 } 234 &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 235 &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 236 &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight); 237 &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 238 # &my_die("Couldn't find expected output file: $bin1Name", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name); 239 # &my_die("Couldn't find expected output file: $bin2Name", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name); 240 234 235 my $quality; # Quality flag 241 236 if ($do_stats) { 242 237 my $outputStatsReal = $ipprc->file_resolve($outputStats); … … 255 250 } 256 251 chomp $cmdflags; 257 } 252 253 ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 254 } 255 256 if (!$quality) { 257 &my_die("Couldn't find expected output file: $outputName", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 258 &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 259 &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight); 260 &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 261 # &my_die("Couldn't find expected output file: $bin1Name", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name); 262 # &my_die("Couldn't find expected output file: $bin2Name", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name); 263 } 264 258 265 } 259 266 … … 306 313 307 314 if (defined $stack_id and not $no_update) { 308 my $command = "$stacktool -stack_id $stack_id - code$exit_code";315 my $command = "$stacktool -stack_id $stack_id -fault $exit_code"; 309 316 if ($run_state eq 'new') { 310 317 $command .= " -addsumskyfile"; -
trunk/ippScripts/scripts/summit_copy.pl
r23497 r23688 148 148 $command .= " -class_id $class_id"; 149 149 $command .= " -uri $uri"; 150 $command .= " - code$exit_code";150 $command .= " -fault $exit_code"; 151 151 $command .= " -dbname $dbname" if defined $dbname; 152 152 -
trunk/ippScripts/scripts/warp_overlap.pl
r23295 r23688 193 193 my $command = "$warptool -addoverlap"; 194 194 $command .= " -warp_id $warp_id"; 195 $command .= " - code$exit_code";195 $command .= " -fault $exit_code"; 196 196 $command .= " -dbname $dbname" if defined $dbname; 197 197 system ($command); -
trunk/ippScripts/scripts/warp_skycell.pl
r23430 r23688 175 175 # Run pswarp 176 176 my $cmdflags; 177 my $accept = 1; # Accept the skycell?178 177 my $do_stats; 179 178 unless ($no_op) { … … 215 214 216 215 if ($do_stats) { 217 # Check first for the stats file , and if the ACCEPT flag is set.216 # Check first for the stats file 218 217 my $outputStatsReal = $ipprc->file_resolve($outputStats); 219 218 &my_die("Couldn't find expected output file: $outputStats", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal; … … 232 231 chomp $cmdflags; 233 232 234 if ($cmdflags =~ /-accept/) { 233 my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 234 235 if (!$quality) { 235 236 &my_die("Couldn't find expected output file: $outputImage", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage); 236 237 &my_die("Couldn't find expected output file: $outputMask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); … … 249 250 $command .= " -magicked" if $magicked; 250 251 251 $command .= " -uri $outputImage" if $accept;252 $command .= " -uri $outputImage" if !$quality; 252 253 $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400)); 253 $command .= " $cmdflags" if $accept;254 $command .= " $cmdflags"; 254 255 $command .= " -hostname $host" if defined $host; 255 256 $command .= " -dbname $dbname" if defined $dbname; … … 307 308 $command .= " -skycell_id $skycell_id"; 308 309 $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400)); 309 $command .= " - code$exit_code";310 $command .= " -fault $exit_code"; 310 311 $command .= " -dbname $dbname" if defined $dbname; 311 312 run(command => $command, verbose => $verbose);
Note:
See TracChangeset
for help on using the changeset viewer.
