Index: branches/eam_branches/20091201/ippTasks/magic.pro
===================================================================
--- branches/eam_branches/20091201/ippTasks/magic.pro	(revision 26295)
+++ branches/eam_branches/20091201/ippTasks/magic.pro	(revision 26812)
@@ -283,10 +283,7 @@
     $WORKDIR = $WORKDIR_TEMPLATE
 
-    sprintf outroot "%s/%s/%s.mgc.%s.%s" $WORKDIR $EXP_ID $EXP_ID $MAGIC_ID $NODE
-
-    ## generate output log based on filerule (convert the URI to a PATH)
-    ## caution with neb:// names here:
-    # $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $MAGIC_ID --basename $outroot`
-    $logfile = $outroot.log
+    sprintf baseroot "%s/%s/%s.mgc.%s" $WORKDIR $EXP_ID $EXP_ID $MAGIC_ID
+
+    $logfile = $baseroot.$NODE.log
     if ("$logfile" == "") 
       echo "WARNING: logfile not defined in magic.process.run"
@@ -299,5 +296,5 @@
     mkdir $outpath
 
-    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --outroot $outroot --logfile $logfile
+    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --baseroot $baseroot --logfile $logfile
     add_standard_args run