diff --git a/Correlescence_v_0.0.5.jar b/Correlescence_v_0.0.6.jar similarity index 84% rename from Correlescence_v_0.0.5.jar rename to Correlescence_v_0.0.6.jar index 70f1640..43abef4 100644 Binary files a/Correlescence_v_0.0.5.jar and b/Correlescence_v_0.0.6.jar differ diff --git a/build.xml b/build.xml index b18bfe7..2723039 100644 --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ - + diff --git a/src/Correlescence/ConstantsCorrelescence.java b/src/Correlescence/ConstantsCorrelescence.java index 08710df..c7d390b 100644 --- a/src/Correlescence/ConstantsCorrelescence.java +++ b/src/Correlescence/ConstantsCorrelescence.java @@ -1,5 +1,5 @@ package Correlescence; public interface ConstantsCorrelescence { - public static final String sVersion="0.0.5"; + public static final String sVersion="0.0.6"; } diff --git a/src/Correlescence/Temporal_ICS.java b/src/Correlescence/Temporal_ICS.java index 4f2d04e..6682ccd 100644 --- a/src/Correlescence/Temporal_ICS.java +++ b/src/Correlescence/Temporal_ICS.java @@ -31,7 +31,7 @@ public class Temporal_ICS implements PlugIn { /** correlation normalization method * 0 = overlap area * 1 = full area **/ - int nNormMethod=0; + int nNormMethod=1; /** object calculating correlation **/ imCC1D x1D = new imCC1D(); @@ -526,7 +526,7 @@ public FloatProcessor findMax(ImageStack imp_in, double tolerance) arrlength = maxpos.length; - if(arrlength ==0) + if(arrlength == 0) { maxInd = 0; } @@ -557,6 +557,23 @@ public FloatProcessor findMax(ImageStack imp_in, double tolerance) { finVal = 1./finVal; } + + //special case + if(maxInd == 0) + { + //frequency + if(nOutput == 0) + { + finVal = 0.0; + } + //period + else + { + finVal = Double.POSITIVE_INFINITY; + } + } + + //store result ipFin.putPixelValue(k, j, finVal); diff --git a/src/plugins.config b/src/plugins.config index 1ef8a29..b5b9b1d 100644 --- a/src/plugins.config +++ b/src/plugins.config @@ -1,13 +1,13 @@ -Plugins>Correlescence v0.0.5, "2D cross-correlation", Correlescence.Correlescence2D -Plugins>Correlescence v0.0.5, "2D STICS (space, time)", Correlescence.Corr2DSTICS -Plugins>Correlescence v0.0.5, "1D STICS (space, time)", Correlescence.Corr1DSTICS -Plugins>Correlescence v0.0.5, "Temporal ICS", Correlescence.Temporal_ICS -Plugins>Correlescence v0.0.5, "FRFT", Correlescence.FRFT_test -Plugins>Correlescence v0.0.5>_FFT tools, "2D FFT basics", Correlescence.FFTtoolsUI("2DFFT") -Plugins>Correlescence v0.0.5>_FFT tools, "Periodic-plus-smooth decomposition", Correlescence.FFTtoolsUI("periodicsmooth") -Plugins>Correlescence v0.0.5>_Development, "Anglelets sector", Correlescence.AngleletsFront("sector") -Plugins>Correlescence v0.0.5>_Development, "Anglelets decompose", Correlescence.AngleletsFront("decompose") -Plugins>Correlescence v0.0.5>_Development, "Split kymograph", Correlescence.KymoSplit -Plugins>Correlescence v0.0.5>_Development, "Split movie", Correlescence.MovieSplit -Plugins>Correlescence v0.0.5>_Development, "Generate artificial kymograph", Correlescence.KymographGenerator -Plugins>Correlescence v0.0.5>_Development, "Particle number from kymograph", Correlescence.KymoPatNumberFCS \ No newline at end of file +Plugins>Correlescence v0.0.6, "2D cross-correlation", Correlescence.Correlescence2D +Plugins>Correlescence v0.0.6, "2D STICS (space, time)", Correlescence.Corr2DSTICS +Plugins>Correlescence v0.0.6, "1D STICS (space, time)", Correlescence.Corr1DSTICS +Plugins>Correlescence v0.0.6, "Temporal ICS", Correlescence.Temporal_ICS +Plugins>Correlescence v0.0.6, "FRFT", Correlescence.FRFT_test +Plugins>Correlescence v0.0.6>_FFT tools, "2D FFT basics", Correlescence.FFTtoolsUI("2DFFT") +Plugins>Correlescence v0.0.6>_FFT tools, "Periodic-plus-smooth decomposition", Correlescence.FFTtoolsUI("periodicsmooth") +Plugins>Correlescence v0.0.6>_Development, "Anglelets sector", Correlescence.AngleletsFront("sector") +Plugins>Correlescence v0.0.6>_Development, "Anglelets decompose", Correlescence.AngleletsFront("decompose") +Plugins>Correlescence v0.0.6>_Development, "Split kymograph", Correlescence.KymoSplit +Plugins>Correlescence v0.0.6>_Development, "Split movie", Correlescence.MovieSplit +Plugins>Correlescence v0.0.6>_Development, "Generate artificial kymograph", Correlescence.KymographGenerator +Plugins>Correlescence v0.0.6>_Development, "Particle number from kymograph", Correlescence.KymoPatNumberFCS \ No newline at end of file