@@ -371,27 +371,6 @@ def f3(
371371 return dipole_alpha * oct_prime + dipole_prime * oct_beta_gamma_chi
372372
373373
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-
395374def f4 (alpha , beta , gamma , chi , quadrupole , displacement_vector ):
396375
397376 theta_alpha_beta = quadrupole [alpha , beta ]
@@ -601,10 +580,7 @@ def G(alpha, beta, gamma, chi, dipole, quadrupole, octupole, displacement_vector
601580 )
602581 term2 = 10.5 * (
603582 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 )
608584 )
609585 term3 = 3 * (
610586 f3 (beta , gamma , beta , beta , dipole , octupole , displacement_vector )
0 commit comments