merge trajs

kestrelquantum · Nov 14, 2024 · f0933ef · f0933ef
1 parent d9c8296
commit f0933ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/problem_templates/quantum_state_sampling_problem.jl b/src/problem_templates/quantum_state_sampling_problem.jl
@@ -66,7 +66,7 @@ function QuantumStateSamplingProblem(
             )
         end
 
-        traj = NamedTrajectories.merge(
+        traj = merge(
             trajs, 
             merge_names=(; a=1, da=1, dda=1, Δt=1),
             free_time=piccolo_options.free_time

diff --git a/src/problem_templates/unitary_direct_sum_problem.jl b/src/problem_templates/unitary_direct_sum_problem.jl
@@ -100,7 +100,7 @@ function UnitaryDirectSumProblem(
     # Build the direct sum system
 
     # merge suffix trajectories
-    traj = direct_sum([add_suffix(p.trajectory, ℓ) for (p, ℓ) ∈ zip(probs, prob_labels)])
+    traj = merge([add_suffix(p.trajectory, ℓ) for (p, ℓ) ∈ zip(probs, prob_labels)])
 
     # add noise to control data (avoid restoration)
     if drive_reset_ratio > 0

diff --git a/src/problem_templates/unitary_sampling_problem.jl b/src/problem_templates/unitary_sampling_problem.jl
@@ -100,7 +100,7 @@ function UnitarySamplingProblem(
             )
         end
 
-        traj = NamedTrajectories.merge(
+        traj = merge(
             trajs, 
             merge_names=(; a=1, da=1, dda=1, Δt=1),
             free_time=piccolo_options.free_time