Changeset 9274

Timestamp:

Oct 4, 2006, 4:20:14 PM (20 years ago)

Author:

jhoblitt

Message:

rename -addprocessedimfile -> -addprocessedexp & update args

Location:

trunk/ippTools/src

Files:

• camtool.c (modified) (3 diffs)
• camtool.h (modified) (1 diff)
• camtoolConfig.c (modified) (2 diffs)

trunk/ippTools/src/camtool.c

@@ -10 +10 @@
 static bool pendingexpMode(pxConfig *config);
 static bool pendingimfileMode(pxConfig *config);
-static bool addprocessedimfileMode(pxConfig *config);
+static bool addprocessedexpMode(pxConfig *config);
 
 # define MODECASE(caseName, func) \
@@ -26 +26 @@
 
     switch (config->mode) {
-        MODECASE(P3TOOL_MODE_PENDINGEXP,      pendingexpMode);
-        MODECASE(P3TOOL_MODE_PENDINGIMFILE,   pendingimfileMode);
-        MODECASE(P3TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileMode);
+        MODECASE(P3TOOL_MODE_PENDINGEXP,        pendingexpMode);
+        MODECASE(P3TOOL_MODE_PENDINGIMFILE,     pendingimfileMode);
+        MODECASE(P3TOOL_MODE_ADDPROCESSEDEXP,   addprocessedexpMode);
         default:
             psAbort(argv[0], "invalid option (this should not happen)");
@@ -159 +159 @@
 }
 
-static bool addprocessedimfileMode(pxConfig *config)
+static bool addprocessedexpMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);

trunk/ippTools/src/camtool.h

@@ -8 +8 @@
     P3TOOL_MODE_PENDINGEXP,
     P3TOOL_MODE_PENDINGIMFILE,
-    P3TOOL_MODE_ADDPROCESSEDIMFILE,
+    P3TOOL_MODE_ADDPROCESSEDEXP,
 } p3toolMode;
 

trunk/ippTools/src/camtoolConfig.c

@@ -25 +25 @@
     psMetadata *pendingexpArgs = psMetadataAlloc();
     psMetadataAddStr(pendingexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
-        "search by exposure ID", NULL);
+            "search by exposure ID", NULL);
     psMetadataAddS32(pendingexpArgs, PS_LIST_TAIL, "-p2_version", 0,
-        "search for exposures with this p2 version", -1);
+            "search for exposures with this p2 version", -1);
     psMetadataAddS32(pendingexpArgs, PS_LIST_TAIL, "-p3_version", 0,
-        "search for exposures with this p3 version", -1);
+            "search for exposures with this p3 version", -1);
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple", 0,
-        "use the simple output format", false);
+            "use the simple output format", false);
     
     // -pendingimfile
     psMetadata *pendingimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag",  0,
-        "search by exposure ID", NULL);
-    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class",  0,
-        "search by class", NULL);
-    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id",  0,
-        "search by class ID", NULL);
-    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple",  0,
-        "use the simple output format", false);
+    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
+            "search by exposure ID", NULL);
+    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class", 0,
+            "search by class", NULL);
+    psMetadataAddStr(pendingimfileArgs, PS_LIST_TAIL, "-class_id", 0,
+            "search by class ID", NULL);
+    psMetadataAddBool(pendingimfileArgs, PS_LIST_TAIL, "-simple", 0,
+            "use the simple output format", false);
 
 
-    // -addprocessedimfile
-    psMetadata *addprocessedimfileArgs = psMetadataAlloc();
+    // -addprocessedexp
+    psMetadata *addprocessedexpArgs = psMetadataAlloc();
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
+            "define exp ID (required)", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-class_id", 0,
+            "define class ID (required)", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-uri", 0,
+            "define URI (required)", NULL);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg", 0,
+            "define exposue background (required)", NAN);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev", 0,
+            "define exposue background stdev (required)", NAN);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0,
+            "define exposue background mean stdev (required)", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_ra", 0,
+            "define exposure E ra (required)", NAN);
+    psMetadataAddF32(addprocessedexpArgs, PS_LIST_TAIL, "-sigma_dec", 0,
+            "define exposure E dec (required)", NAN);
+    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-nastro", 0,
+            "define number of objects (required)", -1);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b1_uri", 0,
+            "define banana 1", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b2_uri", 0,
+            "define banana 2", NULL);
+
 
 #define PXTOOL_MODE(option, modeval, argset) \
@@ -70 +93 @@
     PXTOOL_MODE("-pendingexp",   P3TOOL_MODE_PENDINGEXP,  pendingexpArgs);
     PXTOOL_MODE("-pendingimfile",P3TOOL_MODE_PENDINGIMFILE,pendingimfileArgs);
-    PXTOOL_MODE("-addprocessedimfile", P3TOOL_MODE_ADDPROCESSEDIMFILE, addprocessedimfileArgs);
+    PXTOOL_MODE("-addprocessedexp", P3TOOL_MODE_ADDPROCESSEDEXP, addprocessedexpArgs);
 
     bool argErr = false;