Changeset 25074 for trunk/ppMops/src

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/ppMops/src

Files:

• ppMops.c (modified) (3 diffs)
• ppMops.h (modified) (1 diff)
• ppMopsData.c (modified) (2 diffs)

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;