Changeset 31247
- Timestamp:
- Apr 8, 2011, 3:45:26 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
-
ippScripts/scripts/staticsky.pl (modified) (3 diffs)
-
ippTools/src/staticskytool.c (modified) (1 diff)
-
ippTools/src/staticskytoolConfig.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippScripts/scripts/staticsky.pl
r31164 r31247 32 32 my $staticskytool = can_run('staticskytool') or (warn "Can't find staticskytool" and $missing_tools = 1); 33 33 my $psphotStack = can_run('psphotStack') or (warn "Can't find psphotStack" and $missing_tools = 1); 34 my $psphot = can_run('psphot') or (warn "Can't find psphot" and $missing_tools = 1); 34 35 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1); 36 my $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1); 35 37 if ($missing_tools) { 36 38 warn("Can't find required tools."); … … 96 98 } 97 99 98 # generate the input99 print $listFile "INPUT MULTI\n";100 my $nInputs = @$files;101 102 my $configuration = $ipprc->filename("PSPHOT.STACK.CONFIG", $outroot);103 104 foreach my $file (@$files) {105 print $listFile "INPUT METADATA\n";106 107 # XXX if we take the input from 'warp', we will need to make different selections here108 my $path_base = $file->{path_base};109 print "input: $path_base\n";110 111 my $imageCnv = $ipprc->filename("PPSTACK.OUTPUT", $path_base ); # Image name112 my $maskCnv = $ipprc->filename("PPSTACK.OUTPUT.MASK", $path_base ); # Mask name113 my $weightCnv = $ipprc->filename("PPSTACK.OUTPUT.VARIANCE", $path_base ); # Weight name114 115 my $imageRaw = $ipprc->filename("PPSTACK.UNCONV", $path_base ); # Image name116 my $maskRaw = $ipprc->filename("PPSTACK.UNCONV.MASK", $path_base ); # Mask name117 my $weightRaw = $ipprc->filename("PPSTACK.UNCONV.VARIANCE", $path_base ); # Weight name118 119 my $sources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $path_base ); # Sources name120 121 # XXX is this the correct PSF file?122 my $psfCnv = $ipprc->filename("PPSTACK.TARGET.PSF", $path_base ); # PSF name123 124 # XXX we could make some different choices if some inputs do not exist...125 &my_die("Couldn't find input: $imageRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$imageRaw");126 &my_die("Couldn't find input: $maskRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$maskRaw");127 &my_die("Couldn't find input: $weightRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$weightRaw");128 &my_die("Couldn't find input: $imageCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$imageCnv");129 &my_die("Couldn't find input: $maskCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$maskCnv");130 &my_die("Couldn't find input: $weightCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$weightCnv");131 &my_die("Couldn't find input: $psfCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$psfCnv");132 &my_die("Couldn't find input: $sources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$sources");133 134 print $listFile " RAW:IMAGE STR " . $imageRaw . "\n";135 print $listFile " RAW:MASK STR " . $maskRaw . "\n";136 print $listFile " RAW:VARIANCE STR " . $weightRaw . "\n";137 138 print $listFile " CNV:IMAGE STR " . $imageCnv . "\n";139 print $listFile " CNV:MASK STR " . $maskCnv . "\n";140 print $listFile " CNV:VARIANCE STR " . $weightCnv . "\n";141 print $listFile " CNV:PSF STR " . $psfCnv . "\n";142 143 print $listFile " SOURCES STR " . $sources . "\n";144 145 print $listFile "END\n\n";146 }147 148 100 # Recipes to use based on reduction class 149 101 $reduction = 'DEFAULT' unless defined $reduction; … … 160 112 print "recipe_ppstack: $recipe_ppstack\n"; 161 113 162 # my $cmdflags; 163 164 # Perform stack photometry analysis 165 { 166 my $command = "$psphotStack $outroot"; 167 $command .= " -input $listName"; 168 $command .= " -threads $threads" if defined $threads; 169 $command .= " -recipe PSPHOT $recipe_psphot"; 170 $command .= " -recipe PPSUB $recipe_ppsub"; 171 $command .= " -recipe PPSTACK $recipe_ppstack"; 172 $command .= " -dumpconfig $configuration"; 173 $command .= " -tracedest $traceDest -log $logDest"; 174 # $command .= " -dbname $dbname" if defined $dbname; 175 # $command .= " -image_id $diff_skyfile_id" if defined $diff_skyfile_id; 176 # $command .= " -source_id $source_id" if defined $source_id; 177 178 unless ($no_op) { 179 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose); 180 unless ($success) { 181 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 182 &my_die("Unable to perform psphotStack: $error_code", $sky_id, $error_code); 183 } 184 185 # my $outputStatsReal = $ipprc->file_resolve($outputStats); 186 # &my_die("Couldn't find expected output file: $outputStats", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal); 187 188 # measure chip stats 189 # $command = "$ppStatsFromMetadata $outputStatsReal - DIFF_SKYCELL"; 190 # ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 191 # run(command => $command, verbose => $verbose); 192 # unless ($success) { 193 # $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 194 # &my_die("Unable to perform ppStatsFromMetadata: $error_code", $sky_id, $error_code); 195 # } 196 # foreach my $line (@$stdout_buf) { 197 # $cmdflags .= " $line"; 198 # } 199 # chomp $cmdflags; 200 201 # my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 202 203 my $quality = 0; 204 if (!$quality) { 205 206 # Get the output filenames 207 # we have one set of output files per input file set 208 for (my $i = 0; $i < @$files; $i++) { 209 my $outputName = $ipprc->filename("PSPHOT.STACK.OUTPUT.IMAGE", $outroot, $i); 210 my $outputMask = $ipprc->filename("PSPHOT.STACK.OUTPUT.MASK", $outroot, $i); 211 my $outputVariance = $ipprc->filename("PSPHOT.STACK.OUTPUT.VARIANCE", $outroot, $i); 212 my $outputSources = $ipprc->filename("PSPHOT.STACK.OUTPUT", $outroot, $i); 213 214 # XXX these are optional and not generated by default 215 # &my_die("Couldn't find expected output file: $outputName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 216 # &my_die("Couldn't find expected output file: $outputMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 217 # &my_die("Couldn't find expected output file: $outputVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance); 218 &my_die("Couldn't find expected output file: $outputSources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 219 } 220 221 #my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot); 222 #my $outputStats = $ipprc->filename("SKYCELL.STATS", $outroot); 223 #my $traceDest = $ipprc->filename("TRACE.EXP", $outroot); 224 225 my $chisqName = $ipprc->filename("PSPHOT.CHISQ.IMAGE", $outroot); 226 my $chisqMask = $ipprc->filename("PSPHOT.CHISQ.MASK", $outroot); 227 my $chisqVariance = $ipprc->filename("PSPHOT.CHISQ.VARIANCE", $outroot); 228 229 # XXX check the recipe -- should we expect these to exist? 230 # &my_die("Couldn't find expected output file: $chisqName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqName); 231 # &my_die("Couldn't find expected output file: $chisqMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqMask); 232 # &my_die("Couldn't find expected output file: $chisqVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqVariance); 233 } 234 } else { 235 print "Not executing: $command\n"; 236 } 114 115 # generate the input 116 print $listFile "INPUT MULTI\n"; 117 my $nInputs = @$files; 118 119 if ($nInputs > 1) { 120 my $configuration = $ipprc->filename("PSPHOT.STACK.CONFIG", $outroot); 121 122 foreach my $file (@$files) { 123 print $listFile "INPUT METADATA\n"; 124 125 # XXX if we take the input from 'warp', we will need to make different selections here 126 my $path_base = $file->{path_base}; 127 print "input: $path_base\n"; 128 129 my $imageCnv = $ipprc->filename("PPSTACK.OUTPUT", $path_base ); # Image name 130 my $maskCnv = $ipprc->filename("PPSTACK.OUTPUT.MASK", $path_base ); # Mask name 131 my $weightCnv = $ipprc->filename("PPSTACK.OUTPUT.VARIANCE", $path_base ); # Weight name 132 133 my $imageRaw = $ipprc->filename("PPSTACK.UNCONV", $path_base ); # Image name 134 my $maskRaw = $ipprc->filename("PPSTACK.UNCONV.MASK", $path_base ); # Mask name 135 my $weightRaw = $ipprc->filename("PPSTACK.UNCONV.VARIANCE", $path_base ); # Weight name 136 137 my $sources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $path_base ); # Sources name 138 139 # XXX is this the correct PSF file? 140 my $psfCnv = $ipprc->filename("PPSTACK.TARGET.PSF", $path_base ); # PSF name 141 142 # XXX we could make some different choices if some inputs do not exist... 143 &my_die("Couldn't find input: $imageRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$imageRaw"); 144 &my_die("Couldn't find input: $maskRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$maskRaw"); 145 &my_die("Couldn't find input: $weightRaw", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$weightRaw"); 146 &my_die("Couldn't find input: $imageCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$imageCnv"); 147 &my_die("Couldn't find input: $maskCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$maskCnv"); 148 &my_die("Couldn't find input: $weightCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$weightCnv"); 149 &my_die("Couldn't find input: $psfCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$psfCnv"); 150 &my_die("Couldn't find input: $sources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$sources"); 151 152 print $listFile " RAW:IMAGE STR " . $imageRaw . "\n"; 153 print $listFile " RAW:MASK STR " . $maskRaw . "\n"; 154 print $listFile " RAW:VARIANCE STR " . $weightRaw . "\n"; 155 156 print $listFile " CNV:IMAGE STR " . $imageCnv . "\n"; 157 print $listFile " CNV:MASK STR " . $maskCnv . "\n"; 158 print $listFile " CNV:VARIANCE STR " . $weightCnv . "\n"; 159 print $listFile " CNV:PSF STR " . $psfCnv . "\n"; 160 161 print $listFile " SOURCES STR " . $sources . "\n"; 162 163 print $listFile "END\n\n"; 164 } 165 166 # my $cmdflags; 167 168 # Perform stack photometry analysis 169 { 170 my $command = "$psphotStack $outroot"; 171 $command .= " -input $listName"; 172 $command .= " -threads $threads" if defined $threads; 173 $command .= " -recipe PSPHOT $recipe_psphot"; 174 $command .= " -recipe PPSUB $recipe_ppsub"; 175 $command .= " -recipe PPSTACK $recipe_ppstack"; 176 $command .= " -dumpconfig $configuration"; 177 $command .= " -tracedest $traceDest -log $logDest"; 178 # $command .= " -dbname $dbname" if defined $dbname; 179 # $command .= " -image_id $diff_skyfile_id" if defined $diff_skyfile_id; 180 # $command .= " -source_id $source_id" if defined $source_id; 181 182 unless ($no_op) { 183 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose); 184 unless ($success) { 185 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 186 &my_die("Unable to perform psphotStack: $error_code", $sky_id, $error_code); 187 } 188 189 # my $outputStatsReal = $ipprc->file_resolve($outputStats); 190 # &my_die("Couldn't find expected output file: $outputStats", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal); 191 192 # measure chip stats 193 # $command = "$ppStatsFromMetadata $outputStatsReal - DIFF_SKYCELL"; 194 # ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 195 # run(command => $command, verbose => $verbose); 196 # unless ($success) { 197 # $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 198 # &my_die("Unable to perform ppStatsFromMetadata: $error_code", $sky_id, $error_code); 199 # } 200 # foreach my $line (@$stdout_buf) { 201 # $cmdflags .= " $line"; 202 # } 203 # chomp $cmdflags; 204 205 # my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 206 207 my $quality = 0; 208 if (!$quality) { 209 210 # Get the output filenames 211 # we have one set of output files per input file set 212 for (my $i = 0; $i < @$files; $i++) { 213 my $outputName = $ipprc->filename("PSPHOT.STACK.OUTPUT.IMAGE", $outroot, $i); 214 my $outputMask = $ipprc->filename("PSPHOT.STACK.OUTPUT.MASK", $outroot, $i); 215 my $outputVariance = $ipprc->filename("PSPHOT.STACK.OUTPUT.VARIANCE", $outroot, $i); 216 my $outputSources = $ipprc->filename("PSPHOT.STACK.OUTPUT", $outroot, $i); 217 218 # XXX these are optional and not generated by default 219 # &my_die("Couldn't find expected output file: $outputName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 220 # &my_die("Couldn't find expected output file: $outputMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 221 # &my_die("Couldn't find expected output file: $outputVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance); 222 &my_die("Couldn't find expected output file: $outputSources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 223 } 224 225 #my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot); 226 #my $outputStats = $ipprc->filename("SKYCELL.STATS", $outroot); 227 #my $traceDest = $ipprc->filename("TRACE.EXP", $outroot); 228 229 my $chisqName = $ipprc->filename("PSPHOT.CHISQ.IMAGE", $outroot); 230 my $chisqMask = $ipprc->filename("PSPHOT.CHISQ.MASK", $outroot); 231 my $chisqVariance = $ipprc->filename("PSPHOT.CHISQ.VARIANCE", $outroot); 232 233 # XXX check the recipe -- should we expect these to exist? 234 # &my_die("Couldn't find expected output file: $chisqName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqName); 235 # &my_die("Couldn't find expected output file: $chisqMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqMask); 236 # &my_die("Couldn't find expected output file: $chisqVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqVariance); 237 } 238 } else { 239 print "Not executing: $command\n"; 240 } 241 } 242 } else { 243 # single input. Run psphot 244 my $configuration = $ipprc->filename("PSPHOT.STACK.CONFIG", $outroot); 245 246 my $file = $files->[0]; 247 248 # XXX if we take the input from 'warp', we will need to make different selections here 249 my $path_base = $file->{path_base}; 250 print "input: $path_base\n"; 251 252 # examine the recipe to determine whether to analyze the "raw" or convolved images 253 my $command = "$ppConfigDump -camera $camera -dump-recipe PSPHOT -recipe PSPHOT $recipe_psphot -"; 254 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 255 run(command => $command, verbose => 0); 256 unless ($success) { 257 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 258 &my_die("Unable to perform ppConfigDump: $error_code", $sky_id, $PS_EXIT_SYS_ERROR); 259 } 260 my $recipeData = $mdcParser->parse(join "", @$stdout_buf) or 261 &my_die("Unable to parse metadata config doc", $sky_id, $PS_EXIT_SYS_ERROR); 262 263 my $use_raw = metadataLookupBool($recipeData, 'PSPHOT.STACK.USE.RAW'); 264 265 my ($image, $mask, $variance); 266 if ($use_raw) { 267 $image = $ipprc->filename("PPSTACK.UNCONV", $path_base ); # Image name 268 $mask = $ipprc->filename("PPSTACK.UNCONV.MASK", $path_base ); # Mask name 269 $variance = $ipprc->filename("PPSTACK.UNCONV.VARIANCE", $path_base ); # Weight name 270 } else { 271 $image = $ipprc->filename("PPSTACK.OUTPUT", $path_base ); # Image name 272 $mask = $ipprc->filename("PPSTACK.OUTPUT.MASK", $path_base ); # Mask name 273 $variance = $ipprc->filename("PPSTACK.OUTPUT.VARIANCE", $path_base ); # Weight name 274 } 275 276 my $sources = $ipprc->filename("PSPHOT.OUT.CMF.MEF", $path_base ); # Sources name 277 278 # XXX is this the correct PSF file? 279 my $psfCnv = $ipprc->filename("PPSTACK.TARGET.PSF", $path_base ); # PSF name 280 281 # XXX we could make some different choices if some inputs do not exist... 282 &my_die("Couldn't find input: $image", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$image"); 283 &my_die("Couldn't find input: $mask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$mask"); 284 &my_die("Couldn't find input: $variance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$variance"); 285 &my_die("Couldn't find input: $psfCnv", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$psfCnv"); 286 &my_die("Couldn't find input: $sources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists("$sources"); 287 288 # my $cmdflags; 289 290 # Perform stack photometry analysis 291 { 292 my $command = "$psphot $outroot"; 293 $command .= " -file $image"; 294 $command .= " -mask $mask"; 295 $command .= " -variance $variance"; 296 $command .= " -threads $threads" if defined $threads; 297 $command .= " -recipe PSPHOT $recipe_psphot"; 298 $command .= " -dumpconfig $configuration" if $configuration; 299 $command .= " -tracedest $traceDest -log $logDest"; 300 301 unless ($no_op) { 302 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose); 303 unless ($success) { 304 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 305 &my_die("Unable to perform psphotStack: $error_code", $sky_id, $error_code); 306 } 307 308 # my $outputStatsReal = $ipprc->file_resolve($outputStats); 309 # &my_die("Couldn't find expected output file: $outputStats", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal); 310 311 # measure chip stats 312 # $command = "$ppStatsFromMetadata $outputStatsReal - DIFF_SKYCELL"; 313 # ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = 314 # run(command => $command, verbose => $verbose); 315 # unless ($success) { 316 # $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR); 317 # &my_die("Unable to perform ppStatsFromMetadata: $error_code", $sky_id, $error_code); 318 # } 319 # foreach my $line (@$stdout_buf) { 320 # $cmdflags .= " $line"; 321 # } 322 # chomp $cmdflags; 323 324 # my ($quality) = $cmdflags =~ /-quality (\d+)/; # Quality flag 325 326 my $quality = 0; 327 if (0 and !$quality) { 328 329 # Get the output filenames 330 # we have one set of output files per input file set 331 for (my $i = 0; $i < @$files; $i++) { 332 my $outputName = $ipprc->filename("PSPHOT.STACK.OUTPUT.IMAGE", $outroot, $i); 333 my $outputMask = $ipprc->filename("PSPHOT.STACK.OUTPUT.MASK", $outroot, $i); 334 my $outputVariance = $ipprc->filename("PSPHOT.STACK.OUTPUT.VARIANCE", $outroot, $i); 335 my $outputSources = $ipprc->filename("PSPHOT.STACK.OUTPUT", $outroot, $i); 336 337 # XXX these are optional and not generated by default 338 # &my_die("Couldn't find expected output file: $outputName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName); 339 # &my_die("Couldn't find expected output file: $outputMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask); 340 # &my_die("Couldn't find expected output file: $outputVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance); 341 &my_die("Couldn't find expected output file: $outputSources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources); 342 } 343 344 #my $configuration = $ipprc->filename("PPSUB.CONFIG", $outroot); 345 #my $outputStats = $ipprc->filename("SKYCELL.STATS", $outroot); 346 #my $traceDest = $ipprc->filename("TRACE.EXP", $outroot); 347 348 my $chisqName = $ipprc->filename("PSPHOT.CHISQ.IMAGE", $outroot); 349 my $chisqMask = $ipprc->filename("PSPHOT.CHISQ.MASK", $outroot); 350 my $chisqVariance = $ipprc->filename("PSPHOT.CHISQ.VARIANCE", $outroot); 351 352 # XXX check the recipe -- should we expect these to exist? 353 # &my_die("Couldn't find expected output file: $chisqName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqName); 354 # &my_die("Couldn't find expected output file: $chisqMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqMask); 355 # &my_die("Couldn't find expected output file: $chisqVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqVariance); 356 } 357 } else { 358 print "Not executing: $command\n"; 359 } 360 } 237 361 } 238 362 -
trunk/ippTools/src/staticskytool.c
r30907 r31247 123 123 psAssert (filters->data.list->n, "-select_filter should at least have a place-holder"); 124 124 int num_filter = filters->data.list->n; 125 if (num_filter < 2) {126 psError(PXTOOLS_ERR_CONFIG, false, "invalid request: only 1 filter selected");127 psFree(whereMD);128 return false;129 }130 125 131 126 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); -
trunk/ippTools/src/staticskytoolConfig.c
r28154 r31247 52 52 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0); 53 53 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison, multiple OK)", NULL); 54 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple required)", NULL);54 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiplei OK)", NULL); 55 55 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL); 56 56 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
Note:
See TracChangeset
for help on using the changeset viewer.
