Changeset 25158 for branches/czw_branch/cleanup/ppMops

Timestamp:

Aug 20, 2009, 12:42:13 PM (17 years ago)

Author:

watersc1

Message:

More merging

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• ppMops/src/ppMops.c (modified) (4 diffs)
• ppMops/src/ppMops.h (modified) (1 diff)
• ppMops/src/ppMopsData.c (modified) (2 diffs)

branches/czw_branch/cleanup/ppMops/src/ppMops.c

@@ -6 +6 @@
 int main(int argc, char *argv[])
 {
-    if (argc != 7) {
+    if (argc != 6) {
         fprintf(stderr, "Insufficient arguments.\n");
-        fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID EXP_NAME DIRECTION OUTPUT\n", argv[0]);
+        fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID EXP_NAME OUTPUT\n", argv[0]);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -17 +17 @@
     data->exp_id = atoll(argv[3]);
     data->exp_name = psStringCopy(argv[4]);
-    data->direction = atoi(argv[5]);
-    data->output = psStringCopy(argv[6]);
+    data->output = psStringCopy(argv[5]);
 
     if (!isfinite(data->zp)) {
@@ -129 +128 @@
                                         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)", 99.0);
+        psMetadataAddF32(outHeader, PS_LIST_TAIL, "LIMITMAG", 0, "Limiting magnitude (FAKE)", 25.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);

branches/czw_branch/cleanup/ppMops/src/ppMops.h

@@ -16 +16 @@
     psString detections;                // Detections filename
     float zp;                           // Magnitude zero point
-    bool direction;                     // Direction of subtraction, 1=positive, 0=negative
+    psS64 exp_id;                       // Exposure identifier
+    psString exp_name;                  // Exposure name
     psString output;                    // Output filename
 } ppMopsData;

branches/czw_branch/cleanup/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;