Changeset 12697 for trunk/ippTasks/detrend.norm.pro

Timestamp:

Mar 30, 2007, 1:09:39 PM (19 years ago)

Author:

Paul Price

Message:

Changing set_standard_args to employ a filtering approach --- it supplements the command-line instead of providing something that gets added on. Needed to do this because wanted the arguments it provides to be optional, and it really doesn't like to have a zero length string as an argument.

File:

• trunk/ippTasks/detrend.norm.pro (modified) (6 diffs)

trunk/ippTasks/detrend.norm.pro

@@ -155 +155 @@
     book getword detPendingNormStatImfile $pageName workdir   -var WORKDIR
     book getword detPendingNormStatImfile $pageName dbname    -var DBNAME
-    set_standard_args
 
     # specify choice of remote host:
@@ -175 +174 @@
     exec mkdir -p $outroot
 
-    $run = detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE $ARGS
+    $run = detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
     end
+    add_standard_args run
 
     # save the pageName for future reference below
@@ -277 +277 @@
     book getword detPendingNormImfile $pageName workdir   -var WORKDIR
     book getword detPendingNormImfile $pageName dbname    -var DBNAME
-    set_standard_args
 
     # specify choice of remote host:
@@ -298 +297 @@
     exec mkdir -p $outroot
 
-    $run = detrend_norm_apply.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE $ARGS
+    $run = detrend_norm_apply.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
     end
+    add_standard_args run
     
     # save the pageName for future reference below
@@ -397 +397 @@
     book getword detPendingNormExp $pageName workdir   -var WORKDIR
     book getword detPendingNormExp $pageName dbname    -var DBNAME
-    set_standard_args
 
     # specify choice of remote host:
@@ -418 +417 @@
     exec mkdir -p $outroot
 
-    $run = detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE  $ARGS
+    $run = detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE 
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
     end
+    add_standard_args run
 
     # save the pageName for future reference below