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
278d47e9
Commit
278d47e9
authored
6 years ago
by
Nicola Vigano
Browse files
Options
Downloads
Patches
Plain Diff
Fixed variables order for allblobs
Signed-off-by:
Nicola Vigano
<
nicola.vigano@esrf.fr
>
parent
4fb431d1
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
4_grains/gtCalculateGrain_p.m
+4
-1
4 additions, 1 deletion
4_grains/gtCalculateGrain_p.m
7_fed2/gtFedPredictOmegaMultiple.m
+4
-2
4 additions, 2 deletions
7_fed2/gtFedPredictOmegaMultiple.m
with
8 additions
and
3 deletions
4_grains/gtCalculateGrain_p.m
+
4
−
1
View file @
278d47e9
...
...
@@ -553,7 +553,8 @@ for det_ind = app.det_ind
end
for
ii_gr
=
1
:
num_grains
% Initialse output variables
allblobs
=
gtGrainAllblobsDefinition
();
allblobs
.
type
=
mode
;
allblobs
.
plcry
=
plcry
(:,
:,
ii_gr
);
...
...
@@ -598,6 +599,8 @@ for det_ind = app.det_ind
grain
{
ii_gr
}
.
allblobs
(
det_ind
)
=
allblobs
;
end
else
allblobs
=
gtGrainAllblobsDefinition
();
allblobs
.
type
=
mode
;
allblobs
.
plcry
=
plcry
;
allblobs
.
plorig
=
plorig
;
...
...
This diff is collapsed.
Click to expand it.
7_fed2/gtFedPredictOmegaMultiple.m
+
4
−
2
View file @
278d47e9
...
...
@@ -48,10 +48,12 @@ function [om, plrot, plsigned, rot, omind] = gtFedPredictOmegaMultiple(...
% plrot - the plane normals rotated in the diffraction positions;
% no. 3 and 4 are inverted after rotation (pointing oppposite
% to beam) to ease calculation at a later stage;
% size (3xn or 3xnx4)
% size (3xn or 3xnx4)
(in LAB coordinates)
% plsigned - the original input plane normals with no. 3 and 4 inverted;
% in Sam coordinates
% plrot(:,i,j) = rot(:,:,i,j)*plsigned(:,i,j) the is where (3xn or 3xnx4)
% rot - rotation matrices (3x3xn or 3x3xnx4)
% Saml->Lab for column vectors, Lab->Sam for row vectors
% omind - omega indices (1xn or 4xn)
%
...
...
@@ -165,7 +167,7 @@ else
om
([
1
2
],
chom
)
=
om
([
2
1
],
chom
);
omind
([
1
2
],
chom
)
=
omind
([
2
1
],
chom
);
% ROTATION MATRICES AND PLANE NORMALS IN LAB
% ROTATION MATRICES AND PLANE NORMALS IN LAB
(plsigned still in SAM)
plsigned
=
zeros
(
3
,
nn
,
4
);
plsigned
(:,
:,
1
)
=
pl
;
...
...
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