Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
af332c7
DRR - Cpptraj: Use forward declares. Add routine for using dihtype.
Jun 14, 2019
4249341
DRR - Cpptraj: Use the new SearchForNewTypeArgs routine
Jun 14, 2019
66c5d98
DRR - Cpptraj: Enable command. Add reference keywords.
Jun 14, 2019
354f48f
DRR - Cpptraj: Add the Action_DihedralRMS class
Jun 14, 2019
d1f9b36
DRR - Cpptraj: First incarnation of dihedral rms test.
Jun 15, 2019
55c56c7
DRR - Cpptraj: Make use of forward delcares. Make RefModeType public
drroe Jun 15, 2019
aa4941e
DRR - Cpptraj: Add some reference setup
drroe Jun 15, 2019
2bcadf1
DRR - Cpptraj: Do not print mask expression if no mask string is set.
Jun 17, 2019
345bc87
DRR - Cpptraj: Add reference setup when no mask string set. Make -1 p…
Jun 17, 2019
cd76b8b
DRR - Cpptraj: Add rms previous test
Jun 17, 2019
6cebb1f
DRR - Cpptraj: Test rms first with changing topology
Jun 17, 2019
a5a7a6d
DRR - Cpptraj: Get rid of previous as a bool, add as a mode. Do not c…
Jun 17, 2019
4e6346d
DRR - Cpptraj: Use separate DihedralSearch for selecting reference di…
Jun 17, 2019
64054d6
DRR - Cpptraj: Add to first and to reference tests.
Jun 17, 2019
f823386
DRR - Cpptraj: Fix calc to previous ref
Jun 17, 2019
cbf99ee
DRR - Cpptraj: Add to previous test
Jun 17, 2019
ff4d0c4
DRR - Cpptraj: Only calculate reference values during setup if mode i…
Jun 17, 2019
5050ea8
DRR - Cpptraj: Add to reference traj test
Jun 17, 2019
46fc7e2
DRR - Cpptraj: Hide some debug info
Jun 17, 2019
3f28c32
DRR - Cpptraj: Remove obsolete test stuff, split into parallel/not pa…
Jun 17, 2019
ee86b58
DRR - Cpptraj: Add dihedral fluctuation (multidihedral plus avg) test
Jun 20, 2019
797fe07
DRR - Cpptraj: Revision bump for new dihrms command
Jun 20, 2019
6ec9bdb
DRR - Cpptraj: Take max of format specifier and actual data width whe…
Jun 20, 2019
be9e017
DRR - Cpptraj: Add missing test save
Jun 21, 2019
4e27f82
DRR - Cpptraj: Enabled dihedral rms test.
drroe Jun 21, 2019
6e8581b
DRR - Cpptraj: Add missing include
drroe Jun 21, 2019
978d500
DRR - Cpptraj: Fix up help.
drroe Jun 21, 2019
ca908b6
Merge branch 'master' into dihedralrms-fixhelp
drroe Jun 22, 2019
5b9c2c5
DRR - Cpptraj: Add missing keywords to online help.
drroe Jun 22, 2019
21af115
DRR - Cpptraj: Add dihedralrms command documentation. Fix up multidih…
drroe Jun 22, 2019
f64c3e3
DRR - Cpptraj: Add page number cross reference
drroe Jun 22, 2019
8284172
DRR - Cpptraj: Update manual PDF.
drroe Jun 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified doc/CpptrajManual.pdf
Binary file not shown.
184 changes: 172 additions & 12 deletions doc/cpptraj.lyx
Original file line number Diff line number Diff line change
Expand Up @@ -14570,7 +14570,7 @@ Mod
\begin_layout Standard
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="85" columns="3">
<lyxtabular version="3" rows="86" columns="3">
<features islongtable="true" longtabularalignment="center">
<column alignment="center" valignment="top" width="1.3in">
<column alignment="center" valignment="top" width="4.5in">
Expand Down Expand Up @@ -15262,6 +15262,39 @@ Calculate the dihedral angle using four points.
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
dihrms
\end_layout

\begin_layout Plain Layout
dihedralrms
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
Calculate the RMSD of dihedrals to dihedrals in a reference structure.
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout

\end_layout

\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
dipole
\end_layout
Expand Down Expand Up @@ -20017,6 +20050,130 @@ statistics
\begin_layout Standard
Calculate dihedral angle (in degrees) between the planes defined by atoms
in <mask1>, <mask2>, <mask3> and <mask2>, <mask3>, <mask4>.
To calculate multiple dihedral angles see the
\series bold
\emph on
multidihedral
\series default
\emph default
command on page
\begin_inset CommandInset ref
LatexCommand pageref
reference "subsec:cpptraj_multidihedral"
plural "false"
caps "false"
noprefix "false"

\end_inset

.
\end_layout

\begin_layout Subsection
dihedralrms | dihrms
\end_layout

\begin_layout LyX-Code
dihedralrms [<name>] <dihedral types> [out <file>]
\end_layout

\begin_layout LyX-Code
[ first | reference | ref <name> | refindex <#> | previous
|
\end_layout

\begin_layout LyX-Code
reftraj <name> [parm <name> | parmindex <#>] ]
\end_layout

\begin_layout LyX-Code
[dihtype <name>:<a0>:<a1>:<a2>:<a3>[:<offset>] ...]
\end_layout

\begin_layout LyX-Code
[tgtrange <range> [refrange <range>]]
\end_layout

\begin_deeper
\begin_layout Description
[<name>] Output data set name.
\end_layout

\begin_layout Description
<dihedral
\begin_inset space ~
\end_inset

types> Dihedral types to look for.
Note that chip is 'protein chi', chin is 'nucleic chi'.
\end_layout

\begin_layout Description
[out
\begin_inset space ~
\end_inset

<filename>] Output file name.
\end_layout

\begin_layout Description
[dihtype
\begin_inset space ~
\end_inset

<name>:<a0>:<a1>:<a2>:<a3>[:<offset>] Search for a custom dihedral type
called <name> using atom names <a0>, <a1>, <a2>, and <a3>.
\begin_inset Separator latexpar
\end_inset


\end_layout

\begin_deeper
\begin_layout Standard
Offset: -2=<a0><a1> in previous res, -1=<a0> in previous res, 0=All <aX>
in single res, 1=<a3> in next res, 2=<a2><a3> in next res.
\end_layout

\end_deeper
\begin_layout Description
[tgtrange
\begin_inset space ~
\end_inset

<range>] Residue range to look for target dihedrals in.
Default is all solute residues.
\end_layout

\begin_layout Description
[refrange
\begin_inset space ~
\end_inset

<range>] Residues range to look for reference dihedrals in.
If not specified, use target range.
\end_layout

\end_deeper
\begin_layout Standard
Calculate RMSD of selected dihedrals to dihedrals in a reference structure.
See the
\series bold
\emph on
multidihedral
\series default
\emph default
command syntax on page
\begin_inset CommandInset ref
LatexCommand pageref
reference "subsec:cpptraj_multidihedral"
plural "false"
caps "false"
noprefix "false"

\end_inset

for a list of all available dihedral types.
\end_layout

\begin_layout Subsection
Expand All @@ -20038,13 +20195,6 @@ reference "subsec:cpptraj_permutedihedrals"
\end_inset

.
To calculate multiple dihedral angles see the
\series bold
\emph on
multidihedral
\series default
\emph default
command.
\end_layout

\begin_layout Subsection
Expand Down Expand Up @@ -24538,7 +24688,6 @@ out Output file for order parameters: Sx, Sy, Sz (each succeeded by the
|SCD| = 0.5Sz and |SCD| = -(2Sx + Sy)/3.
If scd is set then the order parameter directly computed from the C-H vectors
is output.

\end_layout

\begin_layout Description
Expand Down Expand Up @@ -26403,6 +26552,13 @@ reference "subsec:cpptraj_surf"

\begin_layout Subsection
multidihedral
\begin_inset CommandInset label
LatexCommand label
name "subsec:cpptraj_multidihedral"

\end_inset


\end_layout

\begin_layout LyX-Code
Expand Down Expand Up @@ -26463,6 +26619,7 @@ types> Dihedral types to look for.
\end_inset

<range>] Residue range to look for dihedrals in.
Default is all solute residues.
\end_layout

\begin_layout Description
Expand Down Expand Up @@ -26506,8 +26663,9 @@ DataSet Aspects:
\begin_inset space ~
\end_inset

type>] Aspect corresponds to the dihedral type name (e.g.
type>]:<#> Aspect corresponds to the dihedral type name (e.g.
[phi], [psi], etc).
The index is the residue number.
\end_layout

\end_deeper
Expand All @@ -26533,11 +26691,13 @@ Calculate specified dihedral angle types for residues in given range.
\end_layout

\begin_layout LyX-Code
multidihedral phi psi resrange 6-9 out PhiPsi_6-9.dat
multidihedral MyTorsions phi psi resrange 6-9 out PhiPsi_6-9.dat
\end_layout

\begin_layout Standard
Dihedrals other than those defined in
This will generate data sets named MyTorsions[phi]:6, MyTorsions[psi]:6,
MyTorsions[phi]:7, etc.
Dihedrals other than those defined in
\series bold
<dihedral types>
\series default
Expand Down
6 changes: 5 additions & 1 deletion src/Action_DihedralRMS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Action_DihedralRMS::Action_DihedralRMS() :
void Action_DihedralRMS::Help() const {
mprintf("\t[<name>] <dihedral types> [out <file>]\n"
"%s"
"\t[%s]\n", ReferenceAction::Help(), DihedralSearch::newTypeArgsHelp_);
"\t[%s]\n"
"\t[tgtrange <range> [refrange <range>]]\n"
" Calculate RMSD of selected dihedrals to dihedrals in a\n"
" reference structure.\n",
ReferenceAction::Help(), DihedralSearch::newTypeArgsHelp_);
}

// Action_DihedralRMS::Init()
Expand Down
2 changes: 1 addition & 1 deletion src/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ void Command::Init() {
Command::AddCmd( new Action_Density(), Cmd::ACT, 1, "density" );
Command::AddCmd( new Action_Diffusion(), Cmd::ACT, 1, "diffusion" );
Command::AddCmd( new Action_Dihedral(), Cmd::ACT, 1, "dihedral" );
Command::AddCmd( new Action_DihedralRMS(), Cmd::ACT, 1, "dihrms" );
Command::AddCmd( new Action_DihedralRMS(), Cmd::ACT, 2, "dihrms", "dihedralrms" );
Command::AddCmd( new Action_Dipole(), Cmd::ACT, 1, "dipole" );
Command::AddCmd( new Action_Distance(), Cmd::ACT, 1, "distance" );
Command::AddCmd( new Action_DNAionTracker(), Cmd::ACT, 1, "dnaiontracker" ); // HIDDEN
Expand Down