Merge pull request #548 from peastman/master

Created ForceField.loadFile()

wrappers/python/simtk/openmm/app/forcefield.py

@@ -100,7 +100,7 @@ class ForceField(object):
         """Load one or more XML files and create a ForceField object based on them.
 
         Parameters:
-         - files A list of XML files defining the force field.  Each entry may
+         - files (list) A list of XML files defining the force field.  Each entry may
            be an absolute file path, a path relative to the current working
            directory, a path relative to this module's data subdirectory
            (for built in force fields), or an open file-like object with a
@@ -113,6 +113,18 @@ class ForceField(object):
         self._forces = []
         self._scripts = []
         for file in files:
+            self.loadFile(file)
+    
+    def loadFile(self, file):
+        """Load an XML file and add the definitions from it to this FieldField.
+        
+        Parameters:
+         - file (string or file) An XML file containing force field definitions.  It may
+           be either an absolute file path, a path relative to the current working
+           directory, a path relative to this module's data subdirectory
+           (for built in force fields), or an open file-like object with a
+           read() method from which the forcefield XML data can be loaded.
+        """
         try:
             # this handles either filenames or open file-like objects
             tree = etree.parse(file)