rdworks 0.43.1__py3-none-any.whl → 0.43.2__py3-none-any.whl

rdworks/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.43.1'
+__version__ = '0.43.2'
 
 from rdworks.conf    import Conf
 from rdworks.mol     import Mol

rdworks/conf.py

@@ -206,11 +206,20 @@ class Conf:
         if isinstance(calculator, str) :
             
             PE_start = self.potential_energy(calculator)
+            PE_final = None
             
             if calculator.lower() == 'xTB'.lower():
                 water = kwargs.get('water', None)
-                PE_final, self.rdmol = GFN2xTB(self.rdmol).optimize(water=water)
-
+                result = GFN2xTB(self.rdmol).optimize(water=water)
+                # SimpleNamespace(
+                #         PE = datadict['total energy'] * hartree2kcalpermol,
+                #         charges = datadict['partial charges'],
+                #         wbo = Wiberg_bond_orders,
+                #         geometry = rdmol_opt,
+                # )
+                self.rdmol = result.geometry
+                PE_final = result.PE
+                
             elif calculator.lower() == 'MMFF94'.lower() or calculator.lower() == 'MMFF'.lower():
                 retcode = Chem.rdForceFieldHelpers.MMFFOptimizeMolecule(self.rdmol, 
                                                                         mmffVariant='MMFF94',
@@ -226,7 +235,8 @@ class Conf:
                                                                        maxIters=max_iter)
                 # returns 0 if the optimization converged
 
-            PE_final = self.potential_energy(calculator)
+            if PE_final is None:
+                PE_final = self.potential_energy(calculator)
             
             self.props.update({
                 'E_tot_init(kcal/mol)': PE_start , # energy before optimization

{rdworks-0.43.1.dist-info → rdworks-0.43.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdworks
-Version: 0.43.1
+Version: 0.43.2
 Summary: Routine tasks built on RDKit and other tools
 Author-email: Sung-Hun Bae <sunghun.bae@gmail.com>
 Maintainer-email: Sung-Hun Bae <sunghun.bae@gmail.com>

{rdworks-0.43.1.dist-info → rdworks-0.43.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-rdworks/__init__.py,sha256=Zc1uirkVz94Y_9nQYs0bihdwDRQJeHksMdAGV1qjKh4,1368
-rdworks/conf.py,sha256=KCjmXde-C0OeCHI5be_9LcT0iCJmZxtpIAEcdgMLWUs,31544
+rdworks/__init__.py,sha256=z6yakgdvhLoutvXlBi4L3ObiiE4b0dlBzT1FdHCnzAY,1368
+rdworks/conf.py,sha256=XovvJCSdftT726yRlNeoYZ_XmVDMqC_Eiw1n45XPQEA,32001
 rdworks/descriptor.py,sha256=34T_dQ6g8v3u-ym8TLKbQtxIIV5TEo-d3pdedq3o-cg,2106
 rdworks/display.py,sha256=JR0gR26UpH-JCxVOaqXZCUj2MiGZSrx9Me87FncspVI,13469
 rdworks/ionized.py,sha256=5oIjMRpkX792RIpEEE2Ir96icfFaN_h21mSihhfQPAw,6713
@@ -66,8 +66,8 @@ rdworks/predefined/misc/reactive-part-3.xml,sha256=LgWHSEbRTVmgBoIO45xbTo1xQJs0X
 rdworks/predefined/misc/reactive.xml,sha256=syedoQ6VYUfRLnxy99ObuDniJ_a_WhrWAJbTKFfJ6VY,11248
 rdworks/xtb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rdworks/xtb/wrapper.py,sha256=I0nW89vlJZ5Za5pCjIpjsEOFbTm7HpeNGiPgssheWn8,11350
-rdworks-0.43.1.dist-info/licenses/LICENSE,sha256=UOkJSBqYyQUvtCp7a-vdCANeEcLE2dnTie_eB1By5SY,1074
-rdworks-0.43.1.dist-info/METADATA,sha256=aXyi8a25IHoAv6qyrsvgjC60UOUIjjUtua7DuECW7YU,1967
-rdworks-0.43.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rdworks-0.43.1.dist-info/top_level.txt,sha256=05C98HbvBK2axUBogC_hAT_CdpOeQYGnQ6vRAgawr8s,8
-rdworks-0.43.1.dist-info/RECORD,,
+rdworks-0.43.2.dist-info/licenses/LICENSE,sha256=UOkJSBqYyQUvtCp7a-vdCANeEcLE2dnTie_eB1By5SY,1074
+rdworks-0.43.2.dist-info/METADATA,sha256=UZvbhbwzICurxpEDN2dWM_S0euysKTZGZpiP4MdZy6o,1967
+rdworks-0.43.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rdworks-0.43.2.dist-info/top_level.txt,sha256=05C98HbvBK2axUBogC_hAT_CdpOeQYGnQ6vRAgawr8s,8
+rdworks-0.43.2.dist-info/RECORD,,