Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the notation *(*) to select all atoms except H in restraints #162

Open
wants to merge 21 commits into
base: master
Choose a base branch
from

Conversation

pascal22p
Copy link
Member

No description provided.

@richardicooper
Copy link
Member

Build failures are due to a dependency not downloading - hopefully temporary problem.

@richardicooper
Copy link
Member

Build and test is now OK. Is the 'do not merge' label related to this, or something else?

@richardicooper
Copy link
Member

Code changes look fine.

@pascal22p
Copy link
Member Author

Something else. I need more tests.

@richardicooper
Copy link
Member

It looks like the new code doesn't warn on non-existent atoms anymore - the failing diff is in lexical.tst output - the old code prints a warning about C(128). The line looks strange though - what's the meaning of the next atom C(2,128)?

Comparing files lexical.out and MIN64GHGUI.ORG/LEXICAL.OUT
***** lexical.out
#LIST 16
#END
***** MIN64GHGUI.ORG/LEXICAL.OUT
#LIST 16
E Warning: UQISO 0.01 C(128) C(2, 128)
E ------------------^^^^^^^
E Warning: atom C(128) is not present in the model
#END


@pascal22p
Copy link
Member Author

I fixed the warning on non-existing atom.
Also fixed a bug on symmetry operator check
Introduce a new bug I need to fix. comma is at the wrong place...

@pascal22p
Copy link
Member Author

pascal22p commented May 15, 2020

The piece of work left is this *(...) syntax to select atom where the * is any type.
Unfortunately * is also the sign for the multiplication....

I can work out most of the cases except this one:
*(3) which could be either:

  • times 3
  • any atom type with a serial of 3

The current syntax analyser would probably interpret this as a valid multiplication so will keep the current behaviour.

The rest is:

  1. *(*): everything
  2. *(*, part=2): all atoms in part 2
  3. *(*, resi=3): all atoms in residue 3

I wondering if 2. and 3. is already possible. I have not checked yet.

@pascal22p
Copy link
Member Author

rebased branch with master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants