--- ray/src/util/fieldcomb.csh	2005/09/02 04:15:42	2.1
+++ ray/src/util/fieldcomb.csh	2005/09/06 15:34:46	2.6
@@ -1,4 +1,5 @@
 #!/bin/csh -f
+# RCSid $Id: fieldcomb.csh,v 2.6 2005/09/06 15:34:46 greg Exp $
 #
 # Combine alternate lines in full frames for field rendering
 #
@@ -7,19 +8,40 @@
 # If an odd number of frames is provided, the spare frame at the
 # end is linked to $spare_name for the next run
 #
-# Written by Greg Ward for Iebele Atelier in August 2005
+# Written by Greg Ward for Iebele Abel in August 2005
 #
 set spare_name=spare_fieldcomb_frame.pic
-if ($#argv > 1) then
-	if ("$argv[1]" == "-r") then
+set odd_first=0
+while ($#argv > 1)
+	switch ($argv[1])
+	case -r*:
 		set remove_orig
+		breaksw
+	case -o*:
+		set odd_first=1
+		breaksw
+	case -e*:
+		set odd_first=0
+		breaksw
+	case -f*:
 		shift argv
-	endif
-endif
+		set outfile="$argv[1]"
+		breaksw
+	default:
+		if ("$argv[1]" !~ -*) break
+		echo "Unknown option: $argv[1]"
+		exit 1
+	endsw
+	shift argv
+end
 if ($#argv < 2) then
-	echo "Usage: $0 [-r] field1.pic field2.pic .."
+	echo "Usage: $0 [-e|-o][-r] [-f combined.pic] field1.pic field2.pic .."
 	exit 1
 endif
+if ($?outfile && $#argv > 2) then
+	echo "Cannot use -f option with more than two input files"
+	exit 1
+endif
 set f1=$argv[1]:q
 set ext=$f1:e
 set basenm="`echo $f1:q | sed 's/[0-9]*\.'$ext'//'`"
@@ -33,10 +55,24 @@ endif
 set curfi=1
 while ($curfi < $#fields)
 	@ nextfi = $curfi + 1
-	pcomb -e 'ro=ri(fld);go=gi(fld);bo=bi(fld)' \
-		-e 'odd=.5*y-floor(.5*y)-.25' -e 'fld=if(odd,1,2)' \
+	if ($curfr < 10) then
+		set fid=000$curfr
+	else if ($curfr < 100) then
+		set fid=00$curfr
+	else if ($curfr < 1000) then
+		set fid=0$curfr
+	else
+		set fid=$curfr
+	endif
+       	set outf="${basenm}C$fid.$ext"
+	if ($?outfile) then
+		set outf=$outfile:q
+	endif
+	pcomb -e 'ro=ri(fld); go=gi(fld); bo=bi(fld)' \
+		-e 'yd=yres-1-y; odd=.5*yd-floor(.5*yd)-.25' \
+		-e "fld=if(odd,2-$odd_first,1+$odd_first)" \
 		$fields[$curfi]:q $fields[$nextfi]:q \
-		> "${basenm}C$curfr.$ext"
+		> $outf:q
 	if ($?remove_orig) rm $fields[$curfi]:q $fields[$nextfi]:q
 	@ curfr++
 	@ curfi = $nextfi + 1