Changeset 34474 for trunk

Timestamp:

Sep 26, 2012, 12:11:16 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Added shutoutc and sky arguments

Location:

trunk/ppTranslate/src

Files:

• ppMops.h (modified) (1 diff)
• ppMopsArguments.c (modified) (5 diffs)
• ppMopsWrite.c (modified) (1 diff)

trunk/ppTranslate/src/ppMops.h

@@ -30 +30 @@
   psString comment;                   // Comment associated with the first argument of the diff
   psString obsMode;                   // Observation mode
-  psString difftype;                  // Either WW (Warp-Warp Diff) or WS (Warp-Stack Diff)
+  psString difftype;                  // WW (Warp-Warp Diff) or WS (Warp-Stack Diff) or SW (Stack-Warp Diff)
+  float sky;                          // Exposure avg sky background
+  psString shutoutc;                  // Camera exposure shutter open (UTC)
 } ppMopsArguments;
 

trunk/ppTranslate/src/ppMopsArguments.c

@@ -44 +44 @@
     psFree(args->input);
     psFree(args->exp_name);
-    psFree(args->output);
+    psFree(args->comment);
+    psFree(args->obsMode);
+    psFree(args->difftype);
+    psFree(args->shutoutc);
     return;
 }
@@ -52 +55 @@
     ppMopsArguments *args = psAlloc(sizeof(ppMopsArguments)); // Data to return
     psMemSetDeallocator(args, (psFreeFunc)mopsArgumentsFree);
-
     args->input = NULL;
     args->exp_name = NULL;
@@ -70 +72 @@
     args->obsMode = NULL;
     args->difftype = NULL;
+    args->sky = NAN;
+    args->shutoutc = NULL;
     return args;
 }
@@ -98 +102 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-obsmode", 0, "Observation mode", "No obsmode provided");
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-difftype", 0, "Either WW (Warp-Warp Diff) or WS (Warp-Stack Diff)", "No difftype provided");
+    psMetadataAddF32(arguments, PS_LIST_TAIL, "-sky", 0, "Exposure avg sky background", NAN);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-shutoutc", 0, "Camera exposure shutter open (UTC)", "No shutoutc provided");
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) {
         usage(argv[0], arguments);
@@ -128 +134 @@
     args->obsMode = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-obsmode"));
     args->difftype = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-difftype"));
+    args->sky = psMetadataLookupF32(NULL, arguments, "-sky");
+    args->shutoutc = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-shutoutc"));
 
     psTrace("ppMops.args", 1, "Done parsing command-line arguments\n");

trunk/ppTranslate/src/ppMopsWrite.c

@@ -88 +88 @@
   psMetadataAddStr(header, PS_LIST_TAIL, "OBS_MODE", 0, "Exposure observation mode", args->obsMode);
   psMetadataAddStr(header, PS_LIST_TAIL, "DIFFTYPE", 0, "WW: Warp-Warp diff / WS: Warp-Stack diff / SW: Stack-Warp diff", args->difftype);
+  psMetadataAddF32(header, PS_LIST_TAIL, "SKY", 0, "Exposure avg sky background", args->sky);
+  psMetadataAddStr(header, PS_LIST_TAIL, "SHUTOUTC", 0, "Camera exposure shutter open (UTC)", args->shutoutc);
 
   //field in header that tells about the CMF version