Changeset 25100

Timestamp:

Aug 17, 2009, 4:45:20 PM (17 years ago)

Author:

Paul Price

Message:

MOPS needs to know the direction of subtraction. Added a new field in the IPP-MOPS format: POSITIVE, a boolean which indicates whether the subtraction is positive or not.

Location:

trunk

Files:

• ippScripts/scripts/publish_file.pl (modified) (5 diffs)
• ppMops/src/ppMops.c (modified) (4 diffs)
• ppMops/src/ppMops.h (modified) (1 diff)

trunk/ippScripts/scripts/publish_file.pl

@@ -83 +83 @@
 my %exp_id;                     # Exposure identifiers
 my %exp_name;                   # Exposure names
+my %direction;                  # Direction of subtraction
 {
     my $command;                # Command to run
@@ -114 +115 @@
         if ($stage eq 'diff') {
             my $skycell_id = $comp->{skycell_id};
+
+            # Positive direction
             $files{"$skycell_id.pos"} = $ipprc->filename( "PPSUB.OUTPUT.SOURCES", $path_base );
-            $files{"$skycell_id.neg"} = $ipprc->filename( "PPSUB.INVERSE.SOURCES", $path_base ) if
-                defined $comp->{bothways} and $comp->{bothways};
             $zp{"$skycell_id.pos"} = $zp;
-            $zp{"$skycell_id.neg"} = $zp 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};
+            $direction{"$skycell_id.pos"} = 1;
+
+            # Negative direction
+            if (defined $comp->{bothways} and $comp->{bothways}) {
+                $files{"$skycell_id.neg"} = $ipprc->filename( "PPSUB.INVERSE.SOURCES", $path_base );
+                $zp{"$skycell_id.neg"} = $zp;
+                $exp_id{"$skycell_id.neg"} = $comp->{exp_id_2};
+                $direction{"$skycell_id.neg"} = 0;
+                $exp_name{"$skycell_id.neg"} = $comp->{exp_name_2};
+            }
+
         } elsif ($stage eq 'camera') {
             my $cam_id = $comp->{cam_id};
@@ -129 +138 @@
             $exp_id{$cam_id} = $comp->{exp_id};
             $exp_name{$cam_id} = $comp->{exp_name};
+            $direction{$cam_id} = 1;
         }
     }
@@ -145 +155 @@
     my $exp_id = $exp_id{$comp};
     my $exp_name = $exp_name{$comp};
+    my $direction = $direction{$comp};
     if ($product eq "IPP-MOPS") {
         my $outuri = "$outroot.$comp.fits";
@@ -150 +161 @@
             &my_die( "Unable to resolve output file $outuri", $pub_id, $PS_EXIT_SYS_ERROR);
 
-        my $command = "$ppMops $file $zp $exp_id $exp_name $out";
+        my $command = "$ppMops $file $zp $exp_id $exp_name $direction $out";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);

trunk/ppMops/src/ppMops.c

@@ -6 +6 @@
 int main(int argc, char *argv[])
 {
-    if (argc != 6) {
+    if (argc != 7) {
         fprintf(stderr, "Insufficient arguments.\n");
-        fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID EXP_NAME OUTPUT\n", argv[0]);
+        fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID EXP_NAME DIRECTION OUTPUT\n", argv[0]);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -17 +17 @@
     data->exp_id = atoll(argv[3]);
     data->exp_name = psStringCopy(argv[4]);
-    data->output = psStringCopy(argv[5]);
+    data->direction = atoi(argv[5]);
+    data->output = psStringCopy(argv[6]);
 
     if (!isfinite(data->zp)) {
@@ -128 +129 @@
                                         psMetadataLookupF32(NULL, header, "FWHM_MIN"));
 
-
         psMetadataAddStr(outHeader, PS_LIST_TAIL, "RA", 0, "Right ascension of boresight", ra);
         psMetadataAddStr(outHeader, PS_LIST_TAIL, "DEC", 0, "Declination of boresight", dec);
@@ -141 +141 @@
         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);
+        psMetadataAddBool(outHeader, PS_LIST_TAIL, "POSITIVE", 0, "Positive subtraction?", data->direction);
         psMetadataAddStr(outHeader, PS_LIST_TAIL, "OBSCODE", 0, "IAU Observatory code", OBSERVATORY_CODE);
         psMetadataAddF32(outHeader, PS_LIST_TAIL, "STARPSF", 0, "Stellar PSF (arcsec)", psf);
 
         // These are completely fake
-        psMetadataAddF32(outHeader, PS_LIST_TAIL, "LIMITMAG", 0, "Limiting magnitude (FAKE)", 25.0);
+        psMetadataAddF32(outHeader, PS_LIST_TAIL, "LIMITMAG", 0, "Limiting magnitude (FAKE)", 99.0);
         psMetadataAddF32(outHeader, PS_LIST_TAIL, "DE1", 0, "Detection efficiency (FAKE)", 0.0);
         psMetadataAddF32(outHeader, PS_LIST_TAIL, "DE2", 0, "Detection efficiency (FAKE)", 0.0);

trunk/ppMops/src/ppMops.h

@@ -18 +18 @@
     psS64 exp_id;                       // Exposure identifier
     psString exp_name;                  // Exposure name
+    bool direction;                     // Direction of subtraction, 1=positive, 0=negative
     psString output;                    // Output filename
 } ppMopsData;