Changeset 30147 for trunk/ippToPsps/perl

Timestamp:

Dec 23, 2010, 2:50:34 PM (16 years ago)

Author:

rhenders

Message:

Some major refactoring

Location:

trunk/ippToPsps/perl

Files:

• ippToPsps/Batch.pm (modified) (3 diffs)
• ippToPsps/DetectionBatch.pm (modified) (3 diffs)
• ippToPsps/InitBatch.pm (modified) (3 diffs)
• ippToPsps/StackBatch.pm (modified) (4 diffs)
• pspsSchema2xml.pl (modified) (4 diffs)

trunk/ippToPsps/perl/ippToPsps/Batch.pm

@@ -126 +126 @@
     $self->{_surveyType} = $self->getSurveyTypeFromDistGroup();
 
-    # can we run ippToPsps?
-    $self->{_ippToPsps} = can_run('ippToPsps') or
-        (warn "Can't find 'ippToPsps' program" and exit($PS_EXIT_CONFIG_ERROR));
-
     # set up batch output paths
     $self->init();
@@ -139 +135 @@
 
     return $self;
+}
+
+########################################################################################
+# 
+# Sets to program and checks we can run it
+# 
+########################################################################################
+sub setProgram {
+    my ($self, $program) = @_;
+
+    # can we run ippToPsps?
+    $self->{program} = can_run($program) or
+        (warn "Can't find '$program' program" and exit($PS_EXIT_CONFIG_ERROR));
 }
 
@@ -197 +206 @@
     my ($self, $input, $resultsFilePath) = @_;
 
-    # build command
-    my $command = "$self->{_ippToPsps}";
-    $command .= " -input $input";
-    $command .= " -output $self->{_batchDir}";
-    if (defined $self->{_dvoPath} ) {$command .= " -D CATDIR $self->{_dvoPath}";}
-    $command .= " -config ../config"; # TODO
-        $command .= " -id $self->{_expId}";
-    $command .= " -expname $self->{_expName}";
-    $command .= " -survey $self->{_surveyType}";
-    $command .= " -batch $self->{_type}";
-    $command .= " -results $resultsFilePath";
-
-    # run command
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
-        = run(command => $command, verbose => $self->{_verbose});
-
-    return $success;
+    my $thisFunction = (caller(0))[3];
+    print "* ERROR: '$thisFunction' not implemented\n";
 }
 

trunk/ippToPsps/perl/ippToPsps/DetectionBatch.pm

@@ -8 +8 @@
 use File::Temp qw(tempfile);
 use XML::LibXML;
+use IPC::Cmd 0.36 qw( can_run run );
 
 use ippToPsps::Batch;
@@ -63 +64 @@
             );
 
+    $self->setProgram("detectionbatch");
+
     bless $self, $class;
     $self->process();
@@ -105 +108 @@
 #######################################################################################
 #
+# runs the ippToPsps program
+#
+#######################################################################################
+sub runProgram {
+    my ($self, $input, $resultsFilePath) = @_;
+
+    # build command
+    my $command = "$self->{program}";
+    $command .= " -input $input";
+    $command .= " -output $self->{_batchDir}";
+    if (defined $self->{_dvoPath} ) {$command .= " -D CATDIR $self->{_dvoPath}";}
+    $command .= " -config ../config"; # TODO
+    $command .= " -survey $self->{_surveyType}";
+    $command .= " -results $resultsFilePath";
+    $command .= " -expid $self->{_expId}";
+    $command .= " -expname $self->{_expName}";
+
+    # run command
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
+        = run(command => $command, verbose => $self->{_verbose});
+
+    return $success;
+}
+
+
+#######################################################################################
+#
 # - Reads results from processing (min/max obj ID etc)
 # - writes to Db

trunk/ippToPsps/perl/ippToPsps/InitBatch.pm

@@ -8 +8 @@
 use File::Temp qw(tempfile);
 use XML::LibXML;
+use IPC::Cmd 0.36 qw( can_run run );
 
 use ippToPsps::Batch;
@@ -37 +38 @@
             $_[7]);    # save_temps
 
+    $self->setProgram("initbatch");
+
     bless $self, $class;
     $self->process();
@@ -52 +55 @@
     return "NULL";
 }
+
+#######################################################################################
+#
+# runs the ippToPsps program
+#
+#######################################################################################
+sub runProgram {
+    my ($self, $input, $resultsFilePath) = @_;
+
+    # build command
+    my $command = "$self->{program}";
+    $command .= " -output $self->{_batchDir}";
+    $command .= " -config ../config"; # TODO
+    $command .= " -results $resultsFilePath";
+
+    # run command
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
+        = run(command => $command, verbose => $self->{_verbose});
+
+    return $success;
+}
+
 
 #######################################################################################

trunk/ippToPsps/perl/ippToPsps/StackBatch.pm

@@ -8 +8 @@
 use File::Temp qw(tempfile);
 use XML::LibXML;
+use IPC::Cmd 0.36 qw( can_run run );
 
 use ippToPsps::Batch;
@@ -62 +63 @@
             $_[11]  # save_temps
             );
-
+    
+    $self->setProgram("stackbatch");
 
     $self->{_skyId} = $_[1]; 
@@ -78 +80 @@
 sub createInputFileList {
     my ($self, $inputFile) = @_;
+
+  # TODO hardcode demo file for now
+        print $inputFile "/data/ippc18.0/home/rhenders/psphotstack.v3.001.cmf\n";
+            return 1;
+
 
     my ($nebPath, $numInputs);
@@ -98 +105 @@
     return 1;
 }
+
+#######################################################################################
+#
+# runs the ippToPsps program
+#
+#######################################################################################
+sub runProgram {
+    my ($self, $input, $resultsFilePath) = @_;
+
+    # build command
+    my $command = "$self->{program}";
+    $command .= " -input $input";
+    $command .= " -output $self->{_batchDir}";
+    if (defined $self->{_dvoPath} ) {$command .= " -D CATDIR $self->{_dvoPath}";}
+    $command .= " -config ../config"; # TODO
+    $command .= " -survey $self->{_surveyType}";
+    $command .= " -results $resultsFilePath";
+    $command .= " -skycellid $self->{_expId}";
+
+    # run command
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf )
+        = run(command => $command, verbose => $self->{_verbose});
+
+    return $success;
+}
+
 
 #######################################################################################

trunk/ippToPsps/perl/pspsSchema2xml.pl

@@ -30 +30 @@
 pod2usage(
         -msg => "\n   Required options:\n\n".
-        "--schema <path to PSPS schema>\n".
-        "--type <init|det|diff|stack|object>\n".
+        "-s   <path to PSPS schema>\n".
+        "-t   <init|detection|diff|stack|object>\n".
         -exitval => 3
         ) unless
@@ -37 +37 @@
 defined $type;
 
-if ($type ne "init" && $type ne "det" && $type ne "diff" && $type ne "stack" && $type ne "object" ) {
+if (
+        $type ne "init" && 
+        $type ne "detection" && 
+        $type ne "diff" && 
+        $type ne "stack" && 
+        $type ne "object" ) {
 
     print "Don't understand type '$type'\n"; 
@@ -43 +48 @@
 }
 
-my $enumsHeader = "ippToPsps".ucfirst($type)."Enums";
+my $enumsHeader = ucfirst($type)."BatchEnums";
 open(OUT, ">".$enumsHeader.".h") or die("Error");
 
@@ -61 +66 @@
 
 if ($type eq "init") {createInit();}
-elsif ($type eq "det") {createDetections();}
+elsif ($type eq "detection") {createDetections();}
 elsif ($type eq "diff") {createDiffs();}
 elsif ($type eq "stack") {createStacks();}