Skip to content

Commit

Permalink
applied black
Browse files Browse the repository at this point in the history
  • Loading branch information
ChiCheng45 committed Mar 8, 2024
1 parent b00d55d commit f178a90
Show file tree
Hide file tree
Showing 12 changed files with 81 additions and 28 deletions.
10 changes: 8 additions & 2 deletions MDANSE/Src/MDANSE/Chemistry/ChemicalEntity.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,10 @@ def center_of_mass(self, configuration: _Configuration) -> NDArray[np.float64]:
:rtype: numpy.ndarray
"""
coords = configuration["coordinates"]
masses = [ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in self.atom_list]
masses = [
ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight")
for at in self.atom_list
]

return center_of_mass(coords, masses)

Expand All @@ -198,7 +201,10 @@ def mass(self) -> float:
@property
def masses(self) -> list[float]:
"""A list of masses of all non-ghost atoms within this chemical entity."""
return [ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in self.atom_list]
return [
ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight")
for at in self.atom_list
]

def find_transformation_as_quaternion(
self, conf1: _Configuration, conf2: Union[_Configuration, None] = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ def configure(self, value):
self["elements"] = [[at.symbol] for at in selectedAtoms]
self["names"] = [at.symbol for at in selectedAtoms]
self["unique_names"] = sorted(set(self["names"]))
self["masses"] = [[ATOMS_DATABASE.get_atom_property(n, "atomic_weight")] for n in self["names"]]
self["masses"] = [
[ATOMS_DATABASE.get_atom_property(n, "atomic_weight")]
for n in self["names"]
]
self.error_status = "OK"

def get_natoms(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ def transmutate(self, selection, element):

atomSelConfigurator["unique_names"] = sorted(set(atomSelConfigurator["names"]))
atomSelConfigurator["masses"] = [
[ATOMS_DATABASE.get_atom_property(n, "atomic_weight")] for n in atomSelConfigurator["names"]
[ATOMS_DATABASE.get_atom_property(n, "atomic_weight")]
for n in atomSelConfigurator["names"]
]
self.error_status = "OK"

Expand Down
7 changes: 6 additions & 1 deletion MDANSE/Src/MDANSE/Framework/Jobs/Density.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ def run_step(self, index):
atomic_density = self._n_atoms / cell_volume

mass_density = (
sum([ATOMS_DATABASE.get_atom_property(s, "atomic_weight") for s in self._symbols])
sum(
[
ATOMS_DATABASE.get_atom_property(s, "atomic_weight")
for s in self._symbols
]
)
/ NAVOGADRO
/ cell_volume
)
Expand Down
4 changes: 3 additions & 1 deletion MDANSE/Src/MDANSE/Framework/Jobs/Eccentricity.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ def run_step(self, index):
atomsCoordinates = series[idxs, :]
difference = atomsCoordinates - com

w = ATOMS_DATABASE.get_atom_property(name, self.configuration["weights"]["property"])
w = ATOMS_DATABASE.get_atom_property(
name, self.configuration["weights"]["property"]
)

xx += np.add.reduce(
w
Expand Down
5 changes: 4 additions & 1 deletion MDANSE/Src/MDANSE/Framework/Jobs/SolventAccessibleSurface.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ def initialize(self):
# A mapping between the atom indexes and covalent_radius radius for the whole universe.
self.vdwRadii = dict(
[
(at.index, ATOMS_DATABASE.get_atom_property(at.symbol, "covalent_radius"))
(
at.index,
ATOMS_DATABASE.get_atom_property(at.symbol, "covalent_radius"),
)
for at in self.configuration["trajectory"][
"instance"
].chemical_system.atom_list
Expand Down
14 changes: 7 additions & 7 deletions MDANSE/Src/MDANSE/Framework/Jobs/XRayStaticStructureFactor.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
def atomic_scattering_factor(element, qvalues):
a = np.empty((4,), dtype=np.float64)
a[0] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_a1")
a[1] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_a2")
a[2] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_a3")
a[3] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_a4")
a[1] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_a2")
a[2] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_a3")
a[3] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_a4")

b = np.empty((4,), dtype=np.float64)
b[0] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_b1")
b[1] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_b2")
b[2] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_b3")
b[3] = ATOMS_DATABASE.get_atom_property(element ,"xray_asf_b4")
b[0] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_b1")
b[1] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_b2")
b[2] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_b3")
b[3] = ATOMS_DATABASE.get_atom_property(element, "xray_asf_b4")

c = ATOMS_DATABASE.get_atom_property(element, "xray_asf_c")

Expand Down
7 changes: 6 additions & 1 deletion MDANSE/Src/MDANSE/MolecularDynamics/MockTrajectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,12 @@ def read_com_trajectory(
last = len(self)

indexes = [at.index for at in atoms]
masses = np.array([ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in atoms])
masses = np.array(
[
ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight")
for at in atoms
]
)

frames = np.array([self.coordinates(fnum) for fnum in range(first, last, step)])
coords = frames[:, indexes, :].astype(np.float64)
Expand Down
11 changes: 9 additions & 2 deletions MDANSE/Src/MDANSE/MolecularDynamics/Trajectory.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,12 @@ def read_com_trajectory(
last = len(self)

indexes = [at.index for at in atoms]
masses = np.array([ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in atoms])
masses = np.array(
[
ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight")
for at in atoms
]
)
grp = self._h5_file["/configuration"]

coords = grp["coordinates"][first:last:step, :, :].astype(np.float64)
Expand Down Expand Up @@ -613,7 +618,9 @@ def __init__(

atoms = chemical_entity.atom_list

masses = [ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in atoms]
masses = [
ATOMS_DATABASE.get_atom_property(at.symbol, "atomic_weight") for at in atoms
]

mass = sum(masses)

Expand Down
4 changes: 3 additions & 1 deletion MDANSE/Src/MDANSE/MolecularDynamics/TrajectoryUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@ def build_connectivity(
coords = conf.to_real_coordinates()[indexes, :]
cov_radii = np.zeros((n_atoms,), dtype=np.float64)
for i, at in enumerate(atoms):
cov_radii[i] = ATOMS_DATABASE.get_atom_property(at.symbol.capitalize(), "covalent_radius")
cov_radii[i] = ATOMS_DATABASE.get_atom_property(
at.symbol.capitalize(), "covalent_radius"
)

bonds = fast_calculation.cpt_cluster_connectivity_nopbc(
coords, cov_radii, tolerance
Expand Down
35 changes: 26 additions & 9 deletions MDANSE_GUI/Src/MDANSE_GUI/MolecularViewer/MolecularViewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ def setDataModel(self, datamodel: TrajectoryAtomData):
self._datamodel = datamodel

def _new_trajectory_object(self, fname: str, data: HDFTrajectoryInputData):
reader = hdf5wrapper.HDF5Wrapper(
fname, data.trajectory, data.chemical_system
)
reader = hdf5wrapper.HDF5Wrapper(fname, data.trajectory, data.chemical_system)
self.set_reader(reader)

@Slot(str)
Expand Down Expand Up @@ -577,9 +575,12 @@ def set_coordinates(self, frame: int, tolerance=0.04):

# update the atoms
coords = self._reader.read_frame(self._current_frame)
cov_radii = np.array([
CHEMICAL_ELEMENTS.get_atom_property(at, "covalent_radius") for at in self._reader.atom_types
])
cov_radii = np.array(
[
CHEMICAL_ELEMENTS.get_atom_property(at, "covalent_radius")
for at in self._reader.atom_types
]
)

atoms = vtk.vtkPoints()
atoms.SetNumberOfPoints(self._n_atoms)
Expand All @@ -598,7 +599,7 @@ def set_coordinates(self, frame: int, tolerance=0.04):
continue
diff = coords[i] - coords[idxs]
dist = np.sum(diff * diff, axis=1)
sum_radii = (cov_radii[i] + cov_radii[idxs] + tolerance)**2
sum_radii = (cov_radii[i] + cov_radii[idxs] + tolerance) ** 2
js = np.array(idxs)[(0 < dist) & (dist < sum_radii)]
for j in js[i < js]:
line = vtk.vtkLine()
Expand All @@ -621,7 +622,20 @@ def set_coordinates(self, frame: int, tolerance=0.04):
self._uc_polydata.SetPoints(uc_points)

uc_lines = vtk.vtkCellArray()
for i, j in [(0, 1), (0, 2), (0, 3), (1, 4), (1, 5), (4, 7), (2, 4), (2, 6), (5, 7), (3, 5), (3, 6), (6, 7)]:
for i, j in [
(0, 1),
(0, 2),
(0, 3),
(1, 4),
(1, 5),
(4, 7),
(2, 4),
(2, 6),
(5, 7),
(3, 5),
(3, 6),
(6, 7),
]:
line = vtk.vtkLine()
line.GetPointIds().SetId(0, i)
line.GetPointIds().SetId(1, j)
Expand Down Expand Up @@ -664,7 +678,10 @@ def set_reader(self, reader, frame=0):
# this returs a list of indices, mapping colours to atoms

self._atom_scales = np.array(
[CHEMICAL_ELEMENTS.get_atom_property(at, "vdw_radius") for at in self._atoms]
[
CHEMICAL_ELEMENTS.get_atom_property(at, "vdw_radius")
for at in self._atoms
]
).astype(np.float32)

scalars = ndarray_to_vtkarray(
Expand Down
4 changes: 3 additions & 1 deletion MDANSE_GUI/Src/MDANSE_GUI/Tabs/JobTab.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def set_current_trajectory(self, new_name: str) -> None:
)
# The combobox was changed we need to update the action
# widgets with the new trajectory
self.action.set_trajectory(path=None, trajectory=traj_model._nodes[node_number][0])
self.action.set_trajectory(
path=None, trajectory=traj_model._nodes[node_number][0]
)
current_item = self._core.current_item()
if current_item is not None:
# we only update the widget if a job is selected from the
Expand Down

0 comments on commit f178a90

Please sign in to comment.