Changeset 28017 for branches/czw_branch/20100427/ippToPsps/scripts/ippToPsps_run.pl

Timestamp:

May 18, 2010, 5:06:01 PM (16 years ago)

Author:

watersc1

Message:

Almost working version of the mask-stats/software revision code.

Almost.

Location:

branches/czw_branch/20100427

Files:

• . (modified) (1 prop)
• ippToPsps/scripts/ippToPsps_run.pl (modified) (19 diffs)

branches/czw_branch/20100427/ippToPsps/scripts/ippToPsps_run.pl

@@ -12 +12 @@
 
 # globals
-my ($verbose, $save_temps, $no_op, $no_update, $camera, $product, $output, $dvodb, $datastoreProduct, $label, $singleExpId, $no_publish);
+my ($verbose, $save_temps, $no_op, $no_update, $camera, $batchType, $output, $dvodb, $datastoreProduct, $label, $singleExpId, $no_publish);
 
 # TODO temporary until we use database to store current jobid
@@ -31 +31 @@
 GetOptions(
         'output|o=s' => \$output,
-        'product|p=s' => \$product,
+        'batch|b=s' => \$batchType,
         'dvodb|d=s' => \$dvodb,
         'label|l=s' => \$label,
         'expid|e=s' => \$singleExpId,
-        'dsproduct|s=s' => \$datastoreProduct,
+        'product|p=s' => \$datastoreProduct,
         'no_publish' => \$no_publish,
         'verbose|v' => \$verbose,
@@ -48 +48 @@
 pod2usage(
         -msg => "\n   Required options:\n\n".
-        "--product <init|det|diff|stack>\n".
+        "--batch <init|det|diff|stack>\n".
         "--output <path>\n".
-        "--label <label> | --expid <expid>\n" .
-        "--dvodb <path>\n\n",
+        "--label <label> or --expid <expid>\n" .
+        "--dvodb <path>\n".
+        "\n   Optional:\n\n".
+        "--product <datastoreProduct>\n".
+        "--no_publish - won't publish to datastore\n".
+        "--save_temps - will save temporary files\n".
+        "--no-op - ?\n".
+        "--no-update - will not update database\n",
         -exitval => 3
         ) unless 
-defined $product and
+defined $batchType and
 defined $output and
 defined $dvodb and
@@ -128 +134 @@
             WHERE camRun.chip_id = chipRun.chip_id
             AND chipRun.exp_id = rawExp.exp_id
-            AND camRun.label like '%$label%'
+            AND camRun.label LIKE '%$label%'
             ORDER BY rawExp.exp_id ASC
 SQL
+            #AND rawExp.exp_id > 136561
             #AND camRun.dist_group LIKE 'sas'
             #AND rawExp.decl >= '-0.157079633' AND rawExp.decl <= '0.157079633' Jims Dec range
@@ -138 +145 @@
         $query = $db->prepare(<<SQL);
 
-        SELECT DISTINCT exp_id FROM rawExp WHERE rawExp.exp_id = $singleExpId
+        SELECT DISTINCT rawExp.exp_id, dist_group FROM rawExp, chipRun WHERE chipRun.exp_id = rawExp.exp_id AND rawExp.exp_id = $singleExpId
 SQL
     }
@@ -176 +183 @@
         my $batchOutputPath = sprintf("$jobOutputPath/%s", $batchDir);
 
-        print "* Preparing exposure as job '$job'...\n";
+        print "* Preparing exposure $expId as job '$job'...\n";
 
         # make directories
         mkdir($jobOutputPath, 0777);
         mkdir($batchOutputPath, 0777);
+        setJobId($jobId);
 
         # run IppToPsps program
-        if (runIppToPsps($db, $expId, $batchOutputPath, $product)) {
+        if (runIppToPsps($db, $expId, $batchOutputPath, $batchType)) {
 
             # write batch manifest and tar and zip up
-            if (writeBatchManifest($batchOutputPath, $batchDir, $product)) {
+            if (writeBatchManifest($batchOutputPath, $batchDir, $batchType)) {
 
                 if (tarAndZipDirectory($jobOutputPath, $batchDir)) {
@@ -207 +215 @@
                 }
 
-                setJobId($jobId);
                 $jobId++;
                 $batchId = 0;
@@ -218 +225 @@
         }
 
-        if ($product eq "init" ) {print "* Wrote initialisation batch\n"; last;}
+        if ($batchType eq "init" ) {print "* Wrote initialisation batch\n"; last;}
 
 
@@ -271 +278 @@
 #######################################################################################
 sub runIppToPsps {
-    my ($db, $expId, $batchOutputPath, $product) = @_;
+    my ($db, $expId, $batchOutputPath, $batchType) = @_;
 
     my $success = 0;
 
     # before anything else, we can publish the init batch
-    if ($product =~ /init/) {
+    if ($batchType =~ /init/) {
         $success = produceInit($batchOutputPath);
     }
-    elsif ($product =~ /det/) {
+    elsif ($batchType =~ /det/) {
         $success = produceDetections($db, $expId, $batchOutputPath);
     }
-    elsif ($product =~ /diff/) {
+    elsif ($batchType =~ /diff/) {
         $success = produceDiffs($db, $expId, $batchOutputPath);
     }
@@ -337 +344 @@
 sub writeBatchManifest {
 
-    my ($path,$batch,$product) = @_;
+    my ($path,$batch,$batchType) = @_;
 
     use XML::Writer;
@@ -352 +359 @@
     # determine batch 'type'
     my $type;
-    if($product eq 'init') {$type = "IN";}
-    elsif($product eq 'det') {$type = "P2";}
-    elsif ($product eq 'stack') {$type = "ST";}
-    elsif ($product eq 'diff') {$type = "OB";}
+    if($batchType eq 'init') {$type = "IN";}
+    elsif($batchType eq 'det') {$type = "P2";}
+    elsif ($batchType eq 'stack') {$type = "ST";}
+    elsif ($batchType eq 'diff') {$type = "OB";}
     else {$type = "UNKNOWN";}
 
@@ -366 +373 @@
     my $maxObjId;
     my $filename;
-    if($product eq 'det') {
+    if($batchType eq 'det') {
 
         while (<MYFILE>) {
@@ -403 +410 @@
 
             # write manifest element TODO untidy
-            if($product eq 'det' && $filename eq $f) {
+            if($batchType eq 'det' && $filename eq $f) {
 
                 $writer->startTag('manifest',
@@ -430 +437 @@
             #$writer->startTag('md5'); $writer->characters("$md5sum"); $writer->endTag();
 
-            #if($product eq 'det' && $filename eq $f) {
+            #if($batchType eq 'det' && $filename eq $f) {
 
                 #    $writer->startTag('minObjId'); $writer->characters("$minObjId"); $writer->endTag();
@@ -577 +584 @@
     my ($outputPath) = @_;
 
-    my $success = runProgram( "NULL", $outputPath, 0, $product);
+    my $success = runProgram( "NULL", $outputPath, 0, $batchType);
     return $success;
 }
@@ -621 +628 @@
         close $tempFile;
 
-        $success = runProgram($tempName, $outputPath, $expId, $product);
+        $success = runProgram($tempName, $outputPath, $expId, $batchType);
         return $success;
     }
@@ -670 +677 @@
     }
 
-    my $ret = runProgram($tempName, $outputPath, $expId, $product);
+    my $ret = runProgram($tempName, $outputPath, $expId, $batchType);
 
     close $tempFile;
@@ -683 +690 @@
 #######################################################################################
 sub runProgram {
-    my ($input, $output, $expid, $product) = @_;
+    my ($input, $output, $expid, $batchType) = @_;
 
     # build command
@@ -692 +699 @@
     $command .= " -config config"; # TODO
     $command .= " -expid $expid";
-    $command .= " -product $product";
+    $command .= " -batch $batchType";
     $command .= " -results $resultsFileName";