Changeset 24242 for trunk/ppMops/src

Timestamp:

May 26, 2009, 1:27:21 PM (17 years ago)

Author:

Paul Price

Message:

Adding version information.

Location:

trunk/ppMops

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/ppMops.c (modified) (7 diffs)
• src/ppMops.h (modified) (1 diff)
• src/ppMopsData.c (modified) (2 diffs)
• src/ppMopsVersion.c (added)
• src/ppMopsVersionDefinitions.h.in (modified) (1 diff)

trunk/ppMops/src/ppMops.c

@@ -1 +1 @@
 #include <stdio.h>
 #include <pslib.h>
+
+#include "ppMops.h"
 
 int main(int argc, char *argv[])
@@ -6 +8 @@
     if (argc != 4) {
         fprintf(stderr, "Insufficient arguments.\n");
-        fprintf(stderr, "Usage: %s DETECTIONS ASTROMETRY OUTPUT\n", argv[0]);
+        fprintf(stderr, "Usage: %s DETECTIONS ZP OUTPUT\n", argv[0]);
         exit(PS_EXIT_CONFIG_ERROR);
     }
@@ -21 +23 @@
         header = psFitsReadHeader(NULL, fits);
         if (!header) {
-            psErrorStackPrint("Unable to read header");
+            psErrorStackPrint(stderr, "Unable to read header");
             psFitsClose(fits);
             psFree(data);
@@ -27 +29 @@
         }
         if (!psFitsMoveExtName(fits, IN_EXTNAME)) {
-            psErrorStackPrint("Unable to move to extension %s", IN_EXTNAME);
+            psErrorStackPrint(stderr, "Unable to move to extension %s", IN_EXTNAME);
             psFitsClose(fits);
             psFree(header);
@@ -36 +38 @@
         psFitsClose(fits);
         if (!detections) {
-            psErrorStackPrint("Unable to read detections");
+            psErrorStackPrint(stderr, "Unable to read detections");
             psFree(data);
             psFree(header);
@@ -89 +91 @@
     // Translate the header
     psMetadata *outHeader = psMetadataAlloc(); // Output header
+    ppMopsVersionHeader(outHeader);
     {
         double ra = psMetadataLookupF64(NULL, header, "FPA.RA");
@@ -116 +119 @@
         psMetadataAddF64(outHeader, PS_LIST_TAIL, "FPA_ID", 0, "Exposure identifier", fpaid);
         psMetadataAddS32(outHeader, PS_LIST_TAIL, "OBSCODE", 0, "IAU Observatory code", OBSERVATORY_CODE);
-        psMetadataAddF32(outHeader, PS_LIST_TAIL, "LIMITMAG", 0, "Limiting magnitude", LIMITING_MAG);
         psMetadataAddF32(outHeader, PS_LIST_TAIL, "STARPSF", 0, "Stellar PSF (arcsec)", psf);
 
         // These are completely fake
+        psMetadataAddF32(outHeader, PS_LIST_TAIL, "LIMITMAG", 0, "Limiting magnitude", 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);

trunk/ppMops/src/ppMops.h

@@ -19 +19 @@
 
 
+
+/// Return version
+psString ppMopsVersion(void);
+
+/// Return source
+psString ppMopsSource(void);
+
+/// Return detailed version information
+psString ppMopsVersionLong(void);
+
+/// Put version into header
+bool ppMopsVersionHeader(psMetadata *header);
+
+/// Print version information
+void ppMopsVersionPrint(void);
+
+#endif

trunk/ppMops/src/ppMopsData.c

@@ -11 +11 @@
 {
     psFree(data->detections);
-    psFree(data->astrometry);
     psFree(data->output);
     return;
@@ -22 +21 @@
 
     data->detections = NULL;
-    data->astrometry = NULL;
+    data->zp = NAN;
     data->output = NULL;
 

trunk/ppMops/src/ppMopsVersionDefinitions.h.in

@@ -1 @@
-#ifndef PPSUB_VERSION_DEFINITIONS_H
-#define PPSUB_VERSION_DEFINITIONS_H
+#ifndef PPMOPS_VERSION_DEFINITIONS_H
+#define PPMOPS_VERSION_DEFINITIONS_H
 
-#define PPSUB_VERSION @PPSUB_VERSION@ // SVN version
-#define PPSUB_BRANCH  @PPSUB_BRANCH@  // SVN branch
-#define PPSUB_SOURCE  @PPSUB_SOURCE@  // SVN source
+#define PPMOPS_VERSION @PPMOPS_VERSION@ // SVN version
+#define PPMOPS_BRANCH  @PPMOPS_BRANCH@  // SVN branch
+#define PPMOPS_SOURCE  @PPMOPS_SOURCE@  // SVN source
 
 #endif