Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
Takin
mag-core
Commits
f18a8bed
Verified
Commit
f18a8bed
authored
Feb 26, 2021
by
Tobias WEBER
Browse files
adapted to tlibs changes
parent
6fa2e8b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
tools/magstructfact/magstructfact.cpp
View file @
f18a8bed
...
...
@@ -810,7 +810,7 @@ void MagStructFactDlg::Sync3DItem(int row)
auto
normReM
=
tl2
::
norm
<
t_vec_gl
>
(
vecReM
);
auto
normImM
=
tl2
::
norm
<
t_vec_gl
>
(
vecImM
);
t_mat_gl
matArrowRe
=
GlPlotRenderer
::
G
et
A
rrow
M
atrix
(
t_mat_gl
matArrowRe
=
tl2
::
g
et
_a
rrow
_m
atrix
<
t_vec_gl
,
t_mat_gl
,
t_real_gl
>
(
vecReM
,
// to
1
,
// post-scale
tl2
::
create
<
t_vec_gl
>
({
0
,
0
,
0
}),
// post-translate
...
...
@@ -819,7 +819,7 @@ void MagStructFactDlg::Sync3DItem(int row)
tl2
::
create
<
t_vec_gl
>
({
posx
,
posy
,
posz
})
// pre-translate
);
t_mat_gl
matArrowIm
=
GlPlotRenderer
::
G
et
A
rrow
M
atrix
(
t_mat_gl
matArrowIm
=
tl2
::
g
et
_a
rrow
_m
atrix
<
t_vec_gl
,
t_mat_gl
,
t_real_gl
>
(
vecImM
,
// to
1
,
// post-scale
tl2
::
create
<
t_vec_gl
>
({
0
,
0
,
0
}),
// post-translate
...
...
@@ -1930,7 +1930,7 @@ void MagStructFactDlg::Calc()
auto
normReM
=
tl2
::
norm
<
t_vec_gl
>
(
vecReM
);
auto
normImM
=
tl2
::
norm
<
t_vec_gl
>
(
vecImM
);
t_mat_gl
matArrowRe
=
GlPlotRenderer
::
G
et
A
rrow
M
atrix
(
t_mat_gl
matArrowRe
=
tl2
::
g
et
_a
rrow
_m
atrix
<
t_vec_gl
,
t_mat_gl
,
t_real_gl
>
(
vecReM
,
// to
1
,
// post-scale
tl2
::
create
<
t_vec_gl
>
({
0
,
0
,
0
}),
// post-translate
...
...
@@ -1939,7 +1939,7 @@ void MagStructFactDlg::Calc()
posGL
// pre-translate
);
t_mat_gl
matArrowIm
=
GlPlotRenderer
::
G
et
A
rrow
M
atrix
(
t_mat_gl
matArrowIm
=
tl2
::
g
et
_a
rrow
_m
atrix
<
t_vec_gl
,
t_mat_gl
,
t_real_gl
>
(
vecImM
,
// to
1
,
// post-scale
tl2
::
create
<
t_vec_gl
>
({
0
,
0
,
0
}),
// post-translate
...
...
tools/scanbrowser/CMakeLists.txt
View file @
f18a8bed
...
...
@@ -76,6 +76,7 @@ include_directories(
"
${
PROJECT_SOURCE_DIR
}
/cli"
"
${
Boost_INCLUDE_DIRS
}
"
"
${
Boost_INCLUDE_DIRS
}
/.."
"
${
FLEX_INCLUDE_DIRS
}
"
"
${
PROJECT_BINARY_DIR
}
/parser"
"
${
Minuit2_INCLUDE_DIRS
}
"
"
${
QCP_INCLUDE_DIRS
}
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment