Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DCT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
graintracking
DCT
Commits
4bec7dbf
Commit
4bec7dbf
authored
11 years ago
by
Laura Nervo
Browse files
Options
Downloads
Patches
Plain Diff
Bug fixed with gtCrystSignedHKLs arguments : spacegroup -> symm
Signed-off-by:
Laura Nervo
<
laura.nervo@esrf.fr
>
parent
7550c42e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
7_fed/gtFedTestGenerateRandomGrain.m
+3
-1
3 additions, 1 deletion
7_fed/gtFedTestGenerateRandomGrain.m
zUtil_Cryst/gtCrystRodriguesTest.m
+2
-1
2 additions, 1 deletion
zUtil_Cryst/gtCrystRodriguesTest.m
zUtil_Indexter/gtINDEXMatchGrains.m
+4
-4
4 additions, 4 deletions
zUtil_Indexter/gtINDEXMatchGrains.m
with
9 additions
and
6 deletions
7_fed/gtFedTestGenerateRandomGrain.m
+
3
−
1
View file @
4bec7dbf
...
@@ -110,8 +110,10 @@ d0 = parameters.cryst.dsp;
...
@@ -110,8 +110,10 @@ d0 = parameters.cryst.dsp;
% hkl = [];
% hkl = [];
% thtype = [];
% thtype = [];
%
%
% symm = gtCrystGetSymmetryOperators([], spacegroup);
%
% for i = 1:length(hkltypes_used)
% for i = 1:length(hkltypes_used)
% allhkls_i = gtCrystSignedHKLs(hkltypes_used(i,:),s
pacegroup
);
% allhkls_i = gtCrystSignedHKLs(hkltypes_used(i,:),s
ymm
);
% nhkls = length(allhkls_i)/2;
% nhkls = length(allhkls_i)/2;
% hklsp = [hklsp; allhkls_i(nhkls+1:end,:)];
% hklsp = [hklsp; allhkls_i(nhkls+1:end,:)];
% hkl = [hkl; repmat(hkltypes_used(i,:),nhkls,1)];
% hkl = [hkl; repmat(hkltypes_used(i,:),nhkls,1)];
...
...
This diff is collapsed.
Click to expand it.
zUtil_Cryst/gtCrystRodriguesTest.m
+
2
−
1
View file @
4bec7dbf
...
@@ -65,6 +65,7 @@ intsc.Rvec = [];
...
@@ -65,6 +65,7 @@ intsc.Rvec = [];
fzone_ext
=
gtCrystRodriguesFundZone
(
spacegroup
,
tol
.
sm
);
% fund. zone with safety margin
fzone_ext
=
gtCrystRodriguesFundZone
(
spacegroup
,
tol
.
sm
);
% fund. zone with safety margin
fzone_acc
=
gtCrystRodriguesFundZone
(
spacegroup
,
0
);
% exact fund. zone
fzone_acc
=
gtCrystRodriguesFundZone
(
spacegroup
,
0
);
% exact fund. zone
symm
=
gtCrystGetSymmetryOperators
([],
spacegroup
);
%% Determine line coordinates in Rodrigues space
%% Determine line coordinates in Rodrigues space
...
@@ -91,7 +92,7 @@ else
...
@@ -91,7 +92,7 @@ else
%[Rvec,isec1,isec2] = gtRodriguesVectors2(plnorm(i,:),hkl(i,:),spacegroup,latticepar,tol.sm);
%[Rvec,isec1,isec2] = gtRodriguesVectors2(plnorm(i,:),hkl(i,:),spacegroup,latticepar,tol.sm);
% All signed hkl-s for given hkl family
% All signed hkl-s for given hkl family
shkls
=
gtCrystSignedHKLs
(
hkl
(
i
,:),
spacegroup
);
shkls
=
gtCrystSignedHKLs
(
hkl
(
i
,:),
symm
);
[
Rvec
,
isec1
,
isec2
]
=
gtCrystRodriguesVector
(
plnorm
(
i
,:),
shkls
,
Bmat
,
fzone_ext
);
[
Rvec
,
isec1
,
isec2
]
=
gtCrystRodriguesVector
(
plnorm
(
i
,:),
shkls
,
Bmat
,
fzone_ext
);
...
...
This diff is collapsed.
Click to expand it.
zUtil_Indexter/gtINDEXMatchGrains.m
+
4
−
4
View file @
4bec7dbf
...
@@ -258,11 +258,11 @@ if (any(gtIndexAllGrainValues(grain1,'R_onedge',[],1,[])) || ~isempty(drot))
...
@@ -258,11 +258,11 @@ if (any(gtIndexAllGrainValues(grain1,'R_onedge',[],1,[])) || ~isempty(drot))
else
else
error
(
'Field parameters.cryst.hkl is not set correctly.'
)
error
(
'Field parameters.cryst.hkl is not set correctly.'
)
end
end
symm
=
gtCrystGetSymmetryOperators
([],
spacegroup
);
% All signed hkl-s for the given family (both hkl and -h-k-l)
% All signed hkl-s for the given family (both hkl and -h-k-l)
shkl1
=
gtCrystSignedHKLs
(
hklsp
(:,
1
)
',s
pacegroup
)'
;
shkl1
=
gtCrystSignedHKLs
(
hklsp
(:,
1
)
',s
ymm
)'
;
shkl2
=
gtCrystSignedHKLs
(
hklsp
(:,
2
)
',s
pacegroup
)'
;
shkl2
=
gtCrystSignedHKLs
(
hklsp
(:,
2
)
',s
ymm
)'
;
shkl3
=
gtCrystSignedHKLs
(
hklsp
(:,
3
)
',s
pacegroup
)'
;
shkl3
=
gtCrystSignedHKLs
(
hklsp
(:,
3
)
',s
ymm
)'
;
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment