Skip to content
Snippets Groups Projects
Commit 1648d0c9 authored by juergen's avatar juergen
Browse files

added option to skip FindWithin step in LocalDistTest by specifying max_dist as -1

parent 415ccd23
Branches
Tags
No related merge requests found
...@@ -58,12 +58,18 @@ std::pair<Real, Real> calc_overlap(ResidueView ref_res, ...@@ -58,12 +58,18 @@ std::pair<Real, Real> calc_overlap(ResidueView ref_res,
AtomViewList ref_atoms=ref_res.GetAtomList(); AtomViewList ref_atoms=ref_res.GetAtomList();
ResidueView mdl_res=mdl_chain.FindResidue(ref_res.GetNumber()); ResidueView mdl_res=mdl_chain.FindResidue(ref_res.GetNumber());
AtomViewList within;
if (max_dist<0){
within=ref.GetAtomList();
}
for (AtomViewList::iterator ai=ref_atoms.begin(), for (AtomViewList::iterator ai=ref_atoms.begin(),
ae=ref_atoms.end(); ai!=ae; ++ai) { ae=ref_atoms.end(); ai!=ae; ++ai) {
if (ai->GetElement()=="H") { continue; } if (ai->GetElement()=="H") { continue; }
String name=swap ? swapped_name(ai->GetName()) : ai->GetName(); String name=swap ? swapped_name(ai->GetName()) : ai->GetName();
AtomView av1=mdl_res ? mdl_res.FindAtom(name) : AtomView(); AtomView av1=mdl_res ? mdl_res.FindAtom(name) : AtomView();
AtomViewList within=ref.FindWithin(ai->GetPos(), max_dist); if (max_dist>=0){
within=ref.FindWithin(ai->GetPos(), max_dist);
}
for (AtomViewList::iterator aj=within.begin(), for (AtomViewList::iterator aj=within.begin(),
ae2=within.end(); aj!=ae2; ++aj) { ae2=within.end(); aj!=ae2; ++aj) {
if (aj->GetElement()=="H") { continue; } if (aj->GetElement()=="H") { continue; }
...@@ -88,9 +94,6 @@ std::pair<Real, Real> calc_overlap(ResidueView ref_res, ...@@ -88,9 +94,6 @@ std::pair<Real, Real> calc_overlap(ResidueView ref_res,
continue; continue;
} }
if (aj->GetResidue().GetNumber()>ref_res.GetNumber()) { if (aj->GetResidue().GetNumber()>ref_res.GetNumber()) {
if (aj->GetResidue().GetNumber()<=ref_res.GetNumber()) {
continue;
}
AtomView av2=mdl_chain.FindAtom(aj->GetResidue().GetNumber(), AtomView av2=mdl_chain.FindAtom(aj->GetResidue().GetNumber(),
aj->GetName()); aj->GetName());
overlap.second+=1.0; overlap.second+=1.0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment