Index: /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm =================================================================== --- /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (revision 35383) +++ /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/Job.pm (revision 35384) @@ -15,4 +15,5 @@ our @EXPORT_OK = qw( locate_images + new_locate_images 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 (!$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,138 @@ } - my $results = lookup($ipprc, $rowList, $imagedb, $req_type, $img_type, $id, $tess_id, $component, + 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, $verbose); + + return $results; +} + +sub new_locate_images { + 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"); + + if (!$default_data_groups) { + $default_data_groups = load_data_groups($verbose); + } + + 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}; + + 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 + 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; + } + + 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, $verbose); return $results; @@ -505,5 +640,5 @@ my $byid = shift; my $option_mask = shift; - my $img_type = shift; + my $stage = shift; my $verbose = shift; @@ -573,6 +708,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 +760,5 @@ } - if ($img_type eq "diff") { + if ($stage eq "diff") { my @imageList = ($image); @@ -656,7 +791,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; @@ -673,9 +808,13 @@ my $verbose = shift; + my ($release_name, $survey) = get_release($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,5 +823,5 @@ 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); @@ -695,6 +834,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,5 +843,5 @@ } 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); @@ -722,10 +861,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 +872,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) { + my $command = "$releasetool -dbname $imagedb -listrelexp"; + if ($survey) { + $command .= " -survey_name $survey"; + } + if ($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 +911,35 @@ } $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}; + 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 +995,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 +1003,19 @@ # 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 }; - 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; @@ -1407,4 +1570,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 +1627,17 @@ } +sub get_release { + my $row = shift; + + my $survey; + my $release_name = $row->{IPP_RELEASE}; + if (!isnull($release_name)) { + # no release check for survey + $survey = $row->{SURVEY_NAME}; + } + + return ($release_name, $survey); +} + sub my_die { Index: /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm =================================================================== --- /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (revision 35383) +++ /trunk/PS-IPP-PStamp/lib/PS/IPP/PStamp/RequestFile.pm (revision 35384) @@ -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; Index: /trunk/pstamp/scripts/pstampparse.pl =================================================================== --- /trunk/pstamp/scripts/pstampparse.pl (revision 35383) +++ /trunk/pstamp/scripts/pstampparse.pl (revision 35384) @@ -211,20 +211,13 @@ print "\n$nRows rows read from request file\n"; -# If this is a big request and it came from the upload page and doesn't have a specific label assigned -# change it to the generic one that has lower with lower priority - -# -# Loop over rows in the request file collecting consecutive rows that have the "same images of interest" -# in the sense that their selection parameters will yield the same target "Runs". -# Process the groups of rows together to reduce lookup time and to potentially make multiple -# stamps from the same ppstamp process. - -my @rowList; + my $num_jobs = 0; my $imageList; my $stage; -my $need_magic; foreach my $row (@$rows) { + if ($label eq 'WEB.UP' and ($nRows > 500 or $num_jobs > 500) and $req_id and !$no_update) { + # this is a big request and it came from the upload page and doesn't have a specific label assigned + # change it to the generic one that has lower with lower priority $label = 'WEB.BIG'; print "\nChanging label for big WEB.UP request to $label\n"; @@ -237,5 +230,6 @@ } } - # sanity check the paramaters + + # validate the paramaters if (!checkRow($row)) { # when it enconters an error checkRow adds a fake job with an appropriate error code to the database @@ -247,27 +241,5 @@ $row->{error_code} = 0; - if (scalar @rowList == 0) { - push @rowList, $row; - next; - } - - my $firstRow = $rowList[0]; - if (same_images_of_interest($firstRow, $row)) { - # add this row to the list and move on - push @rowList, $row; - next; - } - - # the images of interest for this new row doesn't match the list. - # process the list ... - $num_jobs += processRows($action, \@rowList); - - # and reset the list to contain just the new row - @rowList = ($row); -} - -# out of rows process the list -if (scalar @rowList > 0) { - $num_jobs += processRows($action, \@rowList); + $num_jobs += processRow($action, $row); } @@ -283,5 +255,7 @@ my $row = shift; + # check validity of the paramters in a request specification # If we encounter an error for a particular row add a job with the proper fault code. + # also adjust some paramterers like filter and set defaults for some others my $stage = $row->{IMG_TYPE}; @@ -315,5 +289,4 @@ } - my $component = $row->{COMPONENT}; if (!defined $component or (lc($component) eq "null") or (lc($component) eq "all")) { @@ -345,4 +318,22 @@ return 0; } + + my $fwhm_min = $row->{FWHM_MIN}; + if (!defined $fwhm_min) { + $row->{FWHM_MIN} = 0; + } elsif (!validNumber($fwhm_min)) { + print STDERR "$fwhm_min is not a valid FWHM_MIN\n"; + insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST); + return 0; + } + my $fwhm_max = $row->{FWHM_MAX}; + if (!defined $fwhm_max) { + $row->{FWHM_MAX} = 0; + } elsif (!validNumber($fwhm_max)) { + print STDERR "$fwhm_max is not a valid FWHM_MAX\n"; + insertFakeJobForRow($row, 1, $PSTAMP_INVALID_REQUEST); + return 0; + } + my $data_group = $row->{DATA_GROUP}; if (!defined $data_group) { @@ -410,4 +401,5 @@ } + return 1; } @@ -418,4 +410,65 @@ $num_jobs = 1; + return $num_jobs; +} + +sub processRow { + my $action = shift; + my $row = shift; + + my $num_jobs = 0; + + my $project = $row->{PROJECT}; + + # note: resolve_project avoids running pstamptool every time by remembering the + # last project resolved + my $proj_hash = resolve_project($ipprc, $project, $dbname, $dbserver); + if (!$proj_hash) { + insertFakeJobForRow($row, 1, $PSTAMP_UNKNOWN_PROJECT); + $num_jobs++; + return $num_jobs; + } + my $image_db = $proj_hash->{dbname}; + my $camera = $proj_hash->{camera}; + + my $req_type = $row->{REQ_TYPE}; + my $rownum = $row->{ROWNUM}; + + # Since user can get unmagicked data "by coordinate" requests can go back in time + # to dredge unusable data from the "dark days"... + if ($req_type eq 'bycoord' and $row->{MJD_MIN} == 0) { + # ... so unless the user sets mjd_min clamp it to 2009-04-01 + # XXX: This value should live in the pstampProject table not be hardcoded here + $row->{MJD_MIN} = 54922; + } + + if (($req_type eq 'byskycell') or ($req_type eq 'bycoord')) { + # avoid error from print below if $id isn't needed + $row->{ID} = "" if !$row->{ID}; + } + + # Call PS::IPP::PStamp::Job locate_images subroutine to get the images for this + # request specification. An array reference is returned. + my $start_locate = gettimeofday(); + + print "\nCalling new_locate_images for row: $rownum\n"; + + $imageList = new_locate_images($ipprc, $image_db, $camera, $row, $verbose); + + my $dtime_locate = gettimeofday() - $start_locate; + print "Time to locate_images for row $rownum $dtime_locate\n"; + + my @rowList = ($row); + $num_jobs += queueJobs($action, \@rowList, $imageList); + + # if this row slipped through without a job being added add one. + if ($row->{job_num} == 0) { + print "row $row->{ROWNUM} produced no jobs\n"; + print STDERR "row $row->{ROWNUM} produced no jobs\n"; + my $error_code = $row->{error_code}; + $error_code = $PSTAMP_NO_IMAGE_MATCH if !$error_code; + insertFakeJobForRow($row, ++$row->{job_num}, $error_code); + } + return $num_jobs; } @@ -447,5 +500,5 @@ } my $req_type = $row->{REQ_TYPE}; - $stage = $row->{IMG_TYPE}; + my $stage = $row->{IMG_TYPE}; my $id = $row->{ID}; my $component = $row->{COMPONENT}; @@ -463,5 +516,5 @@ my $image_db = $proj_hash->{dbname}; my $camera = $proj_hash->{camera}; - $need_magic = $proj_hash->{need_magic}; + my $need_magic = $proj_hash->{need_magic}; # Since user can get unmagicked data "by coordinate" requests can go back in time # to dredge unusable data from the "dark days"... @@ -523,5 +576,5 @@ # information required is contained there - $imageList = locate_images($ipprc, $image_db, \@rowList, $req_type, $stage, $id, $tess_id, $component, + $imageList = locate_images($ipprc, $image_db, $rowList, $req_type, $stage, $id, $tess_id, $component, $option_mask, $need_magic, $mjd_min, $mjd_max, $filter, $data_group, $verbose); @@ -533,8 +586,8 @@ $row->{need_magic} = $need_magic; - $num_jobs += queueJobs($action, \@rowList, $imageList); + $num_jobs += queueJobs($action, $rowList, $imageList); # if a row slipped through with no jobs add a faulted one - foreach my $row (@rowList) { + foreach my $row (@$rowList) { if ($row->{job_num} == 0) { print "row $row->{ROWNUM} produced no jobs\n"; @@ -675,5 +728,5 @@ my $imageList = shift; - my $firstRow = $rowList[0]; + my $firstRow = $rowList->[0]; my $stage = $firstRow->{IMG_TYPE}; my $job_type = $firstRow->{JOB_TYPE}; @@ -1004,4 +1057,6 @@ my $r_fault = shift; my $r_dep_id = shift; + + my $need_magic = 0; if ($stage ne 'raw') {