@@ -371,27 +371,6 @@ def f3(
371
371
return dipole_alpha * oct_prime + dipole_prime * oct_beta_gamma_chi
372
372
373
373
374
- # TODO: remove this function after hexadecupole works
375
- def f3prime (gamma , beta , alpha , dipole , octupole , displacement_vector ):
376
-
377
- dipole_term = dipole [gamma ]
378
-
379
- displacement_alpha = displacement_vector [alpha ]
380
- displacement_beta = displacement_vector [beta ]
381
- displacement_gamma = displacement_vector [gamma ]
382
-
383
- return (
384
- 0.5
385
- * dipole_term
386
- * (
387
- 4 * displacement_beta * displacement_alpha ** 2
388
- - displacement_beta ** 3
389
- - displacement_beta * displacement_gamma ** 2
390
- )
391
- + displacement_gamma * octupole [beta , alpha , alpha ]
392
- )
393
-
394
-
395
374
def f4 (alpha , beta , gamma , chi , quadrupole , displacement_vector ):
396
375
397
376
theta_alpha_beta = quadrupole [alpha , beta ]
@@ -601,10 +580,7 @@ def G(alpha, beta, gamma, chi, dipole, quadrupole, octupole, displacement_vector
601
580
)
602
581
term2 = 10.5 * (
603
582
f3 (beta , gamma , alpha , alpha , dipole , octupole , displacement_vector )
604
- + f3 (
605
- gamma , beta , alpha , alpha , dipole , octupole , displacement_vector
606
- ) # TODO: remove this comment after hexadecupole works
607
- # f3prime(gamma, beta, alpha, dipole, octupole, displacement_vector)
583
+ + f3 (gamma , beta , alpha , alpha , dipole , octupole , displacement_vector )
608
584
)
609
585
term3 = 3 * (
610
586
f3 (beta , gamma , beta , beta , dipole , octupole , displacement_vector )
0 commit comments