Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor 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
schwede
openstructure
Commits
c27e0d43
Commit
c27e0d43
authored
4 years ago
by
Studer Gabriel
Browse files
Options
Downloads
Patches
Plain Diff
bugfix
parent
2c7c63ac
No related branches found
Branches containing commit
No related tags found
Tags containing commit
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
modules/mol/alg/src/find_membrane.cc
+8
-8
8 additions, 8 deletions
modules/mol/alg/src/find_membrane.cc
with
8 additions
and
8 deletions
modules/mol/alg/src/find_membrane.cc
+
8
−
8
View file @
c27e0d43
...
@@ -725,14 +725,8 @@ ost::mol::alg::FindMemParam GetFinalSolution(const std::list<LMInput>& top_solut
...
@@ -725,14 +725,8 @@ ost::mol::alg::FindMemParam GetFinalSolution(const std::list<LMInput>& top_solut
mem_param
.
width
=
best_lm_parameters
(
2
,
0
);
mem_param
.
width
=
best_lm_parameters
(
2
,
0
);
mem_param
.
pos
=
best_lm_parameters
(
3
,
0
);
mem_param
.
pos
=
best_lm_parameters
(
3
,
0
);
// the solution is still relative to the initial transform that has
// assign the membrane accessible surface
// been applied when calling the SampleZ funtion!
// misuses the optimizer energy function and feeds in the
geom
::
Transform
t
=
best_sol_it
->
initial_transform
;
mem_param
.
tilt_axis
=
t
.
ApplyInverse
(
mem_param
.
tilt_axis
);
mem_param
.
axis
=
t
.
ApplyInverse
(
mem_param
.
axis
);
// in a last step we assign the membrane accessible surface
// we misuse our optimizer energy function for that and feed in the
// exposed asa instead of the transfer energies
// exposed asa instead of the transfer energies
EnergyF
en_f
(
best_sol_it
->
exposed_atom_positions
,
EnergyF
en_f
(
best_sol_it
->
exposed_atom_positions
,
best_sol_it
->
exposed_asas
,
best_sol_it
->
exposed_asas
,
...
@@ -741,6 +735,12 @@ ost::mol::alg::FindMemParam GetFinalSolution(const std::list<LMInput>& top_solut
...
@@ -741,6 +735,12 @@ ost::mol::alg::FindMemParam GetFinalSolution(const std::list<LMInput>& top_solut
best_sol_it
->
mem_param
.
tilt_axis
);
best_sol_it
->
mem_param
.
tilt_axis
);
mem_param
.
membrane_asa
=
en_f
(
best_lm_parameters
)(
0
,
0
);
mem_param
.
membrane_asa
=
en_f
(
best_lm_parameters
)(
0
,
0
);
// the solution is still relative to the initial transform that has
// been applied when calling the SampleZ funtion!
geom
::
Transform
t
=
best_sol_it
->
initial_transform
;
mem_param
.
tilt_axis
=
t
.
ApplyInverse
(
mem_param
.
tilt_axis
);
mem_param
.
axis
=
t
.
ApplyInverse
(
mem_param
.
axis
);
return
mem_param
;
return
mem_param
;
}
}
...
...
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