Unite if branches with the same content

diff --git a/Bubliny.m b/Bubliny.m
index 48a5a8109aeda37859dfb93e9f33449b2ba3162e..eb8b526a5788dc3bc80a2d6ac8ad3e9b3c53bbcb 100755 (executable)
--- a/Bubliny.m
+++ b/Bubliny.m
@@ -130,13 +130,13 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
                % % plot(lk,abs(pk),'oc','linewidth',2)\r
                if D_num==1\r
                        LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image\r
-                       [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(1:(LevelPixels+30)));  %10\r
-                       [Height(1,jjj),pkH]=max(pk);\r
-                       qH=lk(pkH);\r
-                       Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
-                       plot(qH,-Height(jjj),'or','linewidth',2)\r
-                       if jjj>=startFile+step\r
-                               LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);             % x level in pixels in the original image\r
+                       if jjj<startFile+step\r
+                               [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(1:(LevelPixels+30)));  %10\r
+                               [Height(1,jjj),pkH]=max(pk);\r
+                               qH=lk(pkH);\r
+                               Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
+                               plot(qH,-Height(jjj),'or','linewidth',2)\r
+                       elseif jjj>=startFile+step\r
                                if waytrend<=0;\r
                                        [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(1:(LevelPixels+30)));  %10\r
                                else\r
@@ -151,74 +151,71 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
                        end\r
 \r
                elseif D_num==2\r
+                       LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                        if jjj<startFile+step\r
-                               LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                                [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(LevelPixels:end));  %10\r
                                [Height(1,jjj),pkH]=max(pk);\r
                                qH=LevelPixels+lk(pkH);\r
                                Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
                                plot(qH,-Height(jjj),'or','linewidth',2)\r
                        elseif jjj>=startFile+step\r
-                                       LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
                                        [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                else\r
                                        [pk,lk] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                end\r
-                                       [Height(1,jjj),pkH]=max(pk);\r
-                                       qH=LevelPixels+lk(pkH);\r
-                                       Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
-                                       if max(pk)<30;                                                 % error cleaning %30\r
-                                               qH=NaN;\r
-                                               Metr_fit_H(1,jjj)=NaN;\r
-                                       end\r
-                                       plot(qH,Height(jjj),'om','linewidth',2)\r
+                               [Height(1,jjj),pkH]=max(pk);\r
+                               qH=LevelPixels+lk(pkH);\r
+                               Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
+                               if max(pk)<30;                                                 % error cleaning %30\r
+                                       qH=NaN;\r
+                                       Metr_fit_H(1,jjj)=NaN;\r
+                               end\r
+                               plot(qH,Height(jjj),'om','linewidth',2)\r
                        end\r
                end\r
 \r
-               if D_num==1\r
-                       if jjj<startFile+step\r
-                               [pk2,lk2] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
-\r
-                               [pk3,lk3] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
-                               [one,nqq]=size(lk3);\r
-                               [one,npp]=size(lk2);\r
-\r
-                               if npp==0\r
-                                       pk2=NaN;\r
-                                       lk2=NaN;\r
-                               elseif nqq==0\r
-                                       pk3=NaN;\r
-                                       lk3=NaN;\r
-                               end\r
+               if jjj<startFile+step\r
+                       [pk2,lk2] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
+\r
+                       [pk3,lk3] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
+                       [one,nqq]=size(lk3);\r
+                       [one,npp]=size(lk2);\r
 \r
-                               for qqq=1:1:nqq\r
-                                       for ppp=1:1:npp\r
-                                               if lk3(qqq)==lk2(ppp)\r
-                                                       pk2(ppp)=NaN;\r
-                                                       lk2(ppp)=NaN;\r
-                                               end\r
+                       if npp==0\r
+                               pk2=NaN;\r
+                               lk2=NaN;\r
+                       elseif nqq==0\r
+                               pk3=NaN;\r
+                               lk3=NaN;\r
+                       end\r
+\r
+                       for qqq=1:1:nqq\r
+                               for ppp=1:1:npp\r
+                                       if lk3(qqq)==lk2(ppp)\r
+                                               pk2(ppp)=NaN;\r
+                                               lk2(ppp)=NaN;\r
                                        end\r
                                end\r
+                       end\r
 \r
-                               % % plot(lk2,abs(pk2),'om','linewidth',2)\r
-                               hold on\r
+                       % % plot(lk2,abs(pk2),'om','linewidth',2)\r
+                       hold on\r
 \r
-                               [Bottom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
-                               qB=lk2(pk2B);                             % For 1-4 files\r
+                       [Bottom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
+                       qB=lk2(pk2B);                             % For 1-4 files\r
 \r
-                               Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
-                               if Metr_fit_B(1,jjj)>=(Metr_fit_H(1,jjj)-2)                                 % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface\r
-                                       Metr_fit_B(1,jjj)=NaN;\r
-                                       qB=NaN;\r
-                               elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
-                                       Metr_fit_B(1,jjj)=NaN;                                                % For 1-4 files\r
-                                       qB=NaN;\r
-                               end\r
-                               plot(qB,Bottom(jjj),'ob','linewidth',2)\r
+                       Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
+                       if Metr_fit_B(1,jjj)>=(Metr_fit_H(1,jjj)-2)                                 % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface\r
+                               Metr_fit_B(1,jjj)=NaN;\r
+                               qB=NaN;\r
+                       elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
+                               Metr_fit_B(1,jjj)=NaN;                                                % For 1-4 files\r
+                               qB=NaN;\r
                        end\r
-\r
-                       if jjj>=startFile+step\r
+                       plot(qB,Bottom(jjj),'ob','linewidth',2)\r
+               else\r
+                       if D_num==1\r
                                LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
                                        [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
@@ -233,54 +230,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
                                        Metr_fit_B(1,jjj)=NaN;\r
                                end\r
                                plot(qB,Bottom(jjj),'oc','linewidth',2)\r
-                       end\r
-\r
-               elseif D_num==2\r
-                       if jjj<startFile+step\r
-                               [pk2,lk2] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
-\r
-                               [pk3,lk3] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
-                               [one,nqq]=size(lk3);\r
-                               [one,npp]=size(lk2);\r
-\r
-                               if npp==0\r
-                                       pk2=NaN;\r
-                                       lk2=NaN;\r
-                               elseif nqq==0\r
-                                       pk3=NaN;\r
-                                       lk3=NaN;\r
-                               end\r
-\r
-                               for qqq=1:1:nqq\r
-                                       for ppp=1:1:npp\r
-                                               if lk3(qqq)==lk2(ppp)\r
-                                                       pk2(ppp)=NaN;\r
-                                                       lk2(ppp)=NaN;\r
-                                               end\r
-                                       end\r
-                               end\r
-\r
-                               % % plot(lk2,abs(pk2),'om','linewidth',2)\r
-                               hold on\r
-\r
-                               [Bottom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
-                               qB=lk2(pk2B);                             % For 1-4 files\r
-\r
-                               % [Bottom(1,jjj),pk2B]=max(abs(pk));           % For 5. files\r
-                               % qB=lk(pk2B);                                % For 5. files\r
-\r
-                               Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
-                               if Metr_fit_B(1,jjj)>=(Metr_fit_H(1,jjj)-2)                                 % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface\r
-                                       Metr_fit_B(1,jjj)=NaN;\r
-                                       qB=NaN;\r
-                               elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
-                                       Metr_fit_B(1,jjj)=NaN;                                                % For 1-4 files\r
-                                       qB=NaN;\r
-                               end\r
-                               plot(qB,Bottom(jjj),'ob','linewidth',2)\r
-                       end\r
-\r
-                       if jjj>=startFile+step\r
+                       elseif D_num==2\r
                                LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
                                        [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r