Index: branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm =================================================================== --- branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (revision 35350) +++ branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (revision 35413) @@ -15,4 +15,5 @@ our @EXPORT_OK = qw( locate_images + locate_images_for_row resolve_project getCamRunByCamID @@ -46,5 +47,5 @@ my $last_project = ""; -my ($regtool, $chiptool, $camtool, $warptool, $stacktool, $difftool); +my ($regtool, $chiptool, $camtool, $warptool, $stacktool, $difftool, $releasetool); my ($pstamptool, $dvoImagesAtCoords, $whichimage, $ppConfigDump); @@ -56,5 +57,5 @@ my $rowList = shift; # required my $req_type = shift; # required - my $img_type = shift; # required + my $stage = shift; # required my $id = shift; # required unless req_type eq bycoord or byskycell my $tess_id = shift; @@ -78,5 +79,7 @@ ($req_type ne "byskycell"); - $default_data_groups = load_data_groups($verbose); + if (!$data_group and !$default_data_groups) { + $default_data_groups = load_data_groups($verbose); + } my $dateobs_begin; @@ -104,14 +107,14 @@ my $x = $row->{CENTER_X}; my $y = $row->{CENTER_Y}; - my $results = lookup_bycoord($ipprc, $rowList, $imagedb, $img_type, $tess_id, $component, $need_magic, $x, $y, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); + my $results = lookup_bycoord($ipprc, $row, $imagedb, $stage, $tess_id, $component, $need_magic, $x, $y, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); return $results; } - if (($req_type eq "byid") and ($img_type eq "diff")) { + if (($req_type eq "byid") and ($stage eq "diff")) { # lookups of all of the information for diff images requires a two level lookup to # get the exposure information. Switching the req_type allows us to keep that code # in one place $req_type = "bydiff"; - my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 1, $option_mask, $img_type, $verbose); + my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 1, $option_mask, $stage, $verbose); return $results; } @@ -120,9 +123,9 @@ # for bydiff reuqests we go look up the diffRun to obtain exp_id, chip_id, warp_id, stack_id, or # the image from the diffRun - my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 0, $option_mask, $img_type, $verbose); + my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 0, $option_mask, $stage, $verbose); if (!$results) { return undef; } - if ($img_type eq "diff") { + if ($stage eq "diff") { # lookup_diff has done all of the work return $results; @@ -130,15 +133,15 @@ my $image = $results->[0]; - if ($img_type eq "raw") { + if ($stage eq "raw") { $req_type = "byid"; $id = $image->{exp_id}; return undef if !$id; # fall through and lookup byid - } elsif ($img_type eq "chip") { + } elsif ($stage eq "chip") { $req_type = "byid"; $id = $image->{chip_id}; return undef if !$id; # fall through and lookup byid - } elsif ($img_type eq "warp") { + } elsif ($stage eq "warp") { $req_type = "byid"; $id = $image->{warp_id}; @@ -146,5 +149,5 @@ return undef if !$id; # fall through and lookup by warp_id - } elsif ($img_type eq "stack") { + } elsif ($stage eq "stack") { $req_type = "byid"; $id = $image->{stack_id}; @@ -153,9 +156,9 @@ } else { # This is checked this elsewhere? - print STDERR "Error: $img_type is an unknown image type\n"; + print STDERR "Error: $stage is an unknown image type\n"; return undef; } } elsif ($req_type eq "byskycell") { - if (($img_type eq "raw") or ($img_type eq "chip")) { + if (($stage eq "raw") or ($stage eq "chip")) { print STDERR "REQ_TYPE byskycell not supported for IMG_TYPE raw or chip\n"; return undef; @@ -167,6 +170,140 @@ } - my $results = lookup($ipprc, $rowList, $imagedb, $req_type, $img_type, $id, $tess_id, $component, - $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); + my $results = lookup($ipprc, $rowList, $imagedb, $req_type, $stage, $id, $tess_id, $component, + $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, + undef, undef, undef, $verbose); + + return $results; +} + +sub locate_images_for_row { + my $ipprc = shift; + my $imagedb = shift; + my $camera = shift; + my $row = shift; + my $verbose = shift; + + my $req_type = $row->{REQ_TYPE}; + + # we die in response to bad data in request files + # The caller is responsible for updating the database + # pstampparse.pl error checks now so this shouldn't happen + &my_die("Unknown req_type: $req_type", $PS_EXIT_PROG_ERROR) + if ($req_type ne "byid") and + ($req_type ne "byexp") and + ($req_type ne "bycoord") and + ($req_type ne "bydiff") and + ($req_type ne "byskycell"); + + my $stage = $row->{IMG_TYPE}; + my $id = $row->{ID}; + my $component = $row->{COMPONENT}; + my $tess_id = $row->{TESS_ID}; + + my $filter = $row->{REQFILT}; + my $mjd_min = $row->{MJD_MIN}; + my $mjd_max = $row->{MJD_MAX}; + my $data_group = $row->{DATA_GROUP}; + if (isnull($data_group) and !$default_data_groups) { + $default_data_groups = load_data_groups($verbose); + } + + my $rownum = $row->{ROWNUM}; + my $job_type = $row->{JOB_TYPE}; + my $option_mask= $row->{OPTION_MASK}; + + my $dateobs_begin; + my $dateobs_end; + if (!iszero($mjd_min)) { + $dateobs_begin = mjd_to_dateobs($mjd_min); + } + if (!iszero($mjd_max)) { + $dateobs_end = mjd_to_dateobs($mjd_max); + } + if (isnull($tess_id)) { + $tess_id = undef; + } + if (isnull($data_group)) { + $data_group = undef; + } + if (isnull($filter)) { + $filter = undef; + } + + if ($req_type eq "bycoord") { + my $x = $row->{CENTER_X}; + my $y = $row->{CENTER_Y}; + my $results = lookup_bycoord($ipprc, $row, $imagedb, $stage, $tess_id, $component, 0, $x, $y, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); + return $results; + } + + # for compatability with the lower level functions that haven't been converted to take a single row + my $rowList = [$row]; + + if (($req_type eq "byid") and ($stage eq "diff")) { + # lookups of all of the information for diff images requires a two level lookup to + # get the exposure information. Switching the req_type allows us to keep that code + # in one place + $req_type = "bydiff"; + my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 1, $option_mask, $stage, $verbose); + return $results; + } + + my ($release_name, $survey) = get_release_info($row); + + if ($req_type eq "bydiff") { + # for bydiff reuqests we go look up the diffRun to obtain exp_id, chip_id, warp_id, stack_id, or + # the image from the diffRun + my $results = lookup_diff($ipprc, $rowList, $imagedb, $id, $component, 0, $option_mask, $stage, $verbose); + if (!$results) { + return undef; + } + if ($stage eq "diff") { + # lookup_diff has done all of the work + return $results; + } + + my $image = $results->[0]; + if ($stage eq "raw") { + $req_type = "byid"; + $id = $image->{exp_id}; + return undef if !$id; + # fall through and lookup byid + } elsif ($stage eq "chip") { + $req_type = "byid"; + $id = $image->{chip_id}; + return undef if !$id; + # fall through and lookup byid + } elsif ($stage eq "warp") { + $req_type = "byid"; + $id = $image->{warp_id}; + $component = $image->{skycell_id}; + return undef if !$id; + # fall through and lookup by warp_id + } elsif ($stage eq "stack") { + $req_type = "byid"; + $id = $image->{stack_id}; + return undef if !$id; + # fall though and lookup by stack_id + } else { + # This is checked this elsewhere? + print STDERR "Error: $stage is an unknown image type\n"; + return undef; + } + } elsif ($req_type eq "byskycell") { + if (($stage eq "raw") or ($stage eq "chip")) { + print STDERR "REQ_TYPE byskycell not supported for IMG_TYPE raw or chip\n"; + return undef; + } + if (!$tess_id or !$component) { + print STDERR "component and tess_id are required for REQ_TYPE byskycell\n"; + return undef; + } + } + + my $results = lookup($ipprc, $rowList, $imagedb, $req_type, $stage, $id, $tess_id, $component, + 0, $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, + undef, $release_name, $survey, + $verbose); return $results; @@ -193,4 +330,7 @@ my $mjd_min = shift; my $mjd_max = shift; + my $selectedAstrom = shift; + my $release_name = shift; + my $survey = shift; my $verbose = shift; @@ -217,6 +357,18 @@ my $magic_arg = $need_magic ? " -destreaked" : ""; + my $row = $rowList->[0]; + # all rows have the same center type - my $skycenter = ! ($rowList->[0]->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS); + my $skycenter = ! ($row->{COORD_MASK} & $PSTAMP_CENTER_IN_PIXELS); + + my $use_releasetool = 0; + my $release_args; + if (($req_type eq 'byexp' and $stage ne 'raw') or ($req_type eq 'byskycell' and $stage ne 'diff')) { + unless (isnull($release_name) and isnull($survey)) { + $use_releasetool = 1; + $release_args = " -release_name $release_name" if $release_name; + $release_args .= " -surveyName $survey" if $survey; + } + } my $component_args; @@ -249,15 +401,21 @@ # use chiptool -processsedimfile. Otherwise use chiptool -listrun and then # choose the chips containing the center pixel by calling selectComponets() below - if ($component or $use_imfile_id or !$skycenter) { - $command = "$chiptool -processedimfile -pstamp_order -dbname $imagedb"; - if ($component and $component ne 'all') { - $class_id = $component; - $component_args = " -class_id $class_id"; - } - } else { - $command = "$chiptool -listrun -pstamp_order -dbname $imagedb"; + if ($use_releasetool) { + $command = "$releasetool -dbname $imagedb -priority_order -listrelexp $release_args"; $choose_components = 1; - } - $id_opt = $use_imfile_id ? "-chip_imfile_id" : "-chip_id"; + } else { + $command = "$chiptool -pstamp_order -dbname $imagedb"; + if ($component or $use_imfile_id or !$skycenter) { + $command .= " -processedimfile"; + if ($component and $component ne 'all') { + $class_id = $component; + $component_args = " -class_id $class_id"; + } + } else { + $command .= " -listrun"; + $choose_components = 1; + } + $id_opt = $use_imfile_id ? "-chip_imfile_id" : "-chip_id"; + } # XXX: perhaps we should stop resolving images to this level here and do it at job run time. # With the mdc file it has all of the information that it needs. @@ -273,16 +431,22 @@ $want_astrom = 1; $set_class_id = 1; - } elsif ($stage eq "warp") { - if ($component or $use_imfile_id or !$skycenter) { - $command = "$warptool -warped -pstamp_order -dbname $imagedb"; - if ($component and $component ne 'all') { - $skycell_id = $component; - $component_args = " -skycell_id $skycell_id"; - } - } else { - $command = "$warptool -listrun -pstamp_order -dbname $imagedb"; + } elsif ($stage eq 'warp') { + if ($use_releasetool) { + $command = "$releasetool -dbname $imagedb -priority_order -listrelexp $release_args"; $choose_components = 1; - } - $id_opt = $use_imfile_id ? "-warp_skyfile_id" : "-warp_id"; + } else { + $command = "$warptool -pstamp_order -dbname $imagedb"; + if ($component or $use_imfile_id or !$skycenter) { + $command .= " -warped"; + if ($component and $component ne 'all') { + $skycell_id = $component; + $component_args = " -skycell_id $skycell_id"; + } + } else { + $command = " -listrun"; + $choose_components = 1; + } + $id_opt = $use_imfile_id ? "-warp_skyfile_id" : "-warp_id"; + } $image_name = "PSWARP.OUTPUT"; $mask_name = "PSWARP.OUTPUT.MASK"; @@ -292,4 +456,5 @@ $base_name = "path_base"; # name of the field for the warptool output } elsif ($stage eq "diff") { + # XXX: is this path ever used for diff images anymore? if ($component or $use_imfile_id or !$skycenter) { $command = "$difftool -diffskyfile -pstamp_order -dbname $imagedb"; @@ -312,8 +477,14 @@ } elsif ($stage eq "stack") { $skycell_id = $component; - $command = "$stacktool -sumskyfile -dbname $imagedb"; - # only consider stacks in full state. - $command .= " -state full"; - $id_opt = "-stack_id"; + if ($use_releasetool) { + $command = "$releasetool -listrelstack -dbname $imagedb $release_args"; + $base_name = 'stack_path_base'; + } else { + $command = "$stacktool -sumskyfile -dbname $imagedb"; + # only consider stacks in full state. + $command .= " -state full"; + $id_opt = "-stack_id"; + $base_name = 'path_base'; + } $component_args = " -skycell_id $skycell_id" if $skycell_id and $skycell_id ne 'all'; @@ -329,10 +500,9 @@ # this is wrong but gets the right answer. Need to figure out how to find the # rule properly - #$cmf_name = "PSPHOT.OUTPUT"; # this puts .fpa. in the name $cmf_name = "PSWARP.OUTPUT.SOURCES"; + # $cmf_name = "PSPHOT.OUTPUT"; # this puts .fpa. in the name $psf_name = "PPSTACK.TARGET.PSF"; - $base_name = "path_base"; } else { - die "Unknown IMG_TYPe supplied: $stage"; + die "Unknown IMG_TYPE supplied: $stage"; } @@ -377,5 +547,6 @@ if (!isnull($data_group)) { $command .= " -data_group $data_group"; - } elsif ($req_type eq 'byskycell') { + } elsif (!$use_releasetool and $req_type eq 'byskycell') { + # XXX: Why am I using default data_groups only for byskycell requests? $command .= $default_data_groups; } @@ -392,11 +563,16 @@ $images = filterRuns($stage, $need_magic, $images, $inverse, $verbose); } + if ($choose_components) { # the list of "images" is actually a list of "Runs" # match the coords in the rows to the components in the runs # returns an actual list of images - $images = selectComponents($ipprc, $imagedb, $req_type, $stage, $rowList, $images, $verbose); + if ($skycenter) { + $images = selectComponents($ipprc, $imagedb, $req_type, $stage, $rowList, $images, $verbose); + } else { + $images = selectComponentsByName($ipprc, $imagedb, $req_type, $stage, $component, $rowList, $images, $verbose); + } } else { - # put index for each of the rows into all of the the images + # put index for each of the rows into all of the the selected images setRowRefs($rowList, $images); } @@ -462,5 +638,12 @@ # dquery wants these set $out->{magicked} = 0; - $out->{data_state} = $out->{state}; + if ($use_releasetool) { + if ($image->{skycal_path_base}) { + $out->{astrom} = $image->{skycal_path_base} . ".cmf"; + } + $out->{data_state} = $out->{state} = $out->{stack_state}; + } else { + $out->{data_state} = $out->{state}; + } } $out->{stage_id} = $stage_id; @@ -470,5 +653,8 @@ my $mask_base; if ($want_astrom) { - if (! defined $out->{astrom}) { + if ($selectedAstrom) { + $out->{astrom} = $selectedAstrom; + $out->{cam_path_base} = basename($selectedAstrom); + } elsif (! defined $out->{astrom}) { if (! find_astrometry($ipprc, $imagedb, $out, $verbose)) { print STDERR "failed to find astrometry for $stage $stage_id\n"; @@ -505,5 +691,5 @@ my $byid = shift; my $option_mask = shift; - my $img_type = shift; + my $stage = shift; my $verbose = shift; @@ -573,6 +759,6 @@ # we have a stack - stack diff (well it might be stack - warp....) # but at any rate we only handle image type diff and stack - if (($img_type ne "diff") and ($img_type ne "stack")) { - print STDERR "lookup_diff: cannot lookup IMG_TYPE $img_type bydiff from a stack stack diff run\n"; + if (($stage ne "diff") and ($stage ne "stack")) { + print STDERR "lookup_diff: cannot lookup IMG_TYPE $stage bydiff from a stack stack diff run\n"; setErrorCodes($rowList, $PSTAMP_INVALID_REQUEST); # all images will be the same so we can stop @@ -625,5 +811,5 @@ } - if ($img_type eq "diff") { + if ($stage eq "diff") { my @imageList = ($image); @@ -656,7 +842,7 @@ sub lookup_bycoord { my $ipprc = shift; - my $rowList = shift; + my $row = shift; my $imagedb = shift; - my $img_type = shift; + my $stage = shift; my $tess_id = shift; my $component = shift; @@ -671,11 +857,16 @@ my $mjd_min = shift; my $mjd_max = shift; + my $astrom = shift; my $verbose = shift; + my ($release_name, $survey) = get_release_info($row); + + my $rowList = [$row]; + my $results = (); - if (($img_type eq "raw") or ($img_type eq "chip")) { - - my $chips = lookup_by_cam_id_and_coords($ipprc, $imagedb, $img_type, - $ra, $dec, $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $verbose); + if (($stage eq "raw") or ($stage eq "chip")) { + + my $chips = lookup_by_cam_id_and_coords($ipprc, $imagedb, $stage, + $ra, $dec, $need_magic, $dateobs_begin, $dateobs_end, $filter, $data_group, $verbose, $release_name, $survey, $row->{FWHM_MIN}, $row->{FWHM_MAX}); if (!$chips or scalar @$chips == 0) { @@ -684,7 +875,9 @@ foreach my $chip (@$chips) { next if $component and ($chip->{component} ne $component); - my $these_results = lookup($ipprc, $rowList, $imagedb, "byid", $img_type, $chip->{id}, + my $these_results = lookup($ipprc, $rowList, $imagedb, "byid", $stage, $chip->{id}, $tess_id, $chip->{component}, $need_magic, - $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); + $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, + $chip->{astrom}, undef, undef, + $verbose); next if !$these_results; @@ -695,6 +888,6 @@ } else { # this should have been checked elsewhere - die "unexpected image type $img_type" if ($img_type ne "warp") - and ($img_type ne "stack") and ($img_type ne "diff"); + die "unexpected image type $stage" if ($stage ne "warp") + and ($stage ne "stack") and ($stage ne "diff"); my $skycells = lookup_skycell_by_coords($ipprc, $tess_id, $component, $ra, $dec, $verbose); @@ -704,7 +897,9 @@ } else { foreach my $skycell (@$skycells) { - my $these_results = lookup($ipprc, $rowList, $imagedb, "byskycell", $img_type, undef, + my $these_results = lookup($ipprc, $rowList, $imagedb, "byskycell", $stage, undef, $skycell->{tess_id}, $skycell->{component}, $need_magic, - $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, $verbose); + $dateobs_begin, $dateobs_end, $filter, $data_group, $option_mask, $mjd_min, $mjd_max, + undef, $release_name, $survey, + $verbose); next if !$these_results; @@ -722,10 +917,10 @@ sub lookup_by_cam_id_and_coords { - my $ipprc = shift; - my $imagedb = shift; - my $img_type = shift; - my $ra = shift; - my $dec = shift; - my $need_magic = shift; + my $ipprc = shift; + my $imagedb = shift; + my $stage = shift; + my $ra = shift; + my $dec = shift; + my $need_magic = shift; my $dateobs_begin = shift; my $dateobs_end = shift; @@ -733,15 +928,32 @@ my $data_group = shift; my $verbose = shift; - - my $camruns; - - { - my $search_radius = 1.6; # XXX: this should be camera specific - + my $release_name = shift; + my $survey = shift; + my $fwhm_min = shift; + my $fwhm_max = shift; + + my $search_radius = 1.6; # XXX: this should be camera specific + + my $command; + my $using_camtool = 0; + if ($release_name or $survey) { + $command = "$releasetool -dbname $imagedb -listrelexp"; + if (!isnull($survey)) { + $command .= " -survey_name $survey"; + } + if (!isnull($release_name)) { + $command .= " -release_name $release_name"; + } else { + $command .= " -priority_order"; + } + if ($fwhm_min != 0) { + $command .= " -fwhm_min $fwhm_min"; + } + if ($fwhm_max != 0) { + $command .= " -fwhm_max $fwhm_max"; + } + } else { + $using_camtool = 1; my $command = "$camtool -dbname $imagedb -processedexp -pstamp_order"; - $command .= " -ra $ra -decl $dec -radius $search_radius"; - $command .= " -dateobs_begin $dateobs_begin" if $dateobs_begin; - $command .= " -dateobs_end $dateobs_end" if $dateobs_end ; - $command .= " -filter $filter" if $filter; # NOTE: we are applying the data_group to the camera run. # If we're looking for chip stage images there is no guarentee that @@ -755,28 +967,37 @@ } $command .= " -destreaked" if $need_magic; - - # run the tool and parse the output - $camruns = runToolAndParse($command, $verbose); - } - if (!$camruns) { + } + $command .= " -ra $ra -decl $dec -radius $search_radius"; + $command .= " -dateobs_begin $dateobs_begin" if $dateobs_begin; + $command .= " -dateobs_end $dateobs_end" if $dateobs_end ; + $command .= " -filter $filter" if $filter; + + # run the tool and parse the output + my $results = runToolAndParse($command, $verbose); + if (!$results) { return undef; } my $components; my $last_exp_id = 0; - foreach my $camRun (@$camruns) { - my $cam_id = $camRun->{cam_id}; - my $exp_id = $camRun->{exp_id}; - + foreach my $result (@$results) { + my $cam_id = $result->{cam_id}; + my $exp_id = $result->{exp_id}; + + # go on if we already have a result for this exposure next if $exp_id eq $last_exp_id; - next if $camRun->{quality}; - next if $camRun->{fault}; - - updateCamRunCache($camRun); + next if $result->{quality}; + + if ($using_camtool) { + next if $result->{fault}; + } else { + $result->{path_base} = $result->{cam_path_base}; + } + updateCamRunCache($result); $last_exp_id = $exp_id; # XXX Use file rule - my $astrom = $camRun->{path_base} . ".smf"; + my $astrom = $result->{path_base} . ".smf"; my $astrom_resolved = $ipprc->file_resolve($astrom); next if !$astrom_resolved; @@ -832,5 +1053,5 @@ } - print "cam_id $cam_id exp_id $camRun->{exp_id} chip_id $camRun->{chip_id} $class_id\n"; + print "cam_id $cam_id exp_id $result->{exp_id} chip_id $result->{chip_id} $class_id\n"; # build the hash to return @@ -840,19 +1061,20 @@ # problem my $comp = { - exp_id => $camRun->{exp_id}, - exp_name => $camRun->{exp_name}, - chip_id => $camRun->{chip_id}, - cam_id => $camRun->{cam_id}, + exp_id => $result->{exp_id}, + exp_name => $result->{exp_name}, + chip_id => $result->{chip_id}, + cam_id => $result->{cam_id}, class_id => $class_id, - component => $class_id + component => $class_id, + astrom => $astrom }; - if ($img_type eq "chip") { - $comp->{id} = $camRun->{chip_id}; - $comp->{state} = $camRun->{chip_state}; - $comp->{magicked} = $camRun->{chip_magicked}; - } else { - $comp->{id} = $camRun->{exp_id}; + if ($stage eq "chip") { + $comp->{id} = $result->{chip_id}; + $comp->{state} = $result->{chip_state}; + $comp->{magicked} = 0; + } else { + $comp->{id} = $result->{exp_id}; $comp->{state} = 'full'; - $comp->{magicked} = $camRun->{raw_magicked}; + $comp->{magicked} = $0; } push @$components, $comp; @@ -1281,4 +1503,67 @@ } +sub selectComponentsByName { + my $ipprc = shift; + my $imagedb = shift; + my $req_type = shift; + my $stage = shift; + my $component = shift; + my $rowList = shift; + my $runList = shift; + my $verbose = shift; + my $results = []; + + $component = "" if $component and lc($component) eq 'all'; + + # all runs match all rows so they can share a common row_index + # XXX: I'm not sure we ever actually get here with more than one + # row + my $numRows = scalar @$rowList; + my $row_index = []; + for (my $i=0; $i < $numRows; $i++) { + push @$row_index, $i; + } + + if (($req_type eq "byid") or ($req_type eq "byexp")) { + my ($last_tess_id, $tess_dir_abs, $astrom_file) = ("", "", ""); + foreach my $run (@$runList) { + # now find the images for this run + #foreach my $c (keys %components) { + my $command; + my $stage_id; + if ($stage eq 'raw') { + $stage_id = $run->{exp_id}; + $command = "$regtool -processedimfile -exp_id $stage_id"; + $command .= " -class_id $component" if $component; + } elsif ($stage eq 'chip') { + $stage_id = $run->{chip_id}; + $command = "$chiptool -processedimfile -chip_id $stage_id"; + $command .= " -class_id $component" if $component; + } elsif ($stage eq 'warp') { + $stage_id = $run->{warp_id}; + $command = "$warptool -warped -warp_id $stage_id"; + $command .= " -skycell_id $component" if $component; + } + $command .= " -dbname $imagedb"; + my $images = runToolAndParse($command, $verbose); + if (!defined $images) { + print "No $component found for $stage ${stage}_id $stage_id\n"; + next; + } + foreach my $image (@$images) { + $image->{row_index} = $row_index; + if (($stage eq "raw") or ($stage eq 'chip')) { + $image->{cam_id} = $run->{cam_id}; + $image->{cam_path_base} = $run->{cam_path_base}; + } + push @$results, $image; + } + } + } else { + &my_die ("selectComponentsByName not supported for REQ_TYPE: $req_type\n", $PS_EXIT_PROG_ERROR); + } + return $results; +} + sub filterRuns { my $stage = shift; @@ -1407,4 +1692,6 @@ $dvoImagesAtCoords = can_run('dvoImagesAtCoords') or (warn "Can't find dvoImagesAtCoords" and $missing_tools = 1); + $releasetool = can_run('releasetool') or (warn "Can't find releasetool" + and $missing_tools = 1); $whichimage = can_run('whichimage') or (warn "Can't find whichimage" and $missing_tools = 1); $ppConfigDump = can_run('ppConfigDump') or (warn "Can't find ppConfigDump" and $missing_tools = 1); @@ -1462,4 +1749,20 @@ } +sub get_release_info { + my $row = shift; + + my $survey; + my $release_name = $row->{IPP_RELEASE}; + if (isnull($release_name)) { + $release_name = ""; + # no release check for survey + $survey = $row->{SURVEY_NAME}; + } else { + $survey = ""; + } + + return ($release_name, $survey); +} + sub my_die { Index: branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm =================================================================== --- branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (revision 35350) +++ branches/eam_branches/ipp-20130307/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (revision 35413) @@ -52,4 +52,5 @@ $PSTAMP_NO_OVERLAP $PSTAMP_NOT_AUTHORIZED + $PSTAMP_UNKNOWN_PROJECT ); our %EXPORT_TAGS = (standard => [@EXPORT_OK]); @@ -101,4 +102,5 @@ our $PSTAMP_NO_OVERLAP = 28; our $PSTAMP_NOT_AUTHORIZED = 29; +our $PSTAMP_UNKNOWN_PROJECT = 22; @@ -167,5 +169,5 @@ my $fields_output; { - my $command = "echo $request_file_name | $fields -x 0 EXTNAME EXTVER REQ_NAME ACTION USERNAME EMAIL"; + my $command = "echo $request_file_name | $fields -x 0 EXTNAME EXTVER REQ_NAME ACTION EMAIL"; my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose); @@ -187,16 +189,12 @@ if ($extver > 1) { $header{ACTION} = $action; - $header{USER} = $username; $header{EMAIL} = $email; } else { $header{ACTION} = $action = "PROCESS"; - $header{USERNAME} = 'null'; $header{EMAIL} = 'null'; } - if ($action eq "LIST") { - return (\%header, undef); - } elsif ($action ne "PROCESS") { - die "unexpected request ACTION found: $action in $request_file_name"; + if ($action ne "PROCESS" and $action ne 'PREVIEW') { + die "\nunexpected request ACTION found: $action in $request_file_name"; }