Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Molstar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michal Malý
Molstar
Commits
a2da7648
Commit
a2da7648
authored
6 years ago
by
Sebastian Bittrich
Browse files
Options
Downloads
Patches
Plain Diff
omits multiple entrypoints
parent
09db0aba
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
src/mol-model/structure/model/properties/utils/secondary-structure.ts
+3
-8
3 additions, 8 deletions
...l/structure/model/properties/utils/secondary-structure.ts
src/tests/browser/render-structure.ts
+2
-2
2 additions, 2 deletions
src/tests/browser/render-structure.ts
with
5 additions
and
10 deletions
src/mol-model/structure/model/properties/utils/secondary-structure.ts
+
3
−
8
View file @
a2da7648
...
@@ -43,12 +43,6 @@ const hbondEnergyCutoff = -0.5
...
@@ -43,12 +43,6 @@ const hbondEnergyCutoff = -0.5
/** prevent extremely low hbond energies */
/** prevent extremely low hbond energies */
const
hbondEnergyMinimal
=
-
9.9
const
hbondEnergyMinimal
=
-
9.9
export
function
computeSecondaryStructure
(
hierarchy
:
AtomicHierarchy
,
conformation
:
AtomicConformation
):
SecondaryStructure
{
// TODO use Zhang-Skolnik for CA alpha only parts or for coarse parts with per-residue elements
return
computeModelDSSP
(
hierarchy
,
conformation
)
}
interface
DSSPContext
{
interface
DSSPContext
{
/** Whether to use the old DSSP convention for the annotation of turns and helices, causes them to be two residues shorter */
/** Whether to use the old DSSP convention for the annotation of turns and helices, causes them to be two residues shorter */
oldDefinition
:
boolean
,
oldDefinition
:
boolean
,
...
@@ -119,10 +113,11 @@ namespace DSSPType {
...
@@ -119,10 +113,11 @@ namespace DSSPType {
}
}
}
}
export
function
compute
ModelDSSP
(
hierarchy
:
AtomicHierarchy
,
export
function
compute
SecondaryStructure
(
hierarchy
:
AtomicHierarchy
,
conformation
:
AtomicConformation
,
conformation
:
AtomicConformation
,
oldDefinition
=
true
,
oldDefinition
=
true
,
oldOrdering
=
true
)
{
oldOrdering
=
true
):
SecondaryStructure
{
// TODO use Zhang-Skolnik for CA alpha only parts or for coarse parts with per-residue elements
// console.log(`calculating secondary structure elements using ${ oldDefinition ? 'old' : 'revised'} definition and ${ oldOrdering ? 'old' : 'revised'} ordering of secondary structure elements`)
// console.log(`calculating secondary structure elements using ${ oldDefinition ? 'old' : 'revised'} definition and ${ oldOrdering ? 'old' : 'revised'} ordering of secondary structure elements`)
const
{
lookup3d
,
proteinResidues
}
=
calcAtomicTraceLookup3D
(
hierarchy
,
conformation
)
const
{
lookup3d
,
proteinResidues
}
=
calcAtomicTraceLookup3D
(
hierarchy
,
conformation
)
const
backboneIndices
=
calcBackboneAtomIndices
(
hierarchy
,
proteinResidues
)
const
backboneIndices
=
calcBackboneAtomIndices
(
hierarchy
,
proteinResidues
)
...
...
This diff is collapsed.
Click to expand it.
src/tests/browser/render-structure.ts
+
2
−
2
View file @
a2da7648
...
@@ -12,7 +12,7 @@ import { ColorTheme } from 'mol-theme/color';
...
@@ -12,7 +12,7 @@ import { ColorTheme } from 'mol-theme/color';
import
{
SizeTheme
}
from
'
mol-theme/size
'
;
import
{
SizeTheme
}
from
'
mol-theme/size
'
;
import
{
CartoonRepresentationProvider
}
from
'
mol-repr/structure/representation/cartoon
'
;
import
{
CartoonRepresentationProvider
}
from
'
mol-repr/structure/representation/cartoon
'
;
import
{
trajectoryFromMmCIF
}
from
'
mol-model-formats/structure/mmcif
'
;
import
{
trajectoryFromMmCIF
}
from
'
mol-model-formats/structure/mmcif
'
;
import
{
compute
ModelDSSP
}
from
'
mol-model/structure/model/properties/utils/secondary-structure
'
;
import
{
compute
SecondaryStructure
}
from
'
mol-model/structure/model/properties/utils/secondary-structure
'
;
const
parent
=
document
.
getElementById
(
'
app
'
)
!
const
parent
=
document
.
getElementById
(
'
app
'
)
!
parent
.
style
.
width
=
'
100%
'
parent
.
style
.
width
=
'
100%
'
...
@@ -65,7 +65,7 @@ async function init() {
...
@@ -65,7 +65,7 @@ async function init() {
const
cif
=
await
downloadFromPdb
(
'
1acj
'
)
const
cif
=
await
downloadFromPdb
(
'
1acj
'
)
const
models
=
await
getModels
(
cif
)
const
models
=
await
getModels
(
cif
)
console
.
time
(
'
computeModelDSSP
'
)
console
.
time
(
'
computeModelDSSP
'
)
const
secondaryStructure
=
compute
ModelDSSP
(
models
[
0
].
atomicHierarchy
,
const
secondaryStructure
=
compute
SecondaryStructure
(
models
[
0
].
atomicHierarchy
,
models
[
0
].
atomicConformation
)
models
[
0
].
atomicConformation
)
console
.
timeEnd
(
'
computeModelDSSP
'
);
console
.
timeEnd
(
'
computeModelDSSP
'
);
(
models
[
0
].
properties
as
any
).
secondaryStructure
=
secondaryStructure
(
models
[
0
].
properties
as
any
).
secondaryStructure
=
secondaryStructure
...
...
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