Index: trunk/ippScripts/Build.PL
===================================================================
--- trunk/ippScripts/Build.PL	(revision 18793)
+++ trunk/ippScripts/Build.PL	(revision 18794)
@@ -48,5 +48,4 @@
         scripts/camera_exp.pl
         scripts/fake_imfile.pl
-        scripts/fake_exp.pl
         scripts/warp_overlap.pl
         scripts/warp_skycell.pl
Index: trunk/ippScripts/scripts/fake_exp.pl
===================================================================
--- trunk/ippScripts/scripts/fake_exp.pl	(revision 18793)
+++ 	(revision )
@@ -1,129 +1,0 @@
-#!/usr/bin/env perl
-
-use Carp;
-use warnings;
-use strict;
-
-## report the program and machine
-use Sys::Hostname;
-my $host = hostname();
-print "\n\n";
-print "Starting script $0 on $host\n\n";
-
-use vars qw( $VERSION );
-$VERSION = '0.01';
-
-use IPC::Cmd 0.36 qw( can_run run );
-use PS::IPP::Metadata::Config;
-use PS::IPP::Metadata::Stats;
-use PS::IPP::Config 1.01 qw( :standard );
-
-my $ipprc = PS::IPP::Config->new(); # IPP configuration
-
-use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
-use Pod::Usage qw( pod2usage );
-
-# Parse the command-line arguments
-my ( $exp_id, $fake_id, $class_id, $chiproot, $camroot, $camera, $outroot,
-     $dbname, $reduction, $verbose, $no_update, $no_op, $redirect  );
-GetOptions(
-    'exp_id=s'          => \$exp_id,    # Exposure identifier
-    'fake_id=s'         => \$fake_id,   # Chiptool identifier
-    'camera|c=s'        => \$camera,       # Camera
-    'outroot|w=s'       => \$outroot,   # output file base name
-    'dbname|d=s'        => \$dbname,    # Database name
-    'reduction=s'       => \$reduction, # Reduction class
-    'verbose'           => \$verbose,   # Print to stdout
-    'no-update'         => \$no_update, # Don't update the database?
-    'no-op'             => \$no_op,        # Don't do any operations?
-    'redirect-output'   => \$redirect,
-    ) or pod2usage( 2 );
-
-pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --exp_id --fake_id --camera --outroot",
-           -exitval => 3) unless
-    defined $exp_id and
-    defined $fake_id and
-    defined $camera and
-    defined $outroot;
-
-$ipprc->define_camera($camera);
-
-my $logDest = $ipprc->filename("LOG.EXP", $outroot, "exp") or &my_die("Missing entry from camera config", $exp_id, $fake_id, $PS_EXIT_CONFIG_ERROR);
-
-$ipprc->redirect_output($logDest) if $redirect;
-
-# Look for programs we need
-my $missing_tools;
-my $faketool = can_run('faketool') or (warn "Can't find faketool" and $missing_tools = 1);
-if ($missing_tools) {
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
-
-my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
-
-# check for existing directory, generate if needed
-$ipprc->outroot_prepare($outroot);
-
-
-
-
-### Operations to perform go here
-
-
-
-
-### Update database
-{
-    my $command = "$faketool -addprocessedexp"; # Command to update database
-    $command   .= " -fake_id $fake_id";
-    $command   .= " -exp_id $exp_id";
-    $command   .= " -path_base $outroot";
-    $command   .= " -dbname $dbname" if defined $dbname;
-
-    # Add the processed file to the database
-    unless ($no_update) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            warn("Unable to perform faketool -addprocessedexp: $error_code\n");
-            exit($error_code);
-        }
-    } else {
-        print "skipping command: $command\n";
-    }
-}
-
-### Pau.
-
-
-sub my_die
-{
-    my $msg = shift; # Warning message on die
-    my $exp_id = shift; # rawExp identifier
-    my $fake_id = shift; # fakeRun identifier
-    my $exit_code = shift; # Exit code to add
-
-    carp($msg);
-    if (defined $exp_id and defined $fake_id  and not $no_update) {
-        my $command = "$faketool -addprocessedexp";
-        $command .= " -fake_id $fake_id";
-        $command .= " -exp_id $exp_id";
-        $command .= " -path_base $outroot";
-        $command .= " -code $exit_code";
-        $command .= " -dbname $dbname" if defined $dbname;
-        system($command);
-    }
-    exit $exit_code;
-}
-
-END {
-    my $status = $?;
-    system("sync") == 0
-        or die "failed to execute sync: $!" ;
-    $? = $status;
-}
-
-__END__
Index: trunk/ippTasks/fake.pro
===================================================================
--- trunk/ippTasks/fake.pro	(revision 18793)
+++ trunk/ippTasks/fake.pro	(revision 18794)
@@ -7,14 +7,11 @@
 
 book init fakePendingImfile
-book init fakePendingExp
 
 macro fake.status
   book listbook fakePendingImfile
-  book listbook fakePendingExp
 end
 
 macro fake.reset
   book init fakePendingImfile
-  book init fakePendingExp
 end
 
@@ -24,10 +21,4 @@
   end
   task fake.imfile.run
-    active true
-  end
-  task fake.exp.load
-    active true
-  end
-  task fake.exp.run
     active true
   end
@@ -41,15 +32,8 @@
     active false
   end
-  task fake.exp.load
-    active false
-  end
-  task fake.exp.run
-    active false
-  end
 end
 
 # this variable will cycle through the known database names
 $fakeImfile_DB = 0
-$fakeExp_DB = 0
 
 # select images ready for fake analysis
@@ -171,117 +155,2 @@
 
 
-
-
-# select exposures ready for fake analysis
-# new entries are added to fakePendingExp
-# skip already-present entries
-task	       fake.exp.load
-  host         local
-
-  periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
-  npending     1
-
-  stdout NULL
-  stderr $LOGDIR/fake.exp.log
-
-  task.exec
-    if ($DB:n == 0)
-      option DEFAULT
-      command faketool -pendingexp -limit 20
-    else
-      # save the DB name for the exit tasks
-      option $DB:$fakeExp_DB
-      command faketool -pendingexp -limit 20 -dbname $DB:$fakeExp_DB
-      $fakeExp_DB ++
-      if ($fakeExp_DB >= $DB:n) set fakeExp_DB = 0
-    end
-  end
-
-  # success
-  task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout fakePendingExp -key fake_id -uniq -setword dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook fakePendingExp
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup fakePendingExp
-  end
-
-  # locked list
-  task.exit    default
-    showcommand failure
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-
-# run the fake_exp.pl script on pending images
-task	       fake.exp.run
-  periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
-  periods      -timeout 60
-
-  task.exec
-    book npages fakePendingExp -var N
-    if ($N == 0) break
-    if ($NETWORK == 0) break
-    
-    # look for new exposures in fakePendingExp (pantaskState == INIT)
-    book getpage fakePendingExp 0 -var pageName -key pantaskState INIT
-    if ("$pageName" == "NULL") break
-
-    book setword fakePendingExp $pageName pantaskState RUN
-    book getword fakePendingExp $pageName camera -var CAMERA
-    book getword fakePendingExp $pageName exp_id -var EXP_ID
-    book getword fakePendingExp $pageName exp_tag -var EXP_TAG
-    book getword fakePendingExp $pageName fake_id -var FAKE_ID
-    book getword fakePendingExp $pageName workdir -var WORKDIR_TEMPLATE
-    book getword fakePendingExp $pageName dbname -var DBNAME
-    book getword fakePendingExp $pageName reduction -var REDUCTION
-
-    # specify choice of local or remote host based on camera and fake
-    set.host.for.camera $CAMERA FPA
-
-    # set the WORKDIR variable
-    set.workdir.by.camera $CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
-
-    ## generate outroot specific to this exposure (& chip)
-    sprintf outroot "%s/%s/%s.fk.%s" $WORKDIR $EXP_TAG $EXP_TAG $FAKE_ID
-
-    stderr $LOGDIR/fake.exp.log
-    stderr $LOGDIR/fake.exp.log
-
-    $run = fake_exp.pl --exp_id $EXP_ID --fake_id $FAKE_ID --camera $CAMERA --outroot $outroot
-    if ("$REDUCTION" != "NULL")
-      $run = $run --reduction $REDUCTION
-    end
-    add_standard_args run
-
-    # save the pageName for future reference below
-    options $pageName
-
-    # create the command line
-    if ($VERBOSE > 1)
-      echo command $run
-    end
-    command $run
-  end
-
-  # default exit status
-  task.exit    default
-    process_exit fakePendingExp $options:0 $JOB_STATUS
-  end
-
-  # operation timed out?
-  task.exit    timeout
-    showcommand timeout
-    book setword fakePendingExp $options:0 pantaskState TIMEOUT
-  end
-end