Index: trunk/ippTasks/magic.pro
===================================================================
--- trunk/ippTasks/magic.pro	(revision 24184)
+++ trunk/ippTasks/magic.pro	(revision 24554)
@@ -278,7 +278,18 @@
     book getword magicToProcess $pageName dbname -var DBNAME
 
-#    set.host.for.camera $CAMERA $MAGIC_ID
-#    set.workdir.by.camera $CAMERA $MAGIC_ID $WORKDIR_TEMPLATE $default_host WORKDIR
-    host anyhost
+#    XXX: we need new macros that select the host and workdir based on the NODE
+#    we also need to make the magic scripts able to deal with the workdir being spread
+#    around. That should not be too hard
+#    For now select nodes by skycell
+
+    substr $NODE 0 3 NODE_HEAD
+    if ("$NODE_HEAD" == "sky")
+        set.host.for.skycell $NODE
+    else 
+        host anyhost
+    end
+
+#    currently DetectStreaks expects that the workdir is not in nebulous
+#    set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR
     $WORKDIR = $WORKDIR_TEMPLATE
 
@@ -410,5 +421,4 @@
     book getword magicToDS $pageName recoveryroot -var RECROOT
     book getword magicToDS $pageName re_place -var REPLACE
-    book getword magicToDS $pageName remove -var REMOVE
     book getword magicToDS $pageName dbname -var DBNAME
 
@@ -417,7 +427,7 @@
     host anyhost
 
-    # TODO: do not add recoveryroot, replace, or remove if they are null or zero
-
-    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --streaks $STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE --remove $REMOVE 
+    # TODO: do not add recoveryroot or replace if they are null or zero
+
+    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --streaks $STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE
     if ("$INVERSE" == "T")
        # Inverse subtraction