Skip to content
Snippets Groups Projects
Commit d82ea146 authored by Hervé  MENAGER's avatar Hervé MENAGER
Browse files

compound best pXC50 activity is for all types of activity registered

and not only pIC50+pEC50 (discussed with @osperand)


Former-commit-id: b5e46f34952deba8ed94ecddee199e999f9940de
parent 831bdd98
No related branches found
No related tags found
No related merge requests found
......@@ -410,14 +410,14 @@ class Compound(models.Model):
@property
def best_pXC50_activity(self):
return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50']).aggregate(Max('activity'))['activity__max']
return self.compoundactivityresult_set.aggregate(Max('activity'))['activity__max']
@property
def best_pXC50_compound_activity_result(self):
best_pXC50_activity = self.best_pXC50_activity
if best_pXC50_activity is None:
return None
return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50'], activity=best_pXC50_activity)[0]
return self.compoundactivityresult_set.filter(activity=best_pXC50_activity)[0]
@property
def le(self):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment