orto 0.27.1__py3-none-any.whl → 1.0.0__py3-none-any.whl

orto/__version__.py

@@ -1 +1 @@
-__version__ = '0.27.1'
+__version__ = '1.0.0'

orto/cli.py

@@ -912,7 +912,7 @@ def extract_freq_func(uargs, save=True):
             data[0]['energy (cm^-1)'][:uargs.num],
             data[0]['IR Intensity (km mol^-1)'][:uargs.num]
         ):
-            print(f'{frq:.2f} {inty:.2f}')
+            print(f'{frq:.5f} {inty:.5f}')
     else:
         # Save to new .csv file
         out_name = f'{uargs.output_file.stem}_frequencies.csv'
@@ -924,7 +924,7 @@ def extract_freq_func(uargs, save=True):
                 data[0]['energy (cm^-1)'][:uargs.num],
                 data[0]['IR Intensity (km mol^-1)'][:uargs.num]
             ):
-                f.write(f'{frq:.2f}, {inty:.2f}\n')
+                f.write(f'{frq:.5f}, {inty:.5f}\n')
 
         ut.cprint(f'Data written to {out_name}', 'cyan')
 

orto/extractor.py

@@ -538,25 +538,23 @@ class FrequencyExtractor(extto.BetweenExtractor):
         tz_pattern = re.compile(
             r'\([ -]?\d\.\d{6} *-?\d\.\d{6} *(-?\d\.\d{6})\)'
         )
-        # t2_pattern = re.compile(
-        #     r'(\d\.\d{6}) *\([ -]?\d\.\d{6} *-?\d\.\d{6} *-?\d\.\d{6}\)'
-        # )
-        # eps_pat = re.compile(
-        #     r'\d{,4}: * \d{,4}.\d{2} * (\d.\d{6})'
-        # )
+
         tx = np.asarray(
-            [0] * 6 + [float(val) for val in tx_pattern.findall(block)]
+            [float(val) for val in tx_pattern.findall(block)]
         )
         ty = np.asarray(
-            [0] * 6 + [float(val) for val in ty_pattern.findall(block)]
+            [float(val) for val in ty_pattern.findall(block)]
         )
         tz = np.asarray(
-            [0] * 6 + [float(val) for val in tz_pattern.findall(block)]
+            [float(val) for val in tz_pattern.findall(block)]
         )
 
-        # epso = np.asarray(
-        #     [0] * 6 + [float(val) for val in eps_pat.findall(block)]
-        # )
+        # t values are missing for first n_zero modes and for imaginary modes
+        n_missing = len(wavenumbers) - len(tx)
+        z_arr = np.zeros(n_missing)
+        tx = np.concatenate((z_arr, tx))
+        ty = np.concatenate((z_arr, ty))
+        tz = np.concatenate((z_arr, tz))
 
         # This is the T2 printed by ORCA
         # (Dipole derivative wrt to MWC)**2 * vibrational overlap**2
@@ -574,11 +572,10 @@ class FrequencyExtractor(extto.BetweenExtractor):
         icm2eh = 100 / sc.physical_constants['hartree-inverse meter relationship'][0] # noqa
         #
         b2 = np.zeros_like(wavenumbers)
-        n_zero = np.where(wavenumbers > 1E-4)[0][0]
-        b2[n_zero:] = 1 / (2 * icm2eh * wavenumbers[n_zero:])
+        b2[n_missing:] = 1 / (2 * icm2eh * wavenumbers[n_missing:])
         # divide by sqrt(b2)
         # to give units of e m_e^-1/2
-        t[n_zero:] /= np.sqrt(b2[n_zero:])
+        t[n_missing:] /= np.sqrt(b2[n_missing:])
 
         # Convert to SI
         # First convert electrons to coulombs
@@ -588,12 +585,13 @@ class FrequencyExtractor(extto.BetweenExtractor):
         t *= (sc.m_e)**-0.5
 
         # Calculate A_e in units of m mol^-1
+        # this is "Intensity" in Orca
         ae = np.ones_like(wavenumbers)
-        ae[:n_zero] = 0
+        ae[:n_missing] = 0
         ae *= sc.Avogadro / (12 * sc.epsilon_0 * sc.speed_of_light**2)
-        ae[n_zero:] *= t[n_zero:] ** 2
+        ae[n_missing:] *= t[n_missing:] ** 2
         # and convert to km mol^-1
-        ae[n_zero:] /= 1000
+        ae[n_missing:] /= 1000
 
         # Convert absorbance to linear
         alin = ae / np.log(10)

{orto-0.27.1.dist-info → orto-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orto
-Version: 0.27.1
+Version: 1.0.0
 Summary: A package to make life easier when performing Orca calculations.
 Home-page: https://orto.kragskow.group
 Author: Jon Kragskow

orto-1.0.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+orto/__init__.py,sha256=iSR4TAfpJn1_mwTnnncgwmWBz3q_ImdmhnOORKcOvE0,63
+orto/__version__.py,sha256=RsZjRjMprNcDm97wqRRSk6rTLgTX8N0GyicZyZ8OsBQ,22
+orto/cli.py,sha256=4W6KgUjmdI8wYo3n5Dp74YgH8a4q7-IsxBf7fhWl6P4,59396
+orto/extractor.py,sha256=kJnVI_Zwz7yorbojWdgxN-NSspJIY9pKoDb1RD2dHUg,67488
+orto/input.py,sha256=UMYNPGeqOCNKvPYJVfVS2JU7Ost_xM1ZG28t5f9-Er0,7084
+orto/job.py,sha256=SM0nlc_bqhhPvfuuykhMvaUnkwC3Gp-6RvYw_a0TyGc,5855
+orto/plotter.py,sha256=ICrO03T_HGe-H1XKZ2qzsKYdPY44E0PKiXqIQQawd7I,15633
+orto/utils.py,sha256=gVfGplkfc6xGYgLMi_7I_yAdWG-QKRaqQdy9v5F4Mck,7279
+orto-1.0.0.dist-info/METADATA,sha256=P-6wCgp-dPyw8b8N0d8m4Et-C8MXJGBySV75lL9Y2JQ,1140
+orto-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+orto-1.0.0.dist-info/entry_points.txt,sha256=HXenCglMp_03JkN34pK2phkjXK9CFcXTGHKv5QaVY8I,39
+orto-1.0.0.dist-info/top_level.txt,sha256=hQ-z28gTN_FZ2B5Kiwxr_9cUTcCoib9W5HjbkceDXw4,5
+orto-1.0.0.dist-info/RECORD,,

{orto-0.27.1.dist-info → orto-1.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

orto-0.27.1.dist-info/RECORD

@@ -1,13 +0,0 @@
-orto/__init__.py,sha256=iSR4TAfpJn1_mwTnnncgwmWBz3q_ImdmhnOORKcOvE0,63
-orto/__version__.py,sha256=ufudjmEpRocDSQt0zs8NFi9hC8HnWct5ABBMYMx5W3o,23
-orto/cli.py,sha256=5fRCsrpwcQ191XSGW7OrX4Bc-Oqxu0Q2WnwkgMW_I9o,59396
-orto/extractor.py,sha256=OW26HLbfp6BV5dMhLvQeo5Nd9CcdgcE8-6Tdsrq1rk8,67554
-orto/input.py,sha256=UMYNPGeqOCNKvPYJVfVS2JU7Ost_xM1ZG28t5f9-Er0,7084
-orto/job.py,sha256=SM0nlc_bqhhPvfuuykhMvaUnkwC3Gp-6RvYw_a0TyGc,5855
-orto/plotter.py,sha256=ICrO03T_HGe-H1XKZ2qzsKYdPY44E0PKiXqIQQawd7I,15633
-orto/utils.py,sha256=gVfGplkfc6xGYgLMi_7I_yAdWG-QKRaqQdy9v5F4Mck,7279
-orto-0.27.1.dist-info/METADATA,sha256=bB5mOX8phFiqEyUipQykjtqLrk8Yomis7YQtItyDUoA,1141
-orto-0.27.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-orto-0.27.1.dist-info/entry_points.txt,sha256=HXenCglMp_03JkN34pK2phkjXK9CFcXTGHKv5QaVY8I,39
-orto-0.27.1.dist-info/top_level.txt,sha256=hQ-z28gTN_FZ2B5Kiwxr_9cUTcCoib9W5HjbkceDXw4,5
-orto-0.27.1.dist-info/RECORD,,