Index: trunk/pstamp/test/pstamp_req_create
===================================================================
--- trunk/pstamp/test/pstamp_req_create	(revision 27203)
+++ 	(revision )
@@ -1,274 +1,0 @@
-#!/usr/bin/env perl
-
-print STDERR "This script is obsolete. See ../scripts/pstamp_request_file\n";
-exit 1;
-
-# create a Postage Stamp Request file from a textual description
-
-use warnings;
-use strict;
-
-use Astro::FITS::CFITSIO qw( :constants );
-Astro::FITS::CFITSIO::PerlyUnpacking(1);
-
-use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
-use Pod::Usage qw( pod2usage );
-
-use constant EXTNAME => 'PS1_PS_REQUEST'; # Extension name for output table
-
-my ( $input,			# Name of input text file
-     $output,			# Name of output table
-     $req_name, 
-     );
-
-GetOptions(
-	   'input|i=s'    => \$input,
-	   'output|o=s'   => \$output,
-	   'req_name|q=s'  => \$req_name,
-) or pod2usage( 2 );
-
-pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --input --output | --req_name",
-           -exitval => 3) unless defined $input and (defined $output or defined $req_name);
-
-# The header kewords
-my $header = [
-        { name =>  'REQ_NAME', 
-                    writetype => TSTRING, 
-                    comment => 'Postage Stamp request name',
-                    value => undef
-        },
-        { name =>  'EXTVER', 
-                    writetype => TSTRING, 
-                    comment => 'Extension version',
-                    value => undef
-        },
-];
-
-# Specification of columns to write
-my $columns = [ 
-        { name => 'ROWNUM',     type => 'J',   writetype => TULONG }, 
-        { name => 'PROJECT',    type => '16A', writetype => TSTRING },
-        { name => 'JOB_TYPE',   type => '16A', writetype => TSTRING },
-
-        { name => 'OPTION_MASK',type => 'J',   writetype => TULONG },
-
-        # image selection parameters
-        { name => 'REQ_TYPE',   type => '16A', writetype => TSTRING },
-        { name => 'IMG_TYPE',   type => '16A', writetype => TSTRING },
-        { name => 'ID',         type => '16A', writetype => TSTRING },           
-        { name => 'TESS_ID',    type => '64A', writetype => TSTRING },
-        { name => 'COMPONENT',  type => '64A', writetype => TSTRING },
-
-
-        # 2 bits in COORD_MASK indicate what units of roi coords are
-        { name => 'COORD_MASK', type => 'J',  writetype => TULONG },
-
-        { name => 'CENTER_X',   type => 'D',  writetype => TDOUBLE },
-        { name => 'CENTER_Y',   type => 'D',  writetype => TDOUBLE },
-        { name => 'WIDTH',      type => 'D',  writetype => TDOUBLE },
-        { name => 'HEIGHT',     type => 'D',  writetype => TDOUBLE },
-
-        { name => 'REQFILT',    type => '16A', writetype => TSTRING },
-        { name => 'MJD_MIN',   type => 'D',   writetype => TDOUBLE },
-        { name => 'MJD_MAX',   type => 'D',   writetype => TDOUBLE },
-];
-
-my $in;
-if ($input eq '-') {
-    $in = \*STDIN;
-} else {
-    open $in, "<$input" or die "cannot open $input for reading";
-}
-
-my @colData;
-foreach (@$columns) {
-    push @colData, [];
-}
-
-
-my $numRows = read_data_for_table($in,'\s+', \@colData, $header); 
-if (!$numRows) {
-    print STDERR "no data in $input\n";
-    exit 1;
-}
-
-# overwrite the REQ_NAME value from the input file with the command
-# line argument
-
-if ($req_name) {
-    $header->[0]->{value} = $req_name;
-} else {
-    $req_name = $header->[0]->{value};
-}
-
-die "no request name defined" unless defined $req_name;
-
-$output = $req_name . ".fits" if !$output;
-
-my $status = make_fits_table($output, EXTNAME, $numRows, \@colData, $columns, $header);
-
-exit $status;
-
-# XXXXX: This should be in a module
-# two utility functions that may be used to create a FITS binary
-# table from hashes describing the header keywords and columns
-
-# read_table_description reads the data for a table from a simple text file
-# make_fits_table writes out the table to a named file
-
-
-# A function to build a fits binary table from supplied data 
-# 
-sub make_fits_table {
-        my $output = shift;     # name of output file
-        my $extname = shift;    # extension name
-        my $numRows = shift;    # number of rows in the table
-        my $colData = shift;    # ref to array of arrays containing the data for each column
-        my $columns = shift;    # ref to array of column descriptions (each a hash)
-                                # with keys: name, type, and writetype
-        my $header = shift;     # ref to array of header keyword descriptions - each a hash
-                                # with keys: name, name, writetype, comment, and value
-        my $status = 0;
-
-        die "incorrect arguments" if !defined($columns);
-        # note $header can be nil
-
-        # build arrays for cfitsio
-        my @colNames;			# Names of columns
-        my @colTypes;			# Types of columns
-        my @colWriteType;               # type to use to write
-
-        foreach my $colSpec ( @$columns) {
-            push @colNames, $colSpec->{name};
-            push @colTypes, $colSpec->{type};
-            push @colWriteType, $colSpec->{writetype};
-        }
-
-        if (-e $output) {
-            unlink "$output" or die "failed to remove existing $output";
-        }
-
-        my $outFits = Astro::FITS::CFITSIO::create_file( $output, $status ); # Output file handle
-        check_fitsio( $status );
-
-        $outFits->create_img( 16, 0, undef, $status );
-        check_fitsio( $status );
-
-        # Create the table
-
-        $outFits->create_tbl( BINARY_TBL(), $numRows, scalar @colNames,
-                                \@colNames, \@colTypes, undef, $extname, $status );
-        check_fitsio( $status );
-
-        # if header keyword descriptions were provided add them
-        if ($header) {
-            foreach my $headerword ( @$header ) {
-                my $value = $headerword->{value};
-                unless (defined $value) {
-                    print "Can't find header keyword $headerword\n";
-                    next;
-                }
-                # zap quotation marks
-                $value =~ s/\'//g;
-                my $name    = $headerword->{name};
-                my $type    = $headerword->{writetype};
-                my $comment = $headerword->{comment};
-                $outFits->write_key( $type, $name, $value, $comment, $status );
-                check_fitsio( $status );
-            }
-        }
-
-
-        for (my $i = 0; $i < scalar @colNames; $i++) {
-            my $writeType = $colWriteType[$i];
-            $outFits->write_col( $writeType, $i + 1, 1, 1, $numRows, $colData->[$i], $status );
-            check_fitsio( $status );
-        }
-
-        $outFits->close_file( $status );
-
-        return 0;
-
-} # end of sub make_fits_table
-
-
-
-# read the table contents from a file
-#
-# input text file format:
-#   lines that begin with '#' are comment lines and are skipped.
-#   other lines are data. Each data line is split into fields with the
-#   provided separator
-#
-# if $header is not null header the first non-commented line is read to
-# fill the value for each header keyword. The number of fields must match
-# the number of keywords.
-#
-# Following the optional header data, each data line contains data for each
-# row in the table. The number of fields must match the number of column
-# arrays provided.
-
-sub read_data_for_table {
-    my $in      = shift;    # input file handle
-    my $sep     = shift;    # string containing field separator
-    my $colData = shift;    # reference to an array of arrays for the data
-    my $header  = shift;    # rerence to array of header keyword descriptions
-
-    my $line_num = 0;
-
-    # read data for header if any data is expected
-    if ($header) {
-        my $nhead = @$header;
-        while (my $line = <$in>) {
-            $line_num++;
-            chomp $line;
-            next if !$line;             # skip blank lines
-            next if ($line =~ /^#/);    # skip comment lines
-            my @vals = split /$sep/, $line;
-            my $nvals = @vals;
-            die "number of header columns in input $nvals does not equal expected number of header words $nhead"
-                    if (@vals != @$header);
-
-            for (my $i=0; $i < @$header; $i++) {
-                $header->[$i]->{value} = $vals[$i];
-            }
-
-            last; # only one header line
-        }
-    }
-
-    my $row_num = 0;
-    my $ncols = @$colData;
-    while (my $line = <$in>) {
-        chomp $line;
-        $line_num++;
-        next if !$line;             # skip blank lines
-        next if ($line =~ /^#/);    # skip comment lines
-
-        my @vals = split /$sep/, $line;
-        my $nvals = @vals;
-        die "number of columns $nvals in input does not equal expected number of header "
-                . " words $ncols on line $line_num" if ($nvals != $ncols);
-
-        for (my $col = 0; $col < @$colData; $col++) {
-            $colData->[$col]->[$row_num] = $vals[$col];
-        }
-        $row_num++;
-    }
-
-    # we return the number of rows read
-    return $row_num;
-}
-
-# From Astro::FITS::CFITSIO demo
-sub check_fitsio
-{
-    my $status = shift;		# Status of FITSIO calls
-
-    if ($status != 0) {
-	my $msg;		# Message to output
-	Astro::FITS::CFITSIO::fits_get_errstatus( $status , $msg );
-	die "CFITSIO error: $msg\n";
-    }
-}
Index: trunk/pstamp/test/test1.txt
===================================================================
--- trunk/pstamp/test/test1.txt	(revision 27204)
+++ trunk/pstamp/test/test1.txt	(revision 27204)
@@ -0,0 +1,28 @@
+# test1.txt
+# A sample Postage Stamp request description file.
+# This can be parsed by the program pstamp_req_create to build a PS1_PSTAMP_REQUEST fits binary table
+
+# First line of data is for the extension header
+#
+# Note that value for REQ_NAME may be overriden by the pstamp_req_create command line argument --req_name
+# Blank and comment lines (like this one) are ignored
+
+# REQ_NAME      EXTVER
+test1            1
+
+# subsequent lines define the rows in the table
+
+# If ROWNUM is set to zero, pstamp_request_file will set insert a value for each row beginning with 1
+# If a later input row reuses a value an error occurs
+
+#
+# ID    |     ROI Specification                   |  JOB Specification | Images of interest specification
+# ROWNUM CENTER_X    CENTER_Y  WIDTH HEIGHT COORD_MASK JOB_TYPE OPTION_MASK PROJECT REQ_TYPE IMG_TYPE    ID   TESS_ID COMPONENT    DATA_GROUP  REQFILT MJD_MIN MJD_MAX | COMMENT
+#
+0       135.49921     34.92035 100    100      2        stamp       1        gpc1    bycoord   chip       null    null   null           null        null 55249   55250   |search by coords (make the server work)
+# just change the coordinates for the next request
+0       135.63231     34.92165 100    100      2  | different coords in same images of interest
+0       135.49921     34.92035 |
+0       135.49921     34.92035 100    100      2        stamp       1        gpc1    byid     chip       62326    null   XY62           null        null   0       0     |specific image
+0       135.49921     34.92035 100    100      2        stamp       3        gpc1    byid     chip       62326    null   XY62           null        null   0       0     |image,mask,and weight
+0       135.49921     34.92035 100    100      2        stamp      63        gpc1    byid     chip       62326    null   XY62           null        null   0       0     |image,mask,weight,cmf, psf,backmdl