Merge pull request #256 from GTorlai/choifix

various fixes

Project.toml

@@ -1,7 +1,7 @@
 name = "PastaQ"
 uuid = "30b07047-aa8b-4c78-a4e8-24d720215c19"
 authors = ["Giacomo Torlai <[email protected]>", "Matthew Fishman <[email protected]>"]
-version = "0.0.17"
+version = "0.0.18"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

src/PastaQ.jl

@@ -28,6 +28,7 @@ include("autodiff.jl")
 include("optimizers.jl")
 include("productstates.jl")
 include("randomstates.jl")
+include("measurements.jl")
 include("tomography/tensornetwork-statetomography.jl")
 include("tomography/tensornetwork-processtomography.jl")
 include("tomography/fulltomography.jl")

src/circuits/gates.jl

@@ -73,14 +73,15 @@ gate(::GateName"H") = [
 ]
 
 # Rϕ with ϕ = π/2
-gate(::GateName"Phase") = [
+gate(::GateName"Phase"; ϕ::Number = π/2) = [
   1 0
-  0 im
+  0 exp(im*ϕ)
 ]
 
-gate(::GateName"P") = gate("Phase")
+gate(::GateName"P"; kwargs...)     = gate("Phase"; kwargs...)
+gate(::GateName"PHASE"; kwargs...) = gate("Phase"; kwargs...)
 
-gate(::GateName"S") = gate("Phase")
+gate(::GateName"S") = gate("Phase"; ϕ = π/2)
 
 # Rϕ with ϕ = π/4
 gate(::GateName"π/8") = [
@@ -110,8 +111,8 @@ gate(::GateName"RY"; kwargs...) =
 
 # Rotation around Z-axis
 gate(::GateName"Rz"; ϕ::Number) = [
-  exp(im * ϕ / 2)  0
-  0          exp(-im * ϕ / 2)
+  exp(-im * ϕ / 2)  0
+  0          exp(im * ϕ / 2)
 ]
 
 gate(::GateName"RZ"; kwargs...) = 
@@ -173,16 +174,25 @@ gate(::GateName"CRy"; θ::Number) = [
 gate(::GateName"CRY"; kwargs...) = 
   gate("CRy"; kwargs...)
 
-# Same as CRn with (θ = 0, λ = 0)
 gate(::GateName"CRz"; ϕ::Real) = [
+  1   0   0   0
+  0   1   0   0
+  0   0   exp(-im * ϕ / 2)    0
+  0   0   0     exp(im * ϕ / 2)
+]
+
+gate(::GateName"CRZ"; kwargs...) = 
+  gate("CRz"; kwargs...)
+
+gate(::GateName"CPHASE"; ϕ::Real) = [
   1 0 0 0
   0 1 0 0
   0 0 1 0
   0 0 0 exp(im * ϕ)
 ]
 
-gate(::GateName"CRZ"; kwargs...) = 
-  gate("CRz"; kwargs...)
+gate(::GateName"Cphase"; kwargs...) = gate("CPHASE"; kwargs...) 
+gate(::GateName"CP"; kwargs...)     = gate("CPHASE"; kwargs...)
 
 function gate(::GateName"CRn"; θ::Real, ϕ::Real, λ::Real)
   return [