IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42350


Ignore:
Timestamp:
Feb 3, 2023, 8:09:22 AM (3 years ago)
Author:
tdeboer
Message:

merging changes to nightly_science.pl

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tags/ipp-ops-20220705/ippScripts/scripts/nightly_science.pl

    • Property svn:mergeinfo changed (with no actual effect on merging)
    r42342 r42350  
    15571557        my $this_object = shift @{ $object_row };       
    15581558        my $this_chunk = shift @{ $object_row };
    1559         my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,chipRun.state,camRun.state FROM ";
     1559        my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,camProcessedExp.fwhm_major,chipRun.state,camRun.state FROM ";
    15601560        $input_sth .=   " rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id) ";
    15611561        $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
    … …  
    15761576            my $chip_state   = ${ $this_warp }[7];
    15771577            my $cam_state   = ${ $this_warp }[8];
    1578             my $cam_state   = ${ $this_warp }[7];
    15791578           
    15801579            #find exposures for this object that have not been fully processed
    … …  
    17701769            my $this_chunk = shift @{ $object_row };
    17711770       
    1772             my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,substr(comment, 1, position(' ' in comment)),camProcessedExp.fwhm_major,chipRun.state,camRun.state FROM ";
     1771            my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,camProcessedExp.fwhm_major,chipRun.state,camRun.state FROM ";
    17731772            $input_sth .=   " rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id) ";
    17741773            $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
    … …  
    17911790                my $chip_state   = ${ $this_warp }[7];
    17921791                my $cam_state   = ${ $this_warp }[8];
    1793                 my $cam_state   = ${ $this_warp }[9];
    17941792
    17951793                #find exposures for this object that have not been fully processed
    … …  
    21622160            my $this_chunk = shift @{ $object_row };
    21632161       
    2164             my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,substr(comment, 1, position(' ' in comment)),camProcessedExp.fwhm_major,chipRun.state,camRun.state FROM ";
     2162            my $input_sth = "select exp_id,warp_id,dateobs,rawExp.comment,warpRun.state AS warp_state,camProcessedExp.quality,camProcessedExp.fwhm_major,chipRun.state,camRun.state FROM ";
    21652163            $input_sth .=   " rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id) ";
    21662164            $input_sth .=   " WHERE chipRun.label = '$label' AND chipRun.data_group = '$data_group' AND rawExp.filter = '$filter' AND rawExp.object = '$this_object' ";
    … …  
    21832181                my $chip_state   = ${ $this_warp }[7];
    21842182                my $cam_state   = ${ $this_warp }[8];
    2185                 my $cam_state   = ${ $this_warp }[9];
    21862183
    21872184                #find exposures for this object that have not been fully processed
Note: See TracChangeset for help on using the changeset viewer.