From 43cf50f55f935a3f4ee0a2b5d17dbf3055def3f7 Mon Sep 17 00:00:00 2001
From: Pablo San-Jose <lekand@gmail.com>
Date: Wed, 20 Nov 2024 10:25:53 +0100
Subject: [PATCH 1/2] Revert "Bugfix: ensure full dealiasing of lattices in
 attach"

---
 src/types.jl               | 10 +---------
 test/test_greenfunction.jl |  7 -------
 test/test_hamiltonian.jl   |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/types.jl b/src/types.jl
index ef337880..025b1d80 100644
--- a/src/types.jl
+++ b/src/types.jl
@@ -1623,14 +1623,6 @@ Base.copy(h::Hamiltonian) = Hamiltonian(
 copy_lattice(h::Hamiltonian) = Hamiltonian(
     copy(lattice(h)), blockstructure(h), harmonics(h), bloch(h))
 
-function copy_lattice(h1::Hamiltonian, h2::Hamiltonian)
-    @assert lattice(h1) === lattice(h2)
-    lat´ = copy(lattice(h1))
-    h1´ = Hamiltonian(lat´, blockstructure(h1), harmonics(h1), bloch(h1))
-    h2´ = Hamiltonian(lat´, blockstructure(h2), harmonics(h2), bloch(h2))
-    return h1´, h2´
-end
-
 copy_harmonics_shallow(h::Hamiltonian) = Hamiltonian(
     lattice(h), blockstructure(h), copy(harmonics(h)), bloch(h))
 
@@ -1705,7 +1697,7 @@ LinearAlgebra.ishermitian(h::ParametricHamiltonian) =
     argerror("`ishermitian(::ParametricHamiltonian)` not supported, as the result can depend on the values of parameters.")
 
 copy_lattice(p::ParametricHamiltonian) = ParametricHamiltonian(
-    copy_lattice(p.hparent, p.h)..., p.modifiers, p.allptrs, p.allparams)
+    copy_lattice(p.hparent), p.h, p.modifiers, p.allptrs, p.allparams)
 
 copy_harmonics_shallow(p::ParametricHamiltonian) = ParametricHamiltonian(
     copy_harmonics_shallow(p.hparent), copy_harmonics_shallow(p.h), p.modifiers, p.allptrs, p.allparams)
diff --git a/test/test_greenfunction.jl b/test/test_greenfunction.jl
index 49e5cf7b..5559d2ea 100644
--- a/test/test_greenfunction.jl
+++ b/test/test_greenfunction.jl
@@ -561,13 +561,6 @@ end
     @test g.contacts.selfenergies[2].solver.hlead[(0,)] === g.contacts.selfenergies[1].solver.hlead[(0,)]
     @test g.contacts.selfenergies[2].solver.hlead[(1,)] === g.contacts.selfenergies[1].solver.hlead[(-1,)]
     @test g.contacts.selfenergies[2].solver.hlead[(-1,)] === g.contacts.selfenergies[1].solver.hlead[(1,)]
-
-    # ensure full dealiasing of lattices in attach
-    model = hopping(SA[1 0; 0 -1]) + @onsite((; µ = 0) -> SA[-µ 0; 0 µ])
-    h = LP.linear() |> hamiltonian(model, orbitals = 2)
-    glead = h |> greenfunction(GS.Schur(boundary = 0))
-    g = h |> attach(glead, cells = 1) |> greenfunction(GS.Schur(boundary = 0));
-    @test sites(lattice(h)) == [SA[0.0]]
 end
 
 @testset "meanfield" begin
diff --git a/test/test_hamiltonian.jl b/test/test_hamiltonian.jl
index 739fbbba..e7dd6049 100644
--- a/test/test_hamiltonian.jl
+++ b/test/test_hamiltonian.jl
@@ -421,7 +421,7 @@ end
     @test h((1,2)) == h3((1,2))
     h = LP.square() |> @hopping((; t=1) -> t) |> supercell((2,0), (0, 1))
     h´ = h |> transform(r -> SA[r[2], r[1]])
-    @test sites(lattice(h´)) == sites(h´.h.lattice) == sites(lattice(parent(h´)))
+    @test sites(lattice(h´)) == sites(h´.h.lattice) != sites(lattice(parent(h´)))
     @test sites(lattice(h´)) == [SA[0,0], SA[0,1]]
     h´´ = reverse(h´)
     @test bravais_matrix(lattice(h´´)) == - bravais_matrix(lattice(h´))

From 3c39b75922328be4ece53ada68f332a5185ac132 Mon Sep 17 00:00:00 2001
From: Pablo San-Jose <lekand@gmail.com>
Date: Wed, 20 Nov 2024 10:39:21 +0100
Subject: [PATCH 2/2] Bugfix: ensure correct dealiasing of lattices after
 attach

---
 src/types.jl               | 2 +-
 test/test_greenfunction.jl | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/types.jl b/src/types.jl
index 025b1d80..4aee2910 100644
--- a/src/types.jl
+++ b/src/types.jl
@@ -1697,7 +1697,7 @@ LinearAlgebra.ishermitian(h::ParametricHamiltonian) =
     argerror("`ishermitian(::ParametricHamiltonian)` not supported, as the result can depend on the values of parameters.")
 
 copy_lattice(p::ParametricHamiltonian) = ParametricHamiltonian(
-    copy_lattice(p.hparent), p.h, p.modifiers, p.allptrs, p.allparams)
+    p.hparent, copy_lattice(p.h), p.modifiers, p.allptrs, p.allparams)
 
 copy_harmonics_shallow(p::ParametricHamiltonian) = ParametricHamiltonian(
     copy_harmonics_shallow(p.hparent), copy_harmonics_shallow(p.h), p.modifiers, p.allptrs, p.allparams)
diff --git a/test/test_greenfunction.jl b/test/test_greenfunction.jl
index 5559d2ea..6c08cf5a 100644
--- a/test/test_greenfunction.jl
+++ b/test/test_greenfunction.jl
@@ -531,7 +531,7 @@ end
     @test typeof(ρ0sol) == typeof(ρsol)
 end
 
-@testset "aliasing" begin
+@testset "greenfunction aliasing" begin
     # Issue #267
     g = LP.linear() |> hamiltonian(@hopping((; q = 1) -> q*I), orbitals = 2) |> greenfunction
     g´ = Quantica.minimal_callsafe_copy(g)
@@ -561,6 +561,13 @@ end
     @test g.contacts.selfenergies[2].solver.hlead[(0,)] === g.contacts.selfenergies[1].solver.hlead[(0,)]
     @test g.contacts.selfenergies[2].solver.hlead[(1,)] === g.contacts.selfenergies[1].solver.hlead[(-1,)]
     @test g.contacts.selfenergies[2].solver.hlead[(-1,)] === g.contacts.selfenergies[1].solver.hlead[(1,)]
+
+    # ensure full dealiasing of lattices in attach
+    model = hopping(SA[1 0; 0 -1]) + @onsite((; µ = 0) -> SA[-µ 0; 0 µ])
+    h = LP.linear() |> hamiltonian(model, orbitals = 2)
+    glead = h |> greenfunction(GS.Schur(boundary = 0))
+    g = h |> attach(glead, cells = 1) |> greenfunction(GS.Schur(boundary = 0));
+    @test sites(lattice(h)) == [SA[0.0]]
 end
 
 @testset "meanfield" begin