Changeset 25154

Timestamp:

Aug 20, 2009, 11:52:04 AM (17 years ago)

Author:

watersc1

Message:

 

Location:

branches/czw_branch/cleanup/ppMops

Files:

• ICDlite.txt (copied) (copied from trunk/ppMops/ICDlite.txt )
• src/ppMops.c (modified) (4 diffs)
• src/ppMops.h (modified) (1 diff)

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

@@ -6 +6 @@
 int main(int argc, char *argv[])
 {
-    if (argc != 4) {
+    if (argc != 7) {
         fprintf(stderr, "Insufficient arguments.\n");
-        fprintf(stderr, "Usage: %s DETECTIONS ZP OUTPUT\n", argv[0]);
+        fprintf(stderr, "Usage: %s DETECTIONS ZP EXP_ID EXP_NAME DIRECTION OUTPUT\n", argv[0]);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -15 +15 @@
     data->detections = psStringCopy(argv[1]);
     data->zp = atof(argv[2]);
-    data->output = psStringCopy(argv[3]);
+    data->exp_id = atoll(argv[3]);
+    data->exp_name = psStringCopy(argv[4]);
+    data->direction = atoi(argv[5]);
+    data->output = psStringCopy(argv[6]);
 
     if (!isfinite(data->zp)) {
@@ -120 +123 @@
         double alt = psMetadataLookupF64(NULL, header, "FPA.ALT");
         double az = psMetadataLookupF64(NULL, header, "FPA.AZ");
-        int imageid = psMetadataLookupS32(NULL, header, "IMAGEID");
+        psS64 imageid = psMetadataLookupS64(NULL, header, "IMAGEID");
         double mjd = psMetadataLookupF64(NULL, header, "MJD-OBS") + exptime / 2.0 / 3600 / 24;
 
         float psf = plateScale * 0.5 * (psMetadataLookupF32(NULL, header, "FWHM_MAJ") +
                                         psMetadataLookupF32(NULL, header, "FWHM_MIN"));
-
-        // XXX This is wrong
-        int fpaid = psMetadataLookupS32(NULL, header, "IMAGEID");
-
 
         psMetadataAddStr(outHeader, PS_LIST_TAIL, "RA", 0, "Right ascension of boresight", ra);
@@ -139 +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", fpaid);
+        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);
+        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);

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
     psString output;                    // Output filename
 } ppMopsData;