Changeset 34566 for branches/eam_branches/ipp-20120905/ppTranslate/src/ppMopsArguments.c

Timestamp:

Oct 24, 2012, 3:52:04 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20120905/ppTranslate/src/ppMopsArguments.c (modified) (5 diffs)

branches/eam_branches/ipp-20120905/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;
@@ -67 +69 @@
     args->output = NULL;
     args->version = 1;
-
+    args->comment = NULL;
+    args->obsMode = NULL;
+    args->difftype = NULL;
+    args->sky = NAN;
+    args->shutoutc = NULL;
     return args;
 }
@@ -93 +99 @@
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-astrom_rms", 0, "Astrometric solution RMS", NAN);
     psMetadataAddU16(arguments, PS_LIST_TAIL, "-version", 0, "CMF file version", 0);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-comment", 0, "Exposure comment", "No comment provided");
+    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);
@@ -120 +131 @@
     args->rmsAstrom = psMetadataLookupF32(NULL, arguments, "-astrom_rms");
     args->version = psMetadataLookupU16(NULL, arguments, "-version");
+    args->comment = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-comment"));
+    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");