Changeset 30930

Timestamp:

Mar 16, 2011, 12:37:51 PM (15 years ago)

Author:

bills

Message:

changes to support distributing unmagicked raw data (for detrends)

File:

• tags/ipp-20110218/ippTasks/dist.pro (modified) (4 diffs, 1 prop)

tags/ipp-20110218/ippTasks/dist.pro

@@ -188 +188 @@
      # stderr $LOGSUBDIR/dist.process.load.log
 
+    # check current stage in case it is out of range because entries
+    # have been removed
+    if ($currentStage >= $DIST_STAGE:n) set currentStage = 0
+
     $run = disttool -pendingcomponent -stage $DIST_STAGE:$currentStage
     $currentStage ++
@@ -270 +274 @@
     book getword distToProcess $pageName alt_path_base -var ALT_PATH_BASE
     book getword distToProcess $pageName outdir -var OUTDIR_TEMPLATE
+    book getword distToProcess $pageName exp_type -var EXP_TYPE
     book getword distToProcess $pageName dbname -var DBNAME
 
@@ -287 +292 @@
         $EXTRA_ARGS = $EXTRA_ARGS --poor_quality
     end
-    if ("$ALT_PATH_BASE" != "")
+    if ("$ALT_PATH_BASE" != "NULL")
         $EXTRA_ARGS = $EXTRA_ARGS --alt_path_base $ALT_PATH_BASE
     end
@@ -310 +315 @@
     sprintf logfile "%s/dist.%s.%s.log" $OUTDIR $DIST_ID $COMPONENT
 
-    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $DIST_STAGE --stage_id $DIST_STAGE_ID --component $COMPONENT --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $EXTRA_ARGS --outdir $OUTDIR --logfile $logfile
+    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $DIST_STAGE --stage_id $DIST_STAGE_ID --component $COMPONENT --exp_type $EXP_TYPE --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $EXTRA_ARGS --outdir $OUTDIR --logfile $logfile
 
     add_standard_args run