Skip to content
Snippets Groups Projects
Commit 7951fac5 authored by Ansgar Philippsen's avatar Ansgar Philippsen
Browse files

tweaks to gfx trace connectivity; fixed dcd loader error message

parent f2fc43a3
Branches
Tags
No related merge requests found
......@@ -38,6 +38,8 @@ bool in_sequence(const mol::ResidueHandle& r1, const mol::ResidueHandle& r2)
if(n2.GetInsCode()!='\0') {
if(n1.NextInsertionCode()==n2) return true;
}
if(mol::InSequence(r1,r2)) return true;
// perhaps this fallback is not so good...
if(n1.GetNum()+1==n2.GetNum()) return true;
return false;
}
......
......@@ -188,12 +188,18 @@ mol::CoordGroupHandle load_dcd(const mol::AtomHandleList& alist2,
const String& trj_fn,
unsigned int stride)
{
std::ifstream istream(trj_fn.c_str(), std::ios::binary);
if(!istream) {
std::ostringstream msg;
msg << "LoadCHARMMTraj: cannot open " << trj_fn;
throw(IOException(msg.str()));
}
Profile profile_load("LoadCHARMMTraj");
mol::AtomHandleList alist(alist2);
std::sort(alist.begin(),alist.end(),less_index);
std::ifstream istream(trj_fn.c_str(), std::ios::binary);
DCDHeader header;
bool swap_flag=false, skip_flag=false, gap_flag=false;
read_dcd_header(istream, header, swap_flag, skip_flag, gap_flag);
......@@ -315,7 +321,7 @@ mol::CoordGroupHandle LoadCHARMMTraj(const mol::EntityHandle& ent,
DCDCoordSource* source=new DCDCoordSource(alist, trj_fn, stride);
return mol::CoordGroupHandle(DCDCoordSourcePtr(source));
}
LOG_INFO("Importing CHARMM trajectory with lazy_load=false");
LOG_INFO("Importing CHARMM trajectory with lazy_load=false");
return load_dcd(alist, trj_fn, stride);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment