-
Notifications
You must be signed in to change notification settings - Fork 1
Refactor RMSD analyses into MDAnalysis AnaysisBase classes
#90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 9 commits
2977c01
4a960a0
afa829a
df017da
d824ab6
71a11d3
5cabcf4
e16b2e3
616bf42
90ed39e
7d6e49f
4bf598f
80b984d
db61dc4
f22d96f
fdf4531
e9947a6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,10 +5,9 @@ | |
| import MDAnalysis as mda | ||
| import netCDF4 as nc | ||
| import numpy as np | ||
| import tqdm | ||
| from MDAnalysis.analysis import rms | ||
| from MDAnalysis.analysis import diffusionmap, rms | ||
| from MDAnalysis.analysis.base import AnalysisBase | ||
| from MDAnalysis.transformations import unwrap | ||
| from numpy import typing as npt | ||
|
|
||
| from .reader import FEReader | ||
| from .transformations import Aligner, ClosestImageShift, NoJump | ||
|
|
@@ -100,6 +99,130 @@ def make_Universe(top: pathlib.Path, trj: nc.Dataset, state: int) -> mda.Univers | |
| return u | ||
|
|
||
|
|
||
| class Protein2DRMSD(AnalysisBase): | ||
| """ | ||
| Flattened 2D RMSD matrix | ||
|
|
||
| For all unique frame pairs ``(i, j)`` with ``i < j``, this function | ||
| computes the RMSD between atomic coordinates after optimal alignment. | ||
| """ | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you explicitly define
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added this and also opened an issue. |
||
| def __init__(self, atomgroup, weights=None, **kwargs): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here and everywhere else, add typing where possible?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done! |
||
| """ | ||
| Parameters | ||
| ---------- | ||
| atomgroup: AtomGroup | ||
| Protein atoms (e.g. CA selection) | ||
| weights: np.ndarray, optional | ||
| Per-atom weights to use in the RMSD calculation. If ``None``, | ||
| all atoms are weighted equally. | ||
| """ | ||
| super(Protein2DRMSD, self).__init__(atomgroup.universe.trajectory, **kwargs) | ||
|
|
||
| self._weights = weights | ||
| self._ag = atomgroup | ||
|
|
||
| def _prepare(self): | ||
| self._coords = [] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you pre-allocate numpy arrays here instead?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done! |
||
| self.results.rmsd2d = [] | ||
|
|
||
| def _single_frame(self): | ||
| self._coords.append(self._ag.positions) | ||
|
|
||
| def _conclude(self): | ||
| positions = np.asarray(self._coords) | ||
| nframes, _, _ = positions.shape | ||
|
|
||
| output = [] | ||
| for i, j in itertools.combinations(range(nframes), 2): | ||
| posi, posj = positions[i], positions[j] | ||
| rmsd = rms.rmsd( | ||
| posi, | ||
| posj, | ||
| self._weights, | ||
| center=True, | ||
| superposition=True, | ||
| ) | ||
| output.append(rmsd) | ||
|
|
||
| self.results.rmsd2d = np.asarray(output) | ||
|
|
||
|
|
||
| class RMSDAnalysis(AnalysisBase): | ||
| """ | ||
| 1D RMSD time series for an AtomGroup. | ||
|
|
||
| Parameters | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If possible, try to make where you put
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved Parameters in the Protein2DRMSD to the class. |
||
| ---------- | ||
| atomgroup : MDAnalysis.AtomGroup | ||
| Atoms to compute RMSD for. | ||
| reference: Optional[MDAnalysis.AtomGroup] | ||
| Reference AtomGroup. If None, the first frame of the trajectory will be used. | ||
| mass_weighted : bool, optional | ||
| If True, compute mass-weighted RMSD. | ||
| """ | ||
|
|
||
| def __init__( | ||
| self, atomgroup, reference=None, mass_weighted=False, superposition=False, **kwargs | ||
| ): | ||
| super(RMSDAnalysis, self).__init__(atomgroup.universe.trajectory, **kwargs) | ||
|
|
||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remember to add.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added this! |
||
| self._ag = atomgroup | ||
| self._reference = reference if reference is not None else self._ag | ||
| self._mass_weighted = mass_weighted | ||
| self._superposition = superposition | ||
|
|
||
| def _prepare(self): | ||
| self.results.rmsd = [] | ||
|
|
||
| self._reference_pos = self._reference.positions | ||
|
|
||
| if self._mass_weighted: | ||
| self._weights = self._ag.masses / np.mean(self._ag.masses) | ||
| else: | ||
| self._weights = None | ||
|
|
||
| def _single_frame(self): | ||
| rmsd = rms.rmsd( | ||
| self._ag.positions, | ||
| self._reference_pos, | ||
| self._weights, | ||
| center=False, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you document why this is
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a good point. I had done it this way just to match previous behaviour (I just restructured the code without changing it). I think in 2D RMSD it needs to do the superposition of the different frame pairs each time, however the centering argument doesn't seem to do anything when superposition is True (https://github.com/MDAnalysis/mdanalysis/blob/13e8664f62b536f5530f8498d7878cb61b3a0d23/package/MDAnalysis/analysis/rms.py#L264)? |
||
| superposition=self._superposition, | ||
| ) | ||
| self.results.rmsd.append(rmsd) | ||
|
|
||
| def _conclude(self): | ||
| self.results.rmsd = np.asarray(self.results.rmsd) | ||
|
|
||
|
|
||
| class LigandCOMDrift(AnalysisBase): | ||
| """ | ||
| Ligand center-of-mass displacement from initial position. | ||
| """ | ||
|
|
||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As above re: parallelizable
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done! |
||
| def __init__(self, atomgroup, **kwargs): | ||
| super(LigandCOMDrift, self).__init__(atomgroup.universe.trajectory, **kwargs) | ||
|
|
||
| self._ag = atomgroup | ||
|
|
||
| def _prepare(self): | ||
| self.results.com_drift = [] | ||
| self._initial_com = self._ag.center_of_mass() | ||
|
|
||
| def _single_frame(self): | ||
| # distance between start and current ligand position | ||
| # ignores PBC, but we've already centered the traj | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why ignore PBC? Could you not just pass the Please document this in the docstring.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I added a note to the doc string, I think that if, e.g. the ligand drifted in the simulation away by more than half the box size, but stayed in the same box, applying the minimum image convention (by passing through the box) would actually make the drift look smaller than it really was. Or would it in that case still identify that the ligand stayed in the same box and not apply the minimum image convention? |
||
| drift = mda.lib.distances.calc_bonds( | ||
| self._ag.center_of_mass(), | ||
| self._initial_com, | ||
| ) | ||
| self.results.com_drift.append(drift) | ||
|
|
||
| def _conclude(self): | ||
| self.results.com_drift = np.asarray(self.results.com_drift) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: it may be more ever so slightly efficient to just pre-allocate the array ahead of time in
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done! |
||
|
|
||
|
|
||
| def gather_rms_data( | ||
| pdb_topology: pathlib.Path, dataset: pathlib.Path, skip: Optional[int] = None | ||
| ) -> dict[str, list[float]]: | ||
|
|
@@ -161,8 +284,6 @@ def gather_rms_data( | |
| # max against 1 to avoid skip=0 case | ||
| skip = max(n_frames // 500, 1) | ||
|
|
||
| pb = tqdm.tqdm(total=int(n_frames / skip) * n_lambda) | ||
|
|
||
| u_top = mda.Universe(pdb_topology) | ||
|
|
||
| for i in range(n_lambda): | ||
|
|
@@ -173,93 +294,47 @@ def gather_rms_data( | |
| prot = u.select_atoms("protein and name CA") | ||
| ligand = u.select_atoms("resname UNK") | ||
|
|
||
| # save coordinates for 2D RMSD matrix | ||
| # TODO: Some smart guard to avoid allocating a silly amount of memory? | ||
| prot2d = np.empty((len(u.trajectory[::skip]), len(prot), 3), dtype=np.float32) | ||
|
|
||
| prot_start = prot.positions | ||
| ligand_start = ligand.positions | ||
| ligand_initial_com = ligand.center_of_mass() | ||
| ligand_weights = ligand.masses / np.mean(ligand.masses) | ||
|
|
||
| this_protein_rmsd = [] | ||
| this_ligand_rmsd = [] | ||
| this_ligand_wander = [] | ||
|
|
||
| for ts_i, ts in enumerate(u.trajectory[::skip]): | ||
| pb.update() | ||
|
|
||
| if prot: | ||
| prot2d[ts_i, :, :] = prot.positions | ||
| this_protein_rmsd.append( | ||
| rms.rmsd( | ||
| prot.positions, | ||
| prot_start, | ||
| None, # prot_weights, | ||
| center=False, | ||
| superposition=False, | ||
| ) | ||
| ) | ||
| if ligand: | ||
| this_ligand_rmsd.append( | ||
| rms.rmsd( | ||
| ligand.positions, | ||
| ligand_start, | ||
| ligand_weights, | ||
| center=False, | ||
| superposition=False, | ||
| ) | ||
| ) | ||
| this_ligand_wander.append( | ||
| # distance between start and current ligand position | ||
| # ignores PBC, but we've already centered the traj | ||
| mda.lib.distances.calc_bonds(ligand.center_of_mass(), ligand_initial_com) | ||
| ) | ||
|
|
||
| if prot: | ||
| # can ignore weights here as it's all Ca | ||
| rmsd2d = twoD_RMSD(prot2d, w=None) # prot_weights) | ||
| output["protein_RMSD"].append(this_protein_rmsd) | ||
| output["protein_2D_RMSD"].append(rmsd2d) | ||
| if ligand: | ||
| output["ligand_RMSD"].append(this_ligand_rmsd) | ||
| output["ligand_wander"].append(this_ligand_wander) | ||
| prot_rmsd = RMSDAnalysis(prot).run(step=skip) | ||
| output["protein_RMSD"].append(prot_rmsd.results.rmsd) | ||
| # # Using the MDAnalysis RMSD class instead | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please remember to remove the commented out regions.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed this! |
||
| # gs = ["protein and name CA"] | ||
| # prot_rmsd = rms.RMSD( | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The two RMSD classes are approximately equal in timing (on the test data) |
||
| # u, select="protein and name CA", groupselections=gs, weights="mass") | ||
| # prot_rmsd.run(step=skip) | ||
| # # The results contain: | ||
| # # - frame number | ||
| # # - time | ||
| # # - RMSD based on select (after superimposing) | ||
| # # - RMSD based on groupselections, one array per selection | ||
| # output["protein_RMSD"].append(prot_rmsd.results.rmsd.T[3]) | ||
|
|
||
| prot_rmsd2d = Protein2DRMSD(prot).run(step=skip) | ||
| output["protein_2D_RMSD"].append(prot_rmsd2d.results.rmsd2d) | ||
| # # Using the MDAnalysis DistanceMatrix class | ||
| # prot_rmsd2d = diffusionmap.DistanceMatrix(u, select="protein and name CA") | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This MDA code is much slower, on the test data 10s vs. 0.4s. |
||
| # prot_rmsd2d.run(step=skip) | ||
| # dist_mat = prot_rmsd2d.results.dist_matrix | ||
| # i, j = np.triu_indices_from(dist_mat, k=1) | ||
| # flattened = dist_mat[i, j] | ||
| # output["protein_2D_RMSD"].append(flattened) | ||
|
|
||
| output["time(ps)"] = list(np.arange(len(u.trajectory))[::skip] * u.trajectory.dt) | ||
|
|
||
| return output | ||
|
|
||
|
|
||
| def twoD_RMSD(positions, w: Optional[npt.NDArray]) -> list[float]: | ||
| """ | ||
| Compute a flattened 2D RMSD matrix from a trajectory. | ||
|
|
||
| For all unique frame pairs ``(i, j)`` with ``i < j``, this function | ||
| computes the RMSD between atomic coordinates after optimal alignment. | ||
|
|
||
| Parameters | ||
| ---------- | ||
| positions : np.ndarray | ||
| Atomic coordinates for all frames in the trajectory. | ||
| w : np.ndarray, optional | ||
| Per-atom weights to use in the RMSD calculation. If ``None``, | ||
| all atoms are weighted equally. | ||
|
|
||
| Returns | ||
| ------- | ||
| list of float | ||
| Flattened list of RMSD values corresponding to all frame pairs | ||
| ``(i, j)`` with ``i < j``. | ||
| """ | ||
| nframes, _, _ = positions.shape | ||
|
|
||
| output = [] | ||
|
|
||
| for i, j in itertools.combinations(range(nframes), 2): | ||
| posi, posj = positions[i], positions[j] | ||
|
|
||
| rmsd = rms.rmsd(posi, posj, w, center=True, superposition=True) | ||
|
|
||
| output.append(rmsd) | ||
| if ligand: | ||
| lig_rmsd = RMSDAnalysis(ligand, mass_weighted=True).run(step=skip) | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ligand RMSD is currently calculated on the hybrid topology, which may not be what we want long term.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For a separate PR - the atom selection (or atomgroup) should really be user defined rather than defaulting to UNK. This might be a good argument for letting Protocols deal with this rather than making it uniform.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Opened an issue here: #103 |
||
| output["ligand_RMSD"].append(lig_rmsd.results.rmsd) | ||
| # # Using the MDAnalysis RMSD class instead | ||
| # groupselections = ["resname UNK"] | ||
| # lig_rmsd = rms.RMSD( | ||
| # u, | ||
| # select="protein and name CA", | ||
| # groupselections=groupselections, | ||
| # weights="mass", | ||
| # ) | ||
| # lig_rmsd.run(step=skip) | ||
| # output["ligand_RMSD"].append(lig_rmsd.results.rmsd.T[3]) | ||
| lig_com_drift = LigandCOMDrift(ligand).run(step=skip) | ||
| output["ligand_wander"].append(lig_com_drift.results.com_drift) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know this is historical, so it doesn't have to be here, but can we please renamed this to
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think I would do this in a separate PR, since it would require an update in openfe? Raised an issue here #104 |
||
|
|
||
| output["time(ps)"] = np.arange(len(u.trajectory))[::skip] * u.trajectory.dt | ||
|
|
||
| return output | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you maybe expand this to mention you're doing a center of geometry fit as well as a rotational and translational superposition usingg QCP?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added this!