Changeset 29194

Timestamp:

Sep 22, 2010, 12:50:41 PM (16 years ago)

Author:

rhenders

Message:

Constructor now takes camera and gpc1Db object

File:

• trunk/ippToPsps/perl/ippToPsps/Batch.pm (modified) (5 diffs)

trunk/ippToPsps/perl/ippToPsps/Batch.pm

@@ -21 +21 @@
     my $class = shift;
     my $self = {
+        _camera => shift,
+        _gpc1Db => shift,
         _batchId => shift,
         _ippToPspsDb => shift,
@@ -110 +112 @@
     }
 
-# create a new batch entry in the database
+    # create a new batch entry in the database
     $self->{_batchId} = $self->{_ippToPspsDb}->createNewBatch(
             $self->{_expId}, 
@@ -119 +121 @@
             );
 
-# use IPP dist_group to get PSPS survey type
+    # use IPP dist_group to get PSPS survey type
     $self->{_surveyType} = $self->getSurveyTypeFromDistGroup();
 
-# can we run ippToPsps?
+    # can we run ippToPsps?
     $self->{_ippToPsps} = can_run('ippToPsps') or
         (warn "Can't find 'ippToPsps' program" and exit($PS_EXIT_CONFIG_ERROR));
 
-# get ipp config stuff
-    $self->{_ipprc} = PS::IPP::Config->new($self->{_camera}) or
-        (warn "Can't get camera configuration" and exit($PS_EXIT_CONFIG_ERROR));
-
-# set up batch output paths
+    # set up batch output paths
     $self->init();
 
-# make directories
+    # make directories
     unless(-d $self->{_typeDir}) {mkdir($self->{_typeDir}, 0777);}
     unless(-d $self->{_subDir}) {mkdir($self->{_subDir}, 0777);}
@@ -150 +148 @@
 sub init {
     my ($self) = @_;
+
+    # get ipp config stuff
+    if (defined $self->{_camera}) {
+
+        $self->{_ipprc} = PS::IPP::Config->new($self->{_camera}) or
+            (warn "Can't get camera configuration" and exit($PS_EXIT_CONFIG_ERROR));
+    }
 
     $self->{_name} =  sprintf("B%08d", $self->{_batchId});
@@ -198 +203 @@
     if (defined $self->{_dvoPath} ) {$command .= " -D CATDIR $self->{_dvoPath}";}
     $command .= " -config ../config"; # TODO
-    $command .= " -expid $self->{_expId}";
+        $command .= " -expid $self->{_expId}";
     $command .= " -expname $self->{_expName}";
     $command .= " -survey $self->{_surveyType}";