diff --git a/src/Macro/Main.java b/src/Macro/Main.java index db5652e15eb2b7bfb2217f0bfbf190196e614b09..b6bf2d5273d490eb824d41021ea1fa3989972047 100644 --- a/src/Macro/Main.java +++ b/src/Macro/Main.java @@ -164,18 +164,23 @@ macro "Main"{ /* ============================================================================ - SELECT THE CHANNEL + SELECT THE CHANNEL AND LOOP OF PARAMETERS CREATION ============================================================================ */ //Launch Channel Selection - ArgChannel = myAnalysis + "*"; - ArgChannel += myReuse; - myChannel = runMacro(PathSelChannel, ArgChannel); + if (myReuse == "NO"){ + ArgChannel = myAnalysis + "*"; + ArgChannel += myReuse; + myChannel = runMacro(PathSelChannel, ArgChannel); + }else{ + myChannel = "None;None"; + } + /* ============================================================================ - LOOP OF PARAMETERS CREATION + LOOP OF PARAMETERS CREATION ============================================================================ */ diff --git a/src/Macro/Taylor.java b/src/Macro/Taylor.java index 1738652457654aab56c5d1944a4c8d10b3885bca..9e1c80aab976a8947e1bd7a68aa5a5aab03ef7fb 100644 --- a/src/Macro/Taylor.java +++ b/src/Macro/Taylor.java @@ -67,7 +67,7 @@ macro "Taylor"{ nFiles = FileList.length; if (myReuse == "YES"){ - RecycleSetUp() + RecycleSetUp(); } if (myReuse == "NO"){ @@ -262,13 +262,18 @@ function RecycleSetUp(){ //Use the correct concatenated arguments Arguments = split(myCommandsList[c], "*"); - Sstart = parseFloat(Arguments[14]); - Send = parseFloat(Arguments[15]); - NeuroPilXtext = Arguments[16]; - NeuroPilYtext = Arguments[17]; - Path = Arguments[18]; - myRoot = Arguments[19]; - myProgress = parseFloat(Arguments[20]); + Sstart = Arguments[15]; + Send = Arguments[16]; + NeuroPilXtext = Arguments[17]; + NeuroPilYtext = Arguments[18]; + Path = Arguments[19]; + myRoot = Arguments[20]; + myProgress = Arguments[21]; + + //Channel to be treated + channels = split(Arguments[25], ";"); + myChannel = channels[0]; + myChannelContrast = channels[1]; //Generate the paramaters of analysis of the current stack ARG = ARGcommon;