Changeset 12834 for trunk/ppSim/src/ppSimArguments.c

Timestamp:

Apr 16, 2007, 10:13:57 AM (19 years ago)

Author:

Paul Price

Message:

Working, at least for bias images.

Location:

trunk/ppSim

Files:

• . (modified) (1 prop)
• src/ppSimArguments.c (modified) (5 diffs)

trunk/ppSim

@@ -13 +13 @@
 Makefile.in
 missing
+test

@@ -13 +13 @@
 Makefile.in
 missing
+test

trunk/ppSim/src/ppSimArguments.c

@@ -55 +55 @@
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-format", 0, "Camera format name", NULL);
     psMetadataAddStr(arguments, PS_LIST_TAIL, "-type", 0, "Exposure type (BIAS|DARK|FLAT|OBJECT)", NULL);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-filter", 0, "Filter name", NULL);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-exptime", 0, "Exposure time (s)", NAN);
     psMetadataAddF32(arguments, PS_LIST_TAIL, "-biaslevel", 0, "Bias level (e)", NAN);
@@ -69 +70 @@
     }
 
-    if (*config->argc == 1 || !psArgumentParse(arguments, config->argc, config->argv)) {
+    if (*config->argc == 1 || !psArgumentParse(arguments, config->argc, config->argv) || *config->argc != 2) {
         usage(arguments, config);
     }
@@ -98 +99 @@
         usage(arguments, config);
     }
-    psMetadataAdd(config->arguments, PS_LIST_TAIL, "TYPE", 0, "Exposure type", type);
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "TYPE", 0, "Exposure type", type);
+
+    const char *filter = psMetadataLookupStr(NULL, arguments, "-filter"); // Filter name
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "FILTER", 0, "Filter name", filter);
 
     float expTime;
@@ -110 +114 @@
         }
     }
-    psMetadataAdd(config->arguments, PS_LIST_TAIL, "EXPTIME", 0, "Exposure time (s)", expTime);
+    psMetadataAddF32(config->arguments, PS_LIST_TAIL, "EXPTIME", 0, "Exposure time (s)", expTime);
 
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSIM_RECIPE); // Recipe for ppSim
@@ -128 +132 @@
     valueArgRecipe(config, arguments, "-skyrate",     recipe, "SKY.RATE",     config->arguments);
 
+    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Name of the output image",
+                     config->argv[1]);
+
     psFree(arguments);
 }

@@ -13 +13 @@
 Makefile.in
 missing
+test