Changeset 29515 for branches/eam_branches/ipp-20100823/ippToPsps/perl/getSmfForThisBatch.pl

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/ippToPsps/perl/getSmfForThisBatch.pl (modified) (3 diffs)

branches/eam_branches/ipp-20100823/ippToPsps/perl/getSmfForThisBatch.pl

@@ -7 +7 @@
 use ippToPsps::Gpc1Db;
 use ippToPsps::IppToPspsDb;
-use PS::IPP::Config 1.01 qw( :standard );
+use ippToPsps::DetectionBatch;
 
 my $camera = undef;
-my $singleBatch = undef;
+my $batch = undef;
 my $verbose = undef;
 my $save_temps = undef;
 
 GetOptions(
-        'batch|b=s' => \$singleBatch,
+        'batch|b=s' => \$batch,
         'verbose|v' => \$verbose,
         'save_temps|t' => \$save_temps,
@@ -26 +26 @@
 if (@ARGV) {
     $quit=1;
-    print "* UNKNKOWN: option                          @ARGV\n";
+    print "* UNKNOWN: option                          @ARGV\n";
 }
-if (!defined $singleBatch) {
+if (!defined $batch) {
     $quit=1;
     print "* REQUIRED: need to provide a batch   -b <batch>\n";
 }
-if (!defined $verbose) {
+if (!defined $camera) {
     $camera = "GPC1";
     print "* OPTIONAL: select a camera                 -c                   (default = $camera)\n";
@@ -51 +51 @@
 my $gpc1Db = new ippToPsps::Gpc1Db("gpc1", "ippdb01", "ippuser", "ippuser", $verbose, $save_temps);
 my $ippToPspsDb = new ippToPsps::IppToPspsDb("ippToPsps", "ippdb01", "ipp", "ipp", $verbose, $save_temps);
-my $ipprc = PS::IPP::Config->new($camera) or (warn "Can't get camera configuration" and exit($PS_EXIT_CONFIG_ERROR));
 
+my $detectionBatch = ippToPsps::DetectionBatch->existing(
+        $camera,
+        $gpc1Db,
+        $batch, 
+        $ippToPspsDb, 
+        "./",
+        $verbose, 
+        $save_temps);
 
-my $batches;
-my $numOfBatches;
-
-if (defined $singleBatch ) { $numOfBatches = $ippToPspsDb->getBatch($singleBatch, \$batches);}
-if ($numOfBatches < 1) {return 0;}
-
-
-# loop round batches
-my $batch;
-my $numChecked = 0;
-foreach $batch ( @{$batches} ) {
-    my ($timestamp, $expId, $batchId, $surveyType, $deleted, $dvoDb, $processed, $onDatastore, $loadedToOdm, $mergeWorthy, $merged) =  @{$batch};
-
-    print "* found $timestamp, $expId, $batchId, $surveyType, $deleted $dvoDb\n";
-
-    my $nebPath = $gpc1Db->getCameraStageSmfForThisDvoDb($dvoDb, $expId);
-    if (!$nebPath) { print "* Could not determind neb path for SMF\n"; exit; }
-
-    # get real filename from neb 'key'
-    my $fpaObjects = $ipprc->filename("PSASTRO.OUTPUT",$nebPath) or return 0;
-    my $realFile = $ipprc->file_resolve($fpaObjects) or return 0;
-
-    print "$realFile\n";
-
+my $smf = $detectionBatch->getSmfFile();
+if (defined $smf) {
+    print "$smf\n";
 }
-
-
+else {
+    print "* Could not find an smf file for batch $batch\n";
+}