Changeset 35932

Timestamp:

Aug 13, 2013, 11:18:43 AM (13 years ago)

Author:

bills

Message:

Add two more keywords

DVOCALIB true if exposure was calibrated using dvo (relExp.state == calibrated)
UCALEXP true of expoure was calibrated and has flags & 0x200

Also accept - as output file name and in this case redirect to stdout

File:

• trunk/pstamp/scripts/psgetcalibinfo (modified) (1 diff)

trunk/pstamp/scripts/psgetcalibinfo

@@ -75 +75 @@
     }
 }
+
+
+my $OUT;
+if ($output eq '-') {
+    $OUT = *STDOUT;
+} else {
+    open $OUT, ">$output" or die "failed to open $output for writing\n";
+}
+
 if (!$relexp) {
-    print "Failed to find calibration information for camRun: $cam_id\n";
+    print STDERR "Failed to find calibration information for camRun: $cam_id\n";
+    print $OUT "DVOCALIB     STR         F # exposure not calibrated with DVO\n";
     exit 0;
 }
 
-open OUT, ">$output" or die "failed to open $output for writing\n";
+my $ubercal_exp = ($relexp->{flags} & 0x200) ? "T # exposure has ubercal zero point" : "F # exposure does not have ubercal zero point";
 
-print OUT "ZPCALIB      F32         $relexp->{zpt_obs} # calibrated zero point\n";
-print OUT "ZPCALERR     F32         $relexp->{zpt_stdev} # calibrated zero point error - 0 for ubercal exposure\n";
-print OUT "MCAL         F32         $relexp->{mcal} # zero point offset due to clouds\n";
-print OUT "DVOFLAGS     U32         $relexp->{flags} # dvo flags - 512 is ubercal bit\n";
-print OUT "UCALDIST     S32         $relexp->{ubercal_dist} # distance to ubercal image\n";
-print OUT "DVODB        STR         $relexp->{dvodb} # dvo database used for calibration \n";
-print OUT "UCALFILE     STR         $relexp->{ubercal_file} # ubercal file used for calibration\n";
-print OUT "CALDATE      STR         $relexp->{time_stamp} # time of calibration\n";
-print OUT "PSREL        STR         $relexp->{release_name} # PS release name\n";
+print $OUT "DVOCALIB     STR         T # exposure calibrated with DVO\n";
+print $OUT "ZPCALIB      F32         $relexp->{zpt_obs} # calibrated zero point\n";
+print $OUT "ZPCALERR     F32         $relexp->{zpt_stdev} # calibrated zero point error - 0 for ubercal exposure\n";
+print $OUT "MCAL         F32         $relexp->{mcal} # zero point offset due to clouds\n";
+print $OUT "UCALEXP      STR         $ubercal_exp\n";
+print $OUT "DVOFLAGS     U32         $relexp->{flags} # dvo flags\n";
+print $OUT "UCALDIST     S32         $relexp->{ubercal_dist} # distance to ubercal image\n";
+print $OUT "DVODB        STR         $relexp->{dvodb} # dvo database used for calibration \n";
+print $OUT "UCALFILE     STR         $relexp->{ubercal_file} # ubercal file used for calibration\n";
+print $OUT "CALDATE      STR         $relexp->{time_stamp} # time of calibration\n";
+print $OUT "PSREL        STR         $relexp->{release_name} # PS release name\n";
 
-close OUT or die "failed to close $output\n";
+close $OUT or die "failed to close $output\n";