Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ext-edelen_a
src
Commits
1c7d87ac
Commit
1c7d87ac
authored
Oct 15, 2018
by
snuverink_j
Browse files
fix logic bug in field map superpositioning
parent
65dbadd3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
src/Classic/AbsBeamline/Cyclotron.cpp
src/Classic/AbsBeamline/Cyclotron.cpp
+3
-2
No files found.
src/Classic/AbsBeamline/Cyclotron.cpp
View file @
1c7d87ac
...
...
@@ -396,6 +396,7 @@ bool Cyclotron::apply(const Vector_t &R, const Vector_t &P, const double &t, Vec
if
(
std
::
abs
(
bz
)
>
trimCoilThreshold_m
)
applyTrimCoil
(
rad
,
R
[
2
],
&
br
,
&
bz
);
else
{
// make sure to have a smooth transition
double
tmp_bz
=
0.0
;
applyTrimCoil
(
rad
,
R
[
2
],
&
br
,
&
tmp_bz
);
bz
+=
tmp_bz
*
std
::
abs
(
bz
)
/
trimCoilThreshold_m
;
...
...
@@ -435,9 +436,9 @@ bool Cyclotron::apply(const Vector_t &R, const Vector_t &P, const double &t, Vec
(
*
fi
)
->
getFieldDimensions
(
xBegin
,
xEnd
,
yBegin
,
yEnd
,
zBegin
,
zEnd
);
bool
SuperPose
=
*
superposei
;
if
(
fcount
>
0
&&
!
SuperPose
)
{
if
(
fcount
>
0
&&
SuperPose
==
false
)
{
//INFOMSG ("Field maps taken : " << fcount << "Superpose false" << endl);
break
;
continue
;
}
// Ok, this is a total patch job, but now that the internal cyclotron units are in m, we have to
...
...
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