Index: /trunk/doc/ipptools/p4tool.txt
===================================================================
--- /trunk/doc/ipptools/p4tool.txt	(revision 11740)
+++ /trunk/doc/ipptools/p4tool.txt	(revision 11741)
@@ -11,8 +11,8 @@
 
 Calculate overlaps for each exposure:
-        phase4_overlap.pl --p4_id <str>
+        phase4_overlap.pl --p4_id <s32>
 {
         Get list of component imfiles for exposure:
-                p4tool -imfile -p4_id <str>
+                p4tool -imfile -p4_id <s32>
 
         (Calculates, in some as-yet unknown way the overlaps between imfiles
@@ -20,5 +20,5 @@
 
         Set the relationship between imfiles and skycells:
-                p4tool -overlap -p4_id <str> -info FILE
+                p4tool -overlap -p4_id <s32> -info FILE
         where FILE contains:
                 imfile.0        STR     skycell.123 skycell.456
@@ -35,8 +35,8 @@
 
 Do the warp for each skycell:
-        phase4_warp.pl --p4_id <str> --skycell <str>
+        phase4_warp.pl --p4_id <s32> --skycell <str>
 {
         Get list of imfiles for skycell:
-                p4tool -imfile -p4_id <str> -skycell <str>
+                p4tool -imfile -p4_id <s32> -skycell <str>
 
         Do the warping:
@@ -44,5 +44,5 @@
 
         Register the skycell as done warping:
-                p4tool -warped -p4_id <str> -skycell <str> -uri <str>
+                p4tool -warped -p4_id <s32> -skycell <str> -uri <str>
 }
 
@@ -55,5 +55,5 @@
 Register an exposure for subtraction processing.  We need to specify which warp
 is the input and which is the template.
-	p5tool -definerun -skycell <str> -input_p4_id <str> -template_p4_id <str>
+	p5tool -definerun -skycell <str> -input_p4_id <s32> -template_p4_id <s32>
 
 Give me all skycells that need to be subtracted:
@@ -61,5 +61,5 @@
 
 Do the subtraction for each skycell:
-        phase5_subtract.pl --p5_id <str> --in_uri <str> --template_uri <str>
+        phase5_subtract.pl --p5_id <s32> --in_uri <str> --template_uri <str>
 {
         Do the subtraction:
@@ -67,5 +67,5 @@
 
         Register the subtraction as done:
-                p5tool -done -p5_id <str> -uri <str>
+                p5tool -done -p5_id <s32> -uri <str>
 }
 
@@ -94,10 +94,10 @@
 
 Do magic for each skycell:
-        magic_skycell.pl --magic_id <str> --skycell <str> --uri <str>
+        magic_skycell.pl --magic_id <s32> --skycell <str> --uri <str>
 {
         Do streak finding on skycell
 
         Register sky cell as done:
-                magictool -doneskycell -magic_id <str> -skycell <str> -uri <str>
+                magictool -doneskycell -magic_id <s32> -skycell <str> -uri <str>
 }
 
@@ -106,13 +106,13 @@
 
 Do magic for each imfile:
-        magic_imfile.pl --magic_id <str> --class_id <str>
+        magic_imfile.pl --magic_id <s32> --class_id <str>
 {
         Get list of all magic1 output relevant to this imfile
-                magictool -skycell -magic_id <str> -class_id <str>
+                magictool -skycell -magic_id <s32> -class_id <str>
 
         Do streak finding for imfile
 
         Register imfile as done:
-                magictool -doneimfile -magic_id <str> -class_id <str> -uri <str>
+                magictool -doneimfile -magic_id <s32> -class_id <str> -uri <str>
 }
 
@@ -125,20 +125,21 @@
 
 Do magic for each exposure:
-        magic_exp.pl --magic_id <str>
+        magic_exp.pl --magic_id <s32>
 {
         Get list of all magic2 output relevant to this exposure
-                magictool -imfile -magic_id <str>
+                magictool -imfile -magic_id <s32>
 
         Do streak finding on exposure
 
         Register exposure as done:
-                magictool -doneexp -magic_id <str> -uri <str>
-}
-
-
-[Need to generate masks, but we need to decide at what level: imfile, or
-skycell?  If imfile, we need to do the warp over again.  If skycell, we
-can never give out the flattened CCD images unless they've been warped. 
-How about doing both --- it's not too hard.]
+                magictool -doneexp -magic_id <s32> -uri <str>
+}
+
+
+[Need to generate masks, but we need to decide at what level: imfile,
+or skycell?  If imfile, we need to do the warp over again.  If
+skycell, we can never give out the flattened CCD images unless they've
+been warped.  Let's do both --- it's not too expensive, and means we
+can release both without further work.]
 
 
@@ -147,10 +148,10 @@
 
 Generate mask for each imfile:
-	magic_mask_imfile.pl --magic_id <str> --class_id <str> --uri <str>
+	magic_mask_imfile.pl --magic_id <s32> --class_id <str> --uri <str>
 {
 	Make mask
 
 	Register mask:
-		magictool -donemaskimfile -magic_id <str> -class_id <str> -uri <str>
+		magictool -donemaskimfile -magic_id <s32> -class_id <str> -uri <str>
 }
 
@@ -159,10 +160,10 @@
 
 Generate mask for each skycell:
-	magic_mask_skycell.pl --magic_id <str> --skycell <str> --uri <str>
+	magic_mask_skycell.pl --magic_id <s32> --skycell <str> --uri <str>
 {
 	Make mask
 
 	Register mask:
-		magictool -donemaskskycell -magic_id <str> -skycell <str> -uri <str>
+		magictool -donemaskskycell -magic_id <s32> -skycell <str> -uri <str>
 }
 
@@ -182,5 +183,5 @@
 
 Register skycells for combination processing:
-	p6tool -definerun -skycell <stR> -p4_id <str> -p4_id <str> -p4_id <str>
+	p6tool -definerun -skycell <stR> -p4_id <s32> -p4_id <s32> -p4_id <s32>
 
 Give me all pending operations
@@ -188,8 +189,8 @@
 
 Run phase 6:
-	phase6.pl -p6_id <str>
+	phase6.pl -p6_id <s32>
 {
 	Give me the list of all inputs for this run:
-		p6tool -inputs -p6_id <str>
+		p6tool -inputs -p6_id <s32>
 
 	Combine:
@@ -197,5 +198,5 @@
 
 	Register the completion:
-		p6tool -done -p6_id <str> -uri <str>
+		p6tool -done -p6_id <s32> -uri <str>
 }