Index: trunk/ippTools/src/warptoolConfig.c
===================================================================
--- trunk/ippTools/src/warptoolConfig.c	(revision 11702)
+++ trunk/ippTools/src/warptoolConfig.c	(revision 11723)
@@ -48,24 +48,8 @@
     // -definerun
     psMetadata *definerunArgs = psMetadataAlloc();
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-survey_mode", 0,
-            "define the type of suvery (required)", NULL);
+    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0,
+            "define mode (required)", NULL);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
             "define workdir (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-filter",  0,
-            "define filter (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id",  0,
-            "define skycell ID (required)", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id",  0,
-            "define tessellation ID (required)", NULL);
-    psMetadataAddF64(definerunArgs, PS_LIST_TAIL, "-ra",  0,
-            "define RA", NAN);
-    psMetadataAddF64(definerunArgs, PS_LIST_TAIL, "-decl",  0,
-            "define DEC", NAN);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-input_ss",  0,
-            "define input static sky ", NULL);
-    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-output_ss",  0,
-            "define output static sky ", NULL);
-    psMetadataAddF64(definerunArgs, PS_LIST_TAIL, "-imfiles",  0,
-            "define number of imfiles in the sky cell", 0);
     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
             "time detrend run was registered", now);
@@ -73,44 +57,54 @@
             "use the simple output format", false);
 
-    // -addinputimfile
-    psMetadata *addinputimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addinputimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
-    psMetadataAddStr(addinputimfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(addinputimfileArgs, PS_LIST_TAIL, "-p3_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
-    psMetadataAddStr(addinputimfileArgs, PS_LIST_TAIL, "-class_id", 0,
-            "define class ID (required)", 0);
+    // -addinputexp
+    psMetadata *addinputexpArgs = psMetadataAlloc();
+    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-p4_id", 0,
+            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addinputexpArgs, PS_LIST_TAIL, "-exp_tag", 0,
+            "define exposure tag (required)", NULL);
+    psMetadataAddS32(addinputexpArgs, PS_LIST_TAIL, "-p3_version", 0,
+            "define phase 3 version of exposure tag (required)", 0);
+    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced",  0,
+            "has this exposure been magiced", false);
    
-    // -towarpedimfile
-    psMetadata *towarpedimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(towarpedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
-    psMetadataAddBool(towarpedimfileArgs, PS_LIST_TAIL, "-simple",  0,
-            "use the simple output format", false);
- 
-    // -addwarpedimfile
-    psMetadata *addwarpedimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "define p4 ID (required)", NULL);
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
-            "define exposure tag (required)", NULL);
-    psMetadataAddS32(addwarpedimfileArgs, PS_LIST_TAIL, "-p3_version", 0,
-            "define phase 3 version of exposure tag (required)", 0);
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-class_id", 0,
-            "define class ID (required)", 0);
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-uri", 0,
+    // -toscfile
+    psMetadata *toscfileArgs = psMetadataAlloc();
+    psMetadataAddStr(toscfileArgs, PS_LIST_TAIL, "-p4_id", 0,
+            "search by p4 ID", NULL);
+    psMetadataAddBool(toscfileArgs, PS_LIST_TAIL, "-simple",  0,
+            "use the simple output format", false);
+ 
+    // -addscfile
+    psMetadata *addscfileArgs = psMetadataAlloc();
+    psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-p4_id", 0,
+            "define p4 ID (required)", NULL);
+    psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-skycell_id",  0,
+            "define skycell ID (required)", NULL);
+    psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-tess_id",  0,
+            "define tessellation ID (required)", NULL);
+    psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
+            "define exposure tag (required)", NULL);
+    psMetadataAddS32(addscfileArgs, PS_LIST_TAIL, "-p3_version", 0,
+            "define phase 3 version of exposure tag (required)", 0);
+    psMetadataAddStr(addscfileArgs, PS_LIST_TAIL, "-uri", 0,
             "define URI of file (required)", 0);
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-b1_uri",  0,
-            "define banana 1", NULL);
-    psMetadataAddStr(addwarpedimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
-            "define banana 2", NULL);
- 
-    // -warpedimfile
-    psMetadata *warpedimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(warpedimfileArgs, PS_LIST_TAIL, "-p4_id", 0,
-            "search by p4 ID", NULL);
-    psMetadataAddBool(warpedimfileArgs, PS_LIST_TAIL, "-simple",  0,
+    psMetadataAddF64(addscfileArgs, PS_LIST_TAIL, "-bg",  0,
+            "define exposue background", NAN);
+    psMetadataAddF64(addscfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,            "define exposue background mean stdev", NAN);
+
+ 
+    // -scfile
+    psMetadata *scfileArgs = psMetadataAlloc();
+    psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-p4_id", 0,
+            "search by p4 ID", NULL);
+    psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-skycell_id",  0,
+            "define skycell ID (required)", NULL);
+    psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-tess_id",  0,
+            "define tessellation ID (required)", NULL);
+    psMetadataAddStr(scfileArgs, PS_LIST_TAIL, "-exp_tag", 0,
+            "define exposure tag (required)", NULL);
+    psMetadataAddS32(scfileArgs, PS_LIST_TAIL, "-p3_version", 0,
+            "define phase 3 version of exposure tag (required)", 0);
+    psMetadataAddBool(scfileArgs, PS_LIST_TAIL, "-simple",  0,
             "use the simple output format", false);
 
@@ -199,9 +193,9 @@
     psMetadata *argSets = psMetadataAlloc();
     // find which mode we're running under
-    PXTOOL_MODE("-definerun",       P4TOOL_MODE_DEFINERUN,   definerunArgs);
-    PXTOOL_MODE("-addinputimfile",  P4TOOL_MODE_ADDINPUTIMFILE, addinputimfileArgs);
-    PXTOOL_MODE("-towarpedimfile",  P4TOOL_MODE_TOWARPEDIMFILE, towarpedimfileArgs);
-    PXTOOL_MODE("-addwarpedimfile", P4TOOL_MODE_ADDWARPEDIMFILE, addwarpedimfileArgs);
-    PXTOOL_MODE("-warpedimfile",    P4TOOL_MODE_WARPEDIMFILE,   warpedimfileArgs);
+    PXTOOL_MODE("-definerun",       P4TOOL_MODE_DEFINERUN,      definerunArgs);
+    PXTOOL_MODE("-addinputexp",     P4TOOL_MODE_ADDINPUTEXP,    addinputexpArgs);
+    PXTOOL_MODE("-toscfile",        P4TOOL_MODE_TOSCFILE,       toscfileArgs);
+    PXTOOL_MODE("-addscfile",       P4TOOL_MODE_ADDSCFILE,      addscfileArgs);
+    PXTOOL_MODE("-scfile",          P4TOOL_MODE_SCFILE,         scfileArgs);
     PXTOOL_MODE("-tostackedimfile", P4TOOL_MODE_TOSTACKEDIMFILE, tostackedimfileArgs);
     PXTOOL_MODE("-addstackedimfile", P4TOOL_MODE_ADDSTACKEDIMFILE, addstackedimfileArgs);