From d42fea26580b7ee9348f723daef442bf74b8c539 Mon Sep 17 00:00:00 2001 From: edwinofsakh Date: Tue, 26 May 2015 22:55:58 +0300 Subject: [PATCH] Big cleanup Delete some old files. Move function and script from root. Update .gitignore file. --- .gitignore | 1 + P0i_analyzeData.m | 65 ------------ README.md | 2 +- af03_smallarea.m | 102 ------------------- af06_smallarea.m | 86 ---------------- defFunc.m => func/FuncTemplate.m | 0 check_ebsdam.m => func/dev/check_ebsdam.m | 0 htmlreport.m => func/dev/htmlreport.m | 0 myerror.m => func/dev/myerror.m | 0 gstat.m => func/gstat.m | 0 removeBoxGrain.m => func/removeBoxGrain.m | 0 Example_cutEBSD.m => tcode/Example_cutEBSD.m | 0 FromPaper.m => tcode/FromPaper.m | 0 UnitTest.m => tcode/UnitTest.m | 0 s0001.m => tcode/s0001.m | 0 test_OR_dev.m => tcode/test_OR_dev.m | 0 todo.txt | 8 -- gui.m => ui/gui.m | 0 18 files changed, 2 insertions(+), 262 deletions(-) delete mode 100644 P0i_analyzeData.m delete mode 100644 af03_smallarea.m delete mode 100644 af06_smallarea.m rename defFunc.m => func/FuncTemplate.m (100%) rename check_ebsdam.m => func/dev/check_ebsdam.m (100%) rename htmlreport.m => func/dev/htmlreport.m (100%) rename myerror.m => func/dev/myerror.m (100%) rename gstat.m => func/gstat.m (100%) rename removeBoxGrain.m => func/removeBoxGrain.m (100%) rename Example_cutEBSD.m => tcode/Example_cutEBSD.m (100%) rename FromPaper.m => tcode/FromPaper.m (100%) rename UnitTest.m => tcode/UnitTest.m (100%) rename s0001.m => tcode/s0001.m (100%) rename test_OR_dev.m => tcode/test_OR_dev.m (100%) delete mode 100644 todo.txt rename gui.m => ui/gui.m (100%) diff --git a/.gitignore b/.gitignore index 9dc9dfe..018e040 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *~ EBSDAM_settings.m Taylor/ +load/*load.m diff --git a/P0i_analyzeData.m b/P0i_analyzeData.m deleted file mode 100644 index ed38622..0000000 --- a/P0i_analyzeData.m +++ /dev/null @@ -1,65 +0,0 @@ -function P0i_analyzeData(thr, mgsum, epsilon) -% thr - grain detection threshold in degree -% mgsum - grain detection minimal grain size in um2 -% epsilon - angular tolerance for KOG finding - -%% Options -% Save results on disk -saveres = 1; - -% Samples' id -samples = {'p01','p02', 'p03', 'p04','p06','p08','p08','p08'}; - -% Number of parts in sample (to prevent out of memory) -parts = [1,1,1,1,1,1,1,1]; - -% Skip samples (set 1 to skip sample) -skip = [1,1,1,1,1,0,1,1]; - -% Crop rectangle from EBSD data (set '0' to disable croppping) -nsize = {... - % x y dx dy - [0, 0, 216, 108],... % - [0, 108, 216, 108],... % - [150, 150, 100, 100],... % - [100, 100, 150, 180],... % p04 - [0, 150, 127, 80],... % p06 - [0, 0, 95, 62],... % p08 - [0, 62, 95, 62],... % p08 - [0, 124, 95, 62],... % p08 - }; - nsize = 0; - -% Main tasks list -tasklist = {... - 'doMaps', 0,... % Plot orientation map - 'doPhases', 0,... % Analyze phases - 'doProps', 0,... % Analyze properties like BC, MAD - 'doGrains', 1,... % Analyze grains and misorientation between them - 'doSizes', 1,... % Analyze grains size -}; - -% Detail grain task list -gtasklist = {... - 'doGrainsMap', 1,... % grains map (removing small grains) - 'doGrainsMapAll', 1,... % all grains map (small and large) - 'doGrainsMapLrg', 1,... % large grains map - 'doBndHighAngle', 1,... % high angle boundary on BC map - 'doBndKOG', 1,... % non KOG boundary - 'doBndKOGPkg', 1,... % package boundary - 'doBndKOGBain', 1,... % bain group bondary - 'doBndIntFull', 1,... % internal boundary for all grains - 'doBndInt', 1,... % internal boundary for grains - 'doBndExtRange', 1,... % range map for ext boundary - 'doBndAllRange', 1,... % range map for all boundary - 'doBndAngle', 1,... % misorientation angle map - 'doHistMis2Mean', 0,... % in grain misorientation histogram - 'doHistAllBndMis', 1,... % misorientation on boundary - 'doHistAllBndMisSmall', 1,... % misorientation on boundary low angles - 'doHistMeanMis', 0,... % misorientation between grains - 'doHistMeanMisSmall', 0,... % misorientation between grains low angles - 'doHistNearKOG', 1,... % variant selection spectrum -}; - -%% Processing -viewSamples( samples, parts, skip, thr, mgsum, epsilon, saveres, tasklist, gtasklist, nsize); diff --git a/README.md b/README.md index 7cae5e0..0546771 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -edsdam +EBSDAM ====== EBSD Analyzing Module diff --git a/af03_smallarea.m b/af03_smallarea.m deleted file mode 100644 index 49b0e0b..0000000 --- a/af03_smallarea.m +++ /dev/null @@ -1,102 +0,0 @@ -A=[ 7.5346 6.0598; - 44.7654 60.8905; - 23.7808 60.8905; - 98.2423 62.2444; - 31.2269 75.7828; - 28.5192 6.0598; - 66.4269 81.1982; - 71.8423 6.7367; - 3.4731 50.7367; - 136.1500 4.0290]; -B=[ 143.5962 48.0290; - 184.8885 41.2598; - 145.6269 26.3674; - 206.5500 21.6290; - 151.0423 4.0290; - 216.7038 3.3521; - 141.5654 52.0905; - 159.8423 3.3521; - 159.8423 48.0290; - 202.4885 4.7059]; -C=[ 2.7962 176.6444; - 37.9962 175.2905; - 4.1500 154.3059; - 69.1346 150.9213; - 9.5654 130.6136; - 102.9808 125.1982; - 6.1808 171.9059; - 58.3038 101.5059; - 40.7038 173.2598; - 88.0885 86.6136]; -D=[ 181.5038 141.4444; - 215.3500 138.7367; - 177.4423 127.2290; - 215.3500 120.4598; - 195.0423 110.9828; - 216.7038 110.9828; - 184.2115 146.1828; - 197.7500 108.2751; - 211.9654 146.8598; - 213.9962 96.7674]; -E=[ 161.1962 226.0598; - 192.3346 191.5367; - 172.0269 227.4136; - 205.1962 198.3059; - 187.5962 227.4136; - 215.3500 201.0136; - 167.2885 215.2290; - 213.3192 201.0136; - 193.6885 184.0905; - 215.3500 184.0905]; - -ebsd = af03s_load(); - -plot(ebsd, 'antipodal'); - -gset = {A, B, C, D, E}; - -cmap = colormap(lines(5)); - -m = []; -% mf = []; -for i = 1:length(gset) - G = gset{i}; - for j = 1:size(G,1)/2 - - L = G([2*j-1,2*j],:); - hold on; line(L(:,1),L(:,2),'LineWidth', 1.5, 'Color',cmap(i,:)); - - [p,dist] = spatialProfile(ebsd, L); - [a,d] = spatialProfileDiff(ebsd, L,5); - - a0 = angle(p,p(1))/degree; - d0 = dist; - a1 = angle(p(2:end),p(1:end-1))/degree; - d1 = dist(2:end); - -% windowSize = 3; -% a1f = filter(ones(1,windowSize)/windowSize,1,a1); -% -% mf = vertcat(m, a1f); - m = vertcat(m, a1); - end -end - -hold off; - - - - - - - - - - - - - - - - - diff --git a/af06_smallarea.m b/af06_smallarea.m deleted file mode 100644 index 698d3d8..0000000 --- a/af06_smallarea.m +++ /dev/null @@ -1,86 +0,0 @@ -A=[ 4.8563 310.4962; - 17.8871 290.9500; - 17.8871 257.0699; - 16.5840 257.0699; - 3.5532 202.3404; - 23.0995 233.6144; - 4.8563 212.7651; - 6.1594 319.6177; - 17.8871 231.0082; - 19.1902 318.3147]; -B=[ 241.0198 83.4286; - 225.0681 83.4286; - 221.0802 84.7579; - 222.4095 83.4286; - 256.9716 11.6458; - 225.0681 38.2320; - 248.9957 19.6217; - 226.3974 38.2320]; -C=[ 104.7411 226.0983; - 74.4526 204.3527; - 113.4060 209.7130; - 74.8560 189.7734; - 80.1733 168.5044; - 78.8440 168.5044; - 101.4422 183.1268; - 82.8319 223.0061; - 117.3940 192.4320; - 102.7716 229.6527]; -D=[ 239.6905 306.7527; - 218.4216 286.8130; - 247.6664 289.4717; - 225.0681 273.5199; - 222.4095 296.1182; - 239.6905 278.8372; - 245.0078 286.8130; - 227.7267 293.4596]; -E=[ 364.6457 433.0372; - 381.9267 425.0613; - 361.9871 417.0854; - 377.9388 407.7803; - 381.9267 369.2303; - 371.2922 386.5113; - 383.2560 367.9010; - 377.9388 429.0492]; - - - - -ebsd = af06s_load(); - -plot(ebsd, 'antipodal'); - -gset = {A, B, C, D, E}; - -cmap = colormap(lines(5)); - -for i = 1:length(gset) - G = gset{i}; - for j = 1:size(G,1)/2 - - L = G([2*j-1,2*j],:); - hold on; line(L(:,1),L(:,2),'LineWidth', 1.5, 'Color',cmap(i,:)); - - [a,d] = spatialProfileDiff(ebsd, L,5); - end -end - -hold off; - - - - - - - - - - - - - - - - - - diff --git a/defFunc.m b/func/FuncTemplate.m similarity index 100% rename from defFunc.m rename to func/FuncTemplate.m diff --git a/check_ebsdam.m b/func/dev/check_ebsdam.m similarity index 100% rename from check_ebsdam.m rename to func/dev/check_ebsdam.m diff --git a/htmlreport.m b/func/dev/htmlreport.m similarity index 100% rename from htmlreport.m rename to func/dev/htmlreport.m diff --git a/myerror.m b/func/dev/myerror.m similarity index 100% rename from myerror.m rename to func/dev/myerror.m diff --git a/gstat.m b/func/gstat.m similarity index 100% rename from gstat.m rename to func/gstat.m diff --git a/removeBoxGrain.m b/func/removeBoxGrain.m similarity index 100% rename from removeBoxGrain.m rename to func/removeBoxGrain.m diff --git a/Example_cutEBSD.m b/tcode/Example_cutEBSD.m similarity index 100% rename from Example_cutEBSD.m rename to tcode/Example_cutEBSD.m diff --git a/FromPaper.m b/tcode/FromPaper.m similarity index 100% rename from FromPaper.m rename to tcode/FromPaper.m diff --git a/UnitTest.m b/tcode/UnitTest.m similarity index 100% rename from UnitTest.m rename to tcode/UnitTest.m diff --git a/s0001.m b/tcode/s0001.m similarity index 100% rename from s0001.m rename to tcode/s0001.m diff --git a/test_OR_dev.m b/tcode/test_OR_dev.m similarity index 100% rename from test_OR_dev.m rename to tcode/test_OR_dev.m diff --git a/todo.txt b/todo.txt deleted file mode 100644 index 64f99e0..0000000 --- a/todo.txt +++ /dev/null @@ -1,8 +0,0 @@ -1. Выводить количество зерен -2. Один общий текстовый файл на анализ зерен -3. Проверить пунктирную границу -4. Шаг на спектрах -5. Метод секущих -6. Как у японцев - -7. ++ В связи с обилием данных нужно изменить систему загрузки. Сделать общие шаблоны для групп. \ No newline at end of file diff --git a/gui.m b/ui/gui.m similarity index 100% rename from gui.m rename to ui/gui.m