added gaussian broadening option to spec func

abhirup-m · Dec 9, 2024 · 2b88baf · 2b88baf
1 parent f22690f
commit 2b88baf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/correlations.jl b/src/correlations.jl
@@ -342,13 +342,14 @@ function SpecFunc(
     degenTol::Float64=0.,
     normalise::Bool=true,
     silent::Bool=false,
+    broadFuncType::String="lorentz",
     )
 
     @assert length(eigVals) == length(eigVecs)
-
+    @assert broadFuncType ∈ ("lorentz", "gauss")
     @assert issorted(freqValues)
 
-    broadeningFunc(x, standDev) = standDev ./ (x .^ 2 .+ standDev .^ 2)
+    broadeningFunc(x, standDev) = ifelse(broadFuncType=="lorentz", standDev ./ (x .^ 2 .+ standDev .^ 2), exp.(-0.5 .* ((x ./ standDev).^2)) ./ (standDev .* ((2π)^0.5)))
 
     energyGs = minimum(eigVals)
     specFunc = 0 .* freqValues
@@ -426,6 +427,7 @@ function SpecFunc(
     degenTol::Float64=0.,
     normalise::Bool=true,
     silent::Bool=false,
+    broadFuncType::String="lorentz",
 )
     eigenStates = Vector{Float64}[] 
     for vector in eigVecs
@@ -437,7 +439,7 @@ function SpecFunc(
     end
 
     return SpecFunc(eigVals, eigenStates, probeMatrices, freqValues, standDev;
-                    normalise=normalise, degenTol=degenTol, silent=silent)
+                    normalise=normalise, degenTol=degenTol, silent=silent, broadFuncType=broadFuncType)
 end
 export SpecFunc
 
@@ -463,6 +465,7 @@ function SpecFunc(
     degenTol::Float64=0.,
     normalise::Bool=true,
     silent::Bool=false,
+    broadFuncType::String="lorentz",
 )
     classifiedSpectrum, classifiedEnergies = ClassifyBasis(eigVecs, symmetries; energies=eigVals)
     groundStateEnergy = minimum(eigVals)
@@ -487,7 +490,7 @@ function SpecFunc(
     @assert groundStateEnergy == minimum(minimalEigVals)
 
     return SpecFunc(minimalEigVals, minimalEigVecs, probes, freqValues, basisStates, standDev;
-                    normalise=normalise, degenTol=degenTol, silent=silent)
+                    normalise=normalise, degenTol=degenTol, silent=silent, broadFuncType=broadFuncType)
 end
 export SpecFunc
 
@@ -516,6 +519,7 @@ function SpecFunc(
     degenTol::Float64=0.,
     normalise::Bool=true,
     silent::Bool=false,
+    broadFuncType::String="lorentz",
 )
     classifiedSpectrum, classifiedEnergies = ClassifyBasis(eigVecs, symmetries; energies=eigVals)
     minimalEigVecs = Dict{BitVector,Float64}[]
@@ -542,7 +546,7 @@ function SpecFunc(
     @assert groundStateEnergy == minimum(minimalEigVals)
 
     return SpecFunc(minimalEigVals, minimalEigVecs, probes, freqValues, basisStates, standDev;
-                    normalise=normalise, degenTol=degenTol, silent=silent)
+                    normalise=normalise, degenTol=degenTol, silent=silent, broadFuncType=broadFuncType)
 end
 export SpecFunc
 
@@ -562,10 +566,11 @@ function SpecFunc(
     degenTol::Float64=0.,
     normalise::Bool=true,
     silent::Bool=false,
+    broadFuncType::String="lorentz",
 )
 
     eigVecs = [collect(vec) for vec in eachcol(eigVecMatrix)]
     return SpecFunc(eigVals, eigVecs, probes, freqValues, standDev; 
-                    normalise=normalise, degenTol=degenTol, silent=silent)
+                    normalise=normalise, degenTol=degenTol, silent=silent, broadFuncType=broadFuncType)
 end
 export SpecFunc
diff --git a/src/iterDiag.jl b/src/iterDiag.jl
@@ -848,6 +848,7 @@ function IterSpecFunc(
         excMagzReq::Union{Nothing,Function}=nothing,
         normEveryStep::Bool=false,
         silent::Bool=false,
+        broadFuncType::String="lorentz",
     )
     @assert issetequal(keys(specFuncOperators), ["create", "destroy"])
     quantumNoReq = CombineRequirements(occReq, magzReq)
@@ -887,7 +888,7 @@ function IterSpecFunc(
         specFunc = SpecFunc(minimalEigVals, minimalEigVecs, 
                             Dict(name => specFuncOperators[name][i] for name in keys(specFuncOperators)),
                             freqValues, standDev; silent=silent,
-                            normalise=normEveryStep, degenTol=degenTol)
+                            normalise=normEveryStep, degenTol=degenTol, broadFuncType=broadFuncType)
         totalSpecFunc .+= specFunc
     end
     return totalSpecFunc