Changeset 28842

Timestamp:

Aug 4, 2010, 4:30:32 PM (16 years ago)

Author:

rhenders

Message:

Neatened instructions; changed call to function for single exposure

File:

• trunk/ippToPsps/perl/ippToPsps_run.pl (modified) (2 diffs)

trunk/ippToPsps/perl/ippToPsps_run.pl

@@ -49 +49 @@
 print "* \n";
 if (@ARGV) {
-    print "* UNKNKOWN: option:                         @ARGV\n"; $quit=1;}
+    print "* UNKNKOWN: option                          @ARGV\n"; $quit=1;}
 if (!defined $output) {
-    print "* REQUIRED: need to provide an output path: -o <path>\n"; $quit=1;}
+    print "* REQUIRED: need to provide an output path  -o <path>\n"; $quit=1;}
 if (!defined $batchType) {
-    print "* REQUIRED: need to define a batch type:    -b <init|det|diff|stack>\n"; $quit=1;}
+    print "* REQUIRED: need to define a batch type     -b <init|det|diff|stack>\n"; $quit=1;}
 if (!defined $dvodb) {
-    print "* REQUIRED: need to provide a DVO Db path:  -d <path>\n"; $quit=1;}
+    print "* REQUIRED: need to provide a DVO Db path   -d <path>\n"; $quit=1;}
 if (!defined $survey and !defined $singleExpId) {
-    print "* REQUIRED: need to provide a survey type:  -s <ThreePi|STS|SAS|M31|MD01|MD02|etc> ***OR***\n";
+    print "* REQUIRED: need to provide a survey type   -s <ThreePi|STS|SAS|M31|MD01|MD02|etc> ***OR***\n";
     print "*           an exposure ID                  -e <expID>\n"; $quit=1;}
 if (!defined $datastoreProduct) {
-    print "* OPTIONAL: datastore product:              -p <product>\n";}
+    print "* OPTIONAL: datastore product               -p <product>\n";}
 if (!defined $verbose) {
-    print "* OPTIONAL: run in verbose mode:            -v\n"; $verbose = 0;}
+    print "* OPTIONAL: run in verbose mode             -v\n"; $verbose = 0;}
 if (!defined $save_temps) {
-    print "* OPTIONAL: keep temp files:                -t\n"; $save_temps = 0;}
+    print "* OPTIONAL: keep temp files                 -t\n"; $save_temps = 0;}
 if (!defined $no_update) {
-    print "* OPTIONAL: don't update database:          -u\n"; $no_update = 0;}
+    print "* OPTIONAL: don't update database           -u\n"; $no_update = 0;}
 if (!defined $force) {
-    print "* OPTIONAL: force if already processed :    -f\n"; $force = 0;}
+    print "* OPTIONAL: force if already processed      -f\n"; $force = 0;}
 if (!defined $dontTarNZip) {
-    print "* OPTIONAL: don't tar and zip output :      -z\n"; $dontTarNZip = 0;}
+    print "* OPTIONAL: don't tar and zip output        -z\n"; $dontTarNZip = 0;}
     print "*\n*******************************************************************************\n";
 
@@ -122 +122 @@
         @{$rows} = (\@row);
     }
-    elsif ($singleExpId) { $rows = $gpc1Db->getExposureListFromExpId($singleExpId); }
-    else { $rows = $gpc1Db->getExposureListFromSurvey($survey); }
+    elsif ($singleExpId) {$rows = $gpc1Db->getSingleExposureInfo($singleExpId);}
+    else {$rows = $gpc1Db->getExposureListFromSurvey($survey);}
 
 # TODO check if there are no exposures and give a warning