Changeset 17409

Timestamp:

Apr 8, 2008, 11:24:51 AM (18 years ago)

Author:

eugene

Message:

working towards chip sans astrom

Location:

branches/eam_branch_20080408/ippScripts/scripts

Files:

• camera_exp.pl (modified) (2 diffs)
• chip_imfile.pl (modified) (2 diffs)

branches/eam_branch_20080408/ippScripts/scripts/camera_exp.pl

@@ -161 +161 @@
 
     # If there is only one chip, we use this name for the input to addstar
-    $chipObjects = $ipprc->filename("PSASTRO.OUTPUT", $file->{path_base}, $class_id);
+    # we expect the chip analysis stage to produce psphot output (cmf file) and two binned images
+    $chipObjects = $ipprc->filename("PSPHOT.OUTPUT", $file->{path_base}, $class_id);
     print $list1File ($ipprc->filename("PPIMAGE.BIN1", $file->{path_base}, $class_id) . "\n");
     print $list2File ($ipprc->filename("PPIMAGE.BIN2", $file->{path_base}, $class_id) . "\n");
@@ -178 +179 @@
 $ipprc->outroot_prepare($outroot);
 
+# the camera configurations should define the psastro output to be a single file (MEF), regardless of the inputs
 my $jpeg1      = $ipprc->filename("PPIMAGE.JPEG1",      $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);
 my $jpeg2      = $ipprc->filename("PPIMAGE.JPEG2",      $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);
-my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT.MEF", $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);
+my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",     $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);
 my $traceDest  = $ipprc->filename("TRACE.EXP",          $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);
 my $logDest    = $ipprc->filename("LOG.EXP",            $outroot) or &my_die("Missing entry from camera config", $cam_id, $PS_EXIT_CONFIG_ERROR);

branches/eam_branch_20080408/ippScripts/scripts/chip_imfile.pl

@@ -85 +85 @@
        { name => "FRINGE_RESID_0", type => "rms",   flag => "-fringe_1",       dtype => "float" },
        { name => "FRINGE_ERR_0",   type => "rms",   flag => "-fringe_2",       dtype => "float" },
-       { name => "CERROR",         type => "rms",   flag => "-sigma_ra",       dtype => "float" },
-       { name => "CERROR",         type => "rms",   flag => "-sigma_dec",      dtype => "float" },
+#      { name => "CERROR",         type => "rms",   flag => "-sigma_ra",       dtype => "float" },
+#      { name => "CERROR",         type => "rms",   flag => "-sigma_dec",      dtype => "float" },
        { name => "APMIFIT",        type => "mean",  flag => "-ap_resid",       dtype => "float" },
        { name => "DAPMIFIT",       type => "rms",   flag => "-ap_resid_stdev", dtype => "float" },
@@ -95 +95 @@
        { name => "DT_DET",         type => "sum",   flag => "-dtime_detrend",  dtype => "float" },
        { name => "DT_PHOT",        type => "sum",   flag => "-dtime_photom",   dtype => "float" },
-       { name => "DT_ASTR",        type => "sum",   flag => "-dtime_astrom",   dtype => "float" },
+#       { name => "DT_ASTR",        type => "sum",   flag => "-dtime_astrom",   dtype => "float" },
        { name => "NSTARS",         type => "sum",   flag => "-n_stars",        dtype => "int"   },
 #      { name => "?",              type => "sum",   flag => "-n_extended",     dtype => "int"   },
 #      { name => "?",              type => "sum",   flag => "-n_cr",           dtype => "int"   },
-       { name => "NASTRO",         type => "sum",   flag => "-n_astrom",       dtype => "int"   },
+#      { name => "NASTRO",         type => "sum",   flag => "-n_astrom",       dtype => "int"   },
    ];
 my $stats = PS::IPP::Metadata::Stats->new($STATS); # Stats parser