Skip to content

Commit

Permalink
guardrail print statements
Browse files Browse the repository at this point in the history
  • Loading branch information
gianmarco-terrones committed May 6, 2024
1 parent e7e5a50 commit 651c202
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
18 changes: 12 additions & 6 deletions molSimplify/Informatics/autocorrelation.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def deltametric_catoms(mol, prop_vec, orig, d, oct=True, catoms=None):
active_set = set([orig])
historical_set = set()
result_vector[hopped] = 0.00
# metal_idx = mol.findMetal()[0]
# metal_idx = get_metal_index(mol)
while hopped < (d):
hopped += 1
new_active_set = set()
Expand Down Expand Up @@ -417,7 +417,7 @@ def atom_only_autocorrelation_derivative(mol, prop, d, atomIdx, oct=True):
def metal_only_autocorrelation(mol, prop, d, oct=True, catoms=None,
func=autocorrelation, modifier=False):
try:
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
autocorrelation_vector = func(mol, w, metal_ind, d, oct=oct,
catoms=catoms)
Expand All @@ -430,7 +430,7 @@ def metal_only_autocorrelation(mol, prop, d, oct=True, catoms=None,
def metal_only_autocorrelation_derivative(mol, prop, d, oct=True, catoms=None,
func=autocorrelation_derivative, modifier=False):
try:
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
autocorrelation_vector_derivative = func(mol, w, metal_ind, d, oct=oct,
catoms=catoms)
Expand Down Expand Up @@ -530,7 +530,7 @@ def atom_only_deltametric_derivative(mol, prop, d, atomIdx, oct=True, modifier=F
def metal_only_deltametric_derivative(mol, prop, d, oct=True, catoms=None,
func=deltametric_derivative, modifier=False):
try:
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
deltametric_vector_derivative = func(mol, w, metal_ind, d, oct=oct,
catoms=catoms)
Expand All @@ -543,7 +543,7 @@ def metal_only_deltametric_derivative(mol, prop, d, oct=True, catoms=None,
def metal_only_deltametric(mol, prop, d, oct=True, catoms=None,
func=deltametric, modifier=False):
try:
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
deltametric_vector = func(mol, w, metal_ind, d, oct=oct,
catoms=catoms)
Expand Down Expand Up @@ -585,7 +585,7 @@ def multiatom_only_deltametric(mol, prop, d, oct=True, catoms=None,

def metal_only_layer_density(mol, prop, d, oct=True):
try:
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
print(('metal_index is: %d' % metal_ind))
w = construct_property_vector(mol, prop, oct=oct)
density_vector = layer_density_in_3D(mol, w, metal_ind, d, oct=oct)
Expand Down Expand Up @@ -1928,3 +1928,9 @@ def generate_atomonly_deltametric_derivatives(mol, atomIdx, loud, depth=4, oct=T
result = np.row_stack([result, atom_only_ac_der])
results_dictionary = {'colnames': colnames, 'results': result}
return results_dictionary

def get_metal_index(mol):
metal_idx = mol.findMetal()
if len(metal_idx) > 1:
print('More than one metal in mol object. Choosing the first one.')
return metal_idx[0]
14 changes: 10 additions & 4 deletions molSimplify/Informatics/lacRACAssemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ def metal_only_autocorrelation(mol, prop, d, oct=True, metal_ind=None,
"""
try:
if not isinstance(metal_ind, int):
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier, MRdiag_dict=MRdiag_dict)
autocorrelation_vector = func(mol, w, metal_ind, d, oct=oct, use_dist=use_dist, size_normalize=size_normalize)
except IndexError:
Expand Down Expand Up @@ -1133,7 +1133,7 @@ def metal_only_autocorrelation_derivative(mol, prop, d, oct=True, metal_ind=None
"""
try:
if not isinstance(metal_ind, int):
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
autocorrelation_vector_derivative = func(mol, w, metal_ind, d, oct=oct)
except IndexError:
Expand Down Expand Up @@ -1251,7 +1251,7 @@ def metal_only_deltametric_derivative(mol, prop, d, oct=True, metal_ind=None,
"""
try:
if not isinstance(metal_ind, int):
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier)
deltametric_vector_derivative = func(mol, w, metal_ind, d, oct=oct)
except IndexError:
Expand Down Expand Up @@ -1295,7 +1295,7 @@ def metal_only_deltametric(mol, prop, d, oct=True, metal_ind=None,
"""
try:
if not isinstance(metal_ind, int):
metal_ind = mol.findMetal()[0]
metal_ind = get_metal_index(mol)
w = construct_property_vector(mol, prop, oct=oct, modifier=modifier, MRdiag_dict=MRdiag_dict)
deltametric_vector = func(mol, w, metal_ind, d, oct=oct, use_dist=use_dist, size_normalize=size_normalize)
except IndexError:
Expand Down Expand Up @@ -2190,3 +2190,9 @@ def generate_metal_ox_deltametric_derivatives(oxmodifier, mol, loud, depth=4, oc
result = metal_ox_ac
results_dictionary = {'colnames': colnames, 'results': result}
return results_dictionary

def get_metal_index(mol):
metal_idx = mol.findMetal()
if len(metal_idx) > 1:
print('More than one metal in mol object. Choosing the first one.')
return metal_idx[0]

0 comments on commit 651c202

Please sign in to comment.