Segmentation optimization

mfroeling · Dec 31, 2024 · a61187d · a61187d
1 parent 3e45d3c
commit a61187d
Show file tree

Hide file tree

Showing 7 changed files with 1,283 additions and 3,938 deletions.
diff --git a/QMRITools/Kernel/MaskingTools.wl b/QMRITools/Kernel/MaskingTools.wl
@@ -171,7 +171,7 @@ NormalizeData[data_, opts : OptionsPattern[]] := Block[{ndat, mask},
 		mask = Mask[NormDat[ndat - Min@ndat, 0.]];
 		NormalizeData[data, mask, opts]
 		,
-		NormDatC[data]
+		Quiet@NormDatC[data]
 	]
 ]
 
@@ -194,7 +194,7 @@ NormDatC = Compile[{{dat, _Real, 3}}, Block[{fl, min, max, bins, cdf, n, tot},
 	n = 1024;
 	fl = Flatten[dat];
 	{min, max} = MinMax[fl];
-	If[min == max, dat,
+	If[min === max, dat,
 		bins = BinCounts[fl, {min, max, (max - min)/n}];
 		bins[[1]] = 0.;
 		tot = Total[bins];

diff --git a/QMRITools/Kernel/SegmentationTools.wl b/QMRITools/Kernel/SegmentationTools.wl
diff --git a/QMRITools/Kernel/SpectroTools.wl b/QMRITools/Kernel/SpectroTools.wl
@@ -2191,8 +2191,8 @@ SyntaxInformation[ImportSparSdat] = {"ArgumentsPattern" -> {_, _}};
 
 ImportSparSdat[fspar_,fsdat_]:=Block[{nums,head,depth,row,nsamp,x,y,z,bw,te,nuc,gyro,field,fids,specs},
 	(*read raw data and header*)
-	nums=FromVaxD[bin=BinaryReadList[fsdat,"UnsignedInteger32"]];
-	head=ParseSpar[Import[fspar,"Lines"]];
+	nums=FromVaxD[BinaryReadList[fsdat, "UnsignedInteger32"]];
+	head=ParseSpar[Import[fspar, "Lines"]];
 
 	(*get header infor*)
 	{bw,te,nuc,gyro}={"sample_frequency","spectrum_echo_time","nucleus","synthesizer_frequency"}/.head;

diff --git a/QMRITools/Kernel/TractographyTools.wl b/QMRITools/Kernel/TractographyTools.wl
@@ -588,7 +588,11 @@ FiberTractography[tensor_, vox:{_?NumberQ,_?NumberQ,_?NumberQ}, inp : {{_, {_, _
 
 	step = N@If[NumberQ[step],step, Min[0.5 vox]];
 	maxStep = Ceiling[(maxLength/step)];
-	tractF = Switch[OptionValue[Method], "RungeKutta" | "RK" | "RK2", RK2, "RungeKutta4" | "RK4", RK4, _, Euler];
+	tractF = Switch[OptionValue[Method], 
+		"RungeKutta" | "RK" | "RK2", RK2, 
+		"RungeKutta4" | "RK4", RK4, 
+		_, Euler
+	];
 
 	(*prepare tensor and stop data, remove background for performance and make int functions*)
 	dim = Rest@Dimensions@tensor;

diff --git a/QMRITools/PacletInfo.wl b/QMRITools/PacletInfo.wl
@@ -2,7 +2,7 @@
 
 PacletObject[<|
 	"Name" -> "QMRITools",
-	"Version" -> "4.1.2",
+	"Version" -> "4.1.3",
 	"WolframVersion" -> "14.0+",
 	"SystemID" -> All, 
 

diff --git a/QMRITools/Resources/Demonstrations.nb b/QMRITools/Resources/Demonstrations.nb