Changeset 16752
- Timestamp:
- Feb 28, 2008, 5:02:12 PM (18 years ago)
- Location:
- trunk/ippScripts/scripts
- Files:
-
- 7 edited
-
ipp_serial_camera.pl (modified) (3 diffs)
-
ipp_serial_chip.pl (modified) (3 diffs)
-
ipp_serial_detrend.pl (modified) (11 diffs)
-
ipp_serial_diff.pl (modified) (1 diff)
-
ipp_serial_stack.pl (modified) (1 diff)
-
ipp_serial_warp.pl (modified) (1 diff)
-
warp_skycell.pl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippScripts/scripts/ipp_serial_camera.pl
r16336 r16752 7 7 use PS::IPP::Metadata::Config; 8 8 use PS::IPP::Metadata::List qw( parse_md_list ); 9 use PS::IPP::Config qw( caturi ); 9 10 use Data::Dumper; 10 11 … … 34 35 35 36 my $mdcParser = PS::IPP::Metadata::Config->new; # Metadata config parser 37 my $ipprc = PS::IPP::Config->new; # IPP Configuration 36 38 37 39 # Look for programs we need … … 59 61 60 62 $workdir = $workdir_default unless (defined $workdir or $workdir ne "NULL"); 61 my $outroot = $workdir . '/' . ${exp_tag} . '/' . ${exp_tag} . '.cm.' . ${cam_id}; 63 my $outroot = caturi( $workdir, $exp_tag, "$exp_tag.cm.$cam_id" ); 64 $ipprc->outroot_prepare( $outroot ); 62 65 63 66 my $command = "$camera_exp --cam_id $cam_id --exp_tag $exp_tag --camera $camera --dbname $dbname"; -
trunk/ippScripts/scripts/ipp_serial_chip.pl
r16336 r16752 7 7 use PS::IPP::Metadata::Config; 8 8 use PS::IPP::Metadata::List qw( parse_md_list ); 9 use PS::IPP::Config qw( caturi ); 9 10 use Data::Dumper; 10 11 … … 34 35 35 36 my $mdcParser = PS::IPP::Metadata::Config->new; # Metadata config parser 37 my $ipprc = PS::IPP::Config->new; # IPP Configuration 36 38 37 39 # Look for programs we need … … 73 75 $workdir = $workdir_default unless (defined $workdir or $workdir ne "NULL"); 74 76 75 my $outroot = $workdir . '/' . ${exp_tag} . '/' . ${exp_tag} . '.ch.' . ${chip_id}; 77 my $outroot = caturi( $workdir, $exp_tag, "$exp_tag.ch.$chip_id" ); 78 $ipprc->outroot_prepare( $outroot ); 76 79 77 80 my $command = "$chip --chip_id $chip_id --exp_id $exp_id --exp_tag $exp_tag --class_id $class_id --uri $uri --dbname $dbname --camera $camera --outroot $outroot"; -
trunk/ippScripts/scripts/ipp_serial_detrend.pl
r16744 r16752 9 9 use PS::IPP::Metadata::Config qw( caturi ); 10 10 use PS::IPP::Metadata::List qw( parse_md_list ); 11 use PS::IPP::Config; 11 12 use Data::Dumper; 12 13 … … 25 26 26 27 my $mdcParser = PS::IPP::Metadata::Config->new; # Metadata config parser 28 my $ipprc = PS::IPP::Config->new(); # IPP configuration 27 29 28 30 # Look for programs we need … … 74 76 75 77 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", $exp_tag, "$exp_tag.detproc.$det_id" ); 78 $ipprc->outroot_prepare( $outroot ); 76 79 77 80 my $command = "$detrend_process_imfile --det_id $det_id --exp_tag $exp_tag --exp_id $exp_id --class_id $class_id --det_type $det_type --input_uri $uri --camera $camera --dbname $dbname --outroot $outroot"; … … 109 112 110 113 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", $exp_tag, "$exp_tag.detproc.$det_id" ); 114 $ipprc->outroot_prepare( $outroot ); 111 115 112 116 my $command = "$detrend_process_exp --det_id $det_id --det_type $det_type --exp_tag $exp_tag --exp_id $exp_id --camera $camera --dbname $dbname --outroot $outroot"; … … 139 143 140 144 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", "$camera.$det_type.$det_id.$iteration" ); 145 $ipprc->outroot_prepare( $outroot ); 146 141 147 142 148 my $command = "$detrend_stack --det_id $det_id --iteration $iteration --class_id $class_id --det_type $det_type --camera $camera --dbname $dbname --outroot $outroot"; … … 168 174 169 175 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", "$camera.$det_type.normstat.$det_id.$iteration" ); 176 $ipprc->outroot_prepare( $outroot ); 170 177 171 178 my $command = "$detrend_norm_calc --det_id $det_id --iteration $iteration --det_type $det_type --dbname $dbname --outroot $outroot"; … … 199 206 200 207 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", "$camera.$det_type.norm.$det_id.$iteration" ); 208 $ipprc->outroot_prepare( $outroot ); 201 209 202 210 my $command = "$detrend_norm_apply --det_id $det_id --iteration $iteration --class_id $class_id --value $value --input_uri $uri --camera $camera --det_type $det_type --dbname $dbname --outroot $outroot"; … … 230 238 231 239 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", "$camera.$det_type.normexp.$det_id.$iteration" ); 240 $ipprc->outroot_prepare( $outroot ); 232 241 233 242 my $command = "$detrend_norm_exp --det_id $det_id --iteration $iteration --camera $camera --det_type $det_type --dbname $dbname --outroot $outroot"; … … 275 284 276 285 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", $exp_tag, "$exp_tag.detresid.$det_id.$iteration" ); 277 286 $ipprc->outroot_prepare( $outroot ); 287 278 288 my $command = "$detrend_resid --det_id $det_id --iteration $iteration --exp_tag $exp_tag --exp_id $exp_id --class_id $class_id --det_type $det_type --camera $camera --input_uri $uri --mode $mode --dbname $dbname --outroot $outroot"; 279 289 $command .= " --reduction $reduction" if defined $reduction; … … 313 323 314 324 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", $exp_tag, "$exp_tag.detresid.$det_id.$iteration" ); 315 325 $ipprc->outroot_prepare( $outroot ); 326 316 327 my $command = "$detrend_reject_imfile --det_id $det_id --iteration $iteration --exp_tag $exp_tag --exp_id $exp_id --det_type $det_type --camera $camera --dbname $dbname --outroot $outroot"; 317 328 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = … … 341 352 342 353 my $outroot = caturi( $workdir, "$camera.$det_type.$det_id", "$camera.$det_type.$det_id.$iteration.detreject" ); 343 354 $ipprc->outroot_prepare( $outroot ); 355 344 356 my $command = "$detrend_reject_exp --det_id $det_id --iteration $iteration --det_type $det_type --camera $camera --dbname $dbname --outroot $outroot"; 345 357 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = -
trunk/ippScripts/scripts/ipp_serial_diff.pl
r16749 r16752 80 80 81 81 my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.dif.$diff_id" ); 82 $ipprc->outroot_prepare( $outroot ); 82 83 83 84 my $command = "$diff_skycell --diff_id $diff_id --dbname $dbname --outroot $outroot"; -
trunk/ippScripts/scripts/ipp_serial_stack.pl
r16749 r16752 82 82 83 83 my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.stk.$stack_id" ); 84 $ipprc->outroot_prepare( $outroot ); 84 85 85 86 my $command = "$stack_skycell --stack_id $stack_id --dbname $dbname --outroot $outroot"; -
trunk/ippScripts/scripts/ipp_serial_warp.pl
r16749 r16752 114 114 115 115 my $outroot = caturi( $workdir, "tess_$tess_id", $skycell_id, "$tess_id.$skycell_id.wrp.$warp_id" ); 116 $ipprc->outroot_prepare( $outroot ); 116 117 117 118 my $command = "$warp_skycell --warp_id $warp_id --skycell_id $skycell_id --tess_id $tess_id --camera $camera --dbname $dbname --outroot $outroot"; -
trunk/ippScripts/scripts/warp_skycell.pl
r16751 r16752 132 132 # Get list of filenames 133 133 my $outrootResolved = $ipprc->file_resolve( $outroot ); 134 my ($imageFile, $imageName) = tempfile( caturi($outrootResolved, "$tess_id.$skycell_id.wrp$warp_id.image.list.XXXX"), UNLINK => !$save_temps);135 my ($maskFile, $maskName) = tempfile( caturi($outrootResolved, "$tess_id.$skycell_id.wrp$warp_id.mask.list.XXXX"), UNLINK => !$save_temps);136 my ($weightFile, $weightName) = tempfile( caturi($outrootResolved, "$tess_id.$skycell_id.wrp$warp_id.weight.list.XXXX"), UNLINK => !$save_temps);137 my ($astromFile, $astromName) = tempfile( caturi($outrootResolved, "$tess_id.$skycell_id.wrp$warp_id.astrom.list.XXXX"), UNLINK => !$save_temps);134 my ($imageFile, $imageName) = tempfile( "$outrootResolved.image.list.XXXX"), UNLINK => !$save_temps); 135 my ($maskFile, $maskName) = tempfile( "$outrootResolved.mask.list.XXXX"), UNLINK => !$save_temps); 136 my ($weightFile, $weightName) = tempfile( "$outrootResolved.weight.list.XXXX"), UNLINK => !$save_temps); 137 my ($astromFile, $astromName) = tempfile( "$outrootResolved.astrom.list.XXXX"), UNLINK => !$save_temps); 138 138 139 139 foreach my $imfile (@$imfiles) {
Note:
See TracChangeset
for help on using the changeset viewer.
