Changeset 25074

Timestamp:

Aug 14, 2009, 12:39:56 PM (17 years ago)

Author:

Paul Price

Message:

For MOPS, write exposure name as FPA_ID, exposure identifier as EXP_ID.

Location:

trunk

Files:

• ippScripts/scripts/publish_file.pl (modified) (5 diffs)
• ippTools/src/difftool.c (modified) (1 diff)
• ppMops/src/ppMops.c (modified) (3 diffs)
• ppMops/src/ppMops.h (modified) (1 diff)
• ppMops/src/ppMopsData.c (modified) (2 diffs)

trunk/ippScripts/scripts/publish_file.pl

@@ -82 +82 @@
 my %zp;                         # Zero points
 my %exp_id;                     # Exposure identifiers
+my %exp_name;                   # Exposure names
 {
     my $command;                # Command to run
@@ -118 +119 @@
             $zp{"$skycell_id.pos"} = $zp;
             $zp{"$skycell_id.neg"} = $zp if defined $comp->{bothways} and $comp->{bothways};
-            $exp_id{"$skycell_id.pos"} = $comp->{exp1};
-            $exp_id{"$skycell_id.neg"} = $comp->{exp2} if defined $comp->{bothways} and $comp->{bothways};
+            $exp_id{"$skycell_id.pos"} = $comp->{exp_id_1};
+            $exp_id{"$skycell_id.neg"} = $comp->{exp_id_2} if defined $comp->{bothways} and $comp->{bothways};
+            $exp_name{"$skycell_id.pos"} = $comp->{exp_name_1};
+            $exp_name{"$skycell_id.neg"} = $comp->{exp_name_2} if defined $comp->{bothways} and $comp->{bothways};
         } elsif ($stage eq 'camera') {
             my $cam_id = $comp->{cam_id};
@@ -125 +128 @@
             $zp{$cam_id} = $zp;
             $exp_id{$cam_id} = $comp->{exp_id};
+            $exp_name{$cam_id} = $comp->{exp_name};
         }
     }
@@ -140 +144 @@
     my $zp = $zp{$comp};
     my $exp_id = $exp_id{$comp};
+    my $exp_name = $exp_name{$comp};
     if ($product eq "IPP-MOPS") {
         my $outuri = "$outroot.$comp.fits";
@@ -145 +150 @@
             &my_die( "Unable to resolve output file $outuri", $pub_id, $PS_EXIT_SYS_ERROR);
 
-        my $command = "$ppMops $file $zp $exp_id $out";
+        my $command = "$ppMops $file $zp $exp_id $exp_name $out";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);

trunk/ippTools/src/difftool.c

@@ -1179 +1179 @@
 
         if (!available && (num != skycell_count)) {
-            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %"
-                PRId64 " need %" PRId64, num, skycell_count, warp_id);
+            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %" PRId64
+                    " need %" PRId64, num, warp_id, skycell_count);
             continue;
         }

trunk/ppMops/src/ppMops.c

@@ -6 +6 @@
 int main(int argc, char *argv[])
 {
-    if (argc != 5) {
+    if (argc != 6) {
         fprintf(stderr, "Insufficient arguments.\n");
         fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID OUTPUT\n", argv[0]);
@@ -16 +16 @@
     data->zp = atof(argv[2]);
     data->exp_id = atoll(argv[3]);
-    data->output = psStringCopy(argv[4]);
+    data->exp_name = psStringCopy(argv[4]);
+    data->output = psStringCopy(argv[5]);
 
     if (!isfinite(data->zp)) {
@@ -137 +138 @@
         psMetadataAddF64(outHeader, PS_LIST_TAIL, "TEL_ALT", 0, "Telescope altitude", alt);
         psMetadataAddF64(outHeader, PS_LIST_TAIL, "TEL_AZ", 0, "Telescope azimuth", az);
-        psMetadataAddS32(outHeader, PS_LIST_TAIL, "DIFFIMID", 0, "Difference image identifier", imageid);
-        psMetadataAddS32(outHeader, PS_LIST_TAIL, "FPA_ID", 0, "Exposure identifier", data->exp_id);
+        psMetadataAddS64(outHeader, PS_LIST_TAIL, "DIFFIMID", 0, "Difference image identifier", imageid);
+        psMetadataAddStr(outHeader, PS_LIST_TAIL, "FPA_ID", 0, "Exposure name", data->exp_name);
+        psMetadataAddS64(outHeader, PS_LIST_TAIL, "EXP_ID", 0, "Exposure identifier", data->exp_id);
         psMetadataAddStr(outHeader, PS_LIST_TAIL, "OBSCODE", 0, "IAU Observatory code", OBSERVATORY_CODE);
         psMetadataAddF32(outHeader, PS_LIST_TAIL, "STARPSF", 0, "Stellar PSF (arcsec)", psf);

trunk/ppMops/src/ppMops.h

@@ -17 +17 @@
     float zp;                           // Magnitude zero point
     psS64 exp_id;                       // Exposure identifier
+    psString exp_name;                  // Exposure name
     psString output;                    // Output filename
 } ppMopsData;

trunk/ppMops/src/ppMopsData.c

@@ -11 +11 @@
 {
     psFree(data->detections);
+    psFree(data->exp_name);
     psFree(data->output);
     return;
@@ -22 +23 @@
     data->detections = NULL;
     data->zp = NAN;
+    data->exp_id = 0;
+    data->exp_name = NULL;
     data->output = NULL;