From 6a3edbf29665b9abc3aa1be4dd6859f31bcda045 Mon Sep 17 00:00:00 2001 From: dtfullwood Date: Wed, 18 Feb 2015 10:38:10 -0700 Subject: [PATCH 1/3] New line --- Code/HREBSDMain.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Code/HREBSDMain.m b/Code/HREBSDMain.m index 6e177ca..900c294 100644 --- a/Code/HREBSDMain.m +++ b/Code/HREBSDMain.m @@ -2,6 +2,7 @@ %based on these settings ( See GetHROIMDefaultSettings). %calls output display functionns on completion %Jay Basinger 3/11/2011 +% function Settings = HREBSDMain(Settings) % tic From db9fa50730a01374f32b03948050d403d09c83a8 Mon Sep 17 00:00:00 2001 From: dtfullwood Date: Wed, 6 May 2015 16:43:53 -0600 Subject: [PATCH 2/3] updated CalcNormFMod subtract identity from strain tensor to make optimization more sensitive and reset deformation to identity after first loop to correct rotation. --- Code/CalcNormFMod.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Code/CalcNormFMod.m b/Code/CalcNormFMod.m index 203244c..c74ac04 100644 --- a/Code/CalcNormFMod.m +++ b/Code/CalcNormFMod.m @@ -19,7 +19,7 @@ [R U] = poldec(F); g=R'*g; end - + F=eye(3); % for i = 1:Settings.IterationLimit for i = 1:3 I1 = genEBSDPatternHybrid(g,params2,F,lattice,a1,b1,c1,axs); @@ -36,6 +36,7 @@ [R U] = poldec(F); +U=U-eye(3); U = triu(U); % D = F-eye(3); From b3b73c8e0dd3a9a5fe659eb05164daad6cf46f4d Mon Sep 17 00:00:00 2001 From: Brian Jackson Date: Thu, 28 May 2015 06:31:08 -0600 Subject: [PATCH 3/3] AdvancedSettings uses material selection --- Code/AdvancedSettings.m | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Code/AdvancedSettings.m b/Code/AdvancedSettings.m index 4ca8dfc..383e1cc 100644 --- a/Code/AdvancedSettings.m +++ b/Code/AdvancedSettings.m @@ -58,10 +58,15 @@ function AdvancedSettings_OpeningFcn(hObject, eventdata, handles, varargin) clear stemp %Read Grain File and get material data -GrainFileVals = ReadGrainFile(Settings.GrainFilePath); -allMaterials = unique(lower(GrainFileVals{11})); -handles.allMaterials = allMaterials; -curMaterial=allMaterials{1}; +if strcmp(Settings.Material, 'grainfile') + GrainFileVals = ReadGrainFile(Settings.GrainFilePath); + allMaterials = unique(lower(GrainFileVals{11})); + handles.allMaterials = allMaterials; + curMaterial=allMaterials{1}; +else + handles.allMaterials = {Settings.Material}; + curMaterial = Settings.Material; +end guidata(hObject,handles); %Initialize NumROIs popup