Boundaries and twins : saved output from gt_find_grain_boundaries, saved...

Boundaries and twins : saved output from gt_find_grain_boundaries, saved mis_axis_hex in gtReadBoundaryProperties, changed table in gtTwinTest

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@851 4c865b51-4357-4376-afb4-474e03ccb993

zUtil_Boundaries/gtReadBoundaryProperties.m

@@ -214,20 +214,20 @@ end
             else
                 boundaries_structure(i).gb_norm_hex_grain2=[];
             end
-% 
-%             if ~isempty(boundaries_structure(i).misorientation_axis)
-%                 hkl=misorientation_axis';
-% 
-%                 hkil=[];
-%                 hkil(1) = hkl(1) - (1/sqrt(3))*hkl(2);
-%                 hkil(2) = (2/sqrt(3))*hkl(2);
-%                 hkil(3) = -(hkil(1) + hkil(2));
-%                 hkil(4) = hkl(3);
-%                 % account for lattice vector lengths
-%                 hkil(1:3) = hkil(1:3) / (2/(sqrt(3)*parameters.cryst.latticepar(1)));
-%                 hkil(4)   = hkil(4) / (1/parameters.cryst.latticepar(3));
-%                 boundaries_structure(i).misorientation_axis_hex=hkil;
-%             end
+
+            if ~isempty(boundaries_structure(i).misorientation_axis)
+                hkl=misorientation_axis';
+
+                hkil=[];
+                hkil(1) = hkl(1) - (1/sqrt(3))*hkl(2);
+                hkil(2) = (2/sqrt(3))*hkl(2);
+                hkil(3) = -(hkil(1) + hkil(2));
+                hkil(4) = hkl(3);
+                % account for lattice vector lengths
+                hkil(1:3) = hkil(1:3) / (2/(sqrt(3)*parameters.cryst.latticepar(1)));
+                hkil(4)   = hkil(4) / (1/parameters.cryst.latticepar(3));
+                boundaries_structure(i).misorientation_axis_hex=hkil;
+            end
 
         else
             disp('crystallography not supported!')
@@ -239,4 +239,4 @@ end
 
 save('boundaries_structure.mat', 'boundaries_structure')
 
-
+end

zUtil_Boundaries/gt_find_grain_boundaries.m

@@ -107,22 +107,7 @@ for i=1:length(todo_voxels)
 
 end % loop over todo voxels
 
+save('vol_out.mat','vol_out');
 save('tmp.mat','boundaries_structure');
 
 end % end of function
-
-% try
-%     if max(vol_out(:))<2^16
-% edf_write(vol_out, '5_reconstruction/boundaries_volume.edf', 'uint16')
-%     else
-% edf_write(vol_out, '5_reconstruction/boundaries_volume.edf')
-%     end
-% %edf_write(vol_out, 'boundaries_volume.edf')
-% catch
-%   disp('Had trouble writing, so putting in current directory')
-%       if max(vol_out(:))<2^16
-%   edf_write(vol_out,'boundaries_volume.edf', 'uint16');
-%       else
-%   edf_write(vol_out,'boundaries_volume.edf');
-%       end
-% end

zUtil_Twins/gtTwinTest.m

@@ -151,8 +151,8 @@ out.avgint2 = mean(int);
 out.ratio1 = out.dist_centers/(out.radius1*out.distf);
 out.ratio2 = out.dist_centers/(out.radius2*out.distf);
 
-out.table = [out.mis_angle out.dist_centers out.distf out.distf*out.radius1 out.distf*out.radius2];
-out.table_header = 'mis_angle  dist_centers  distf  distf*radius1  distf*radius2';
+out.table = [out.mis_angle out.angle out.mis_axis_hex out.grain1 out.grain2];
+out.table_header = 'mis_angle  angle  mis_axis_hex grain1 grain2';
 %
 %         %even if we have only one grain, can deal with the boundary plane
 %         test = vol_out==i;