Merge pull request #23 from giadarol/master

Remove pyblep dependence in footprint example
SixTrack · Jun 18, 2019 · 5f2f5b2 · 5f2f5b2
2 parents 8c42233 + 62f8891
commit 5f2f5b2
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 27 deletions.
diff --git a/...print/000_pickle_line_and_closed_orbit.py → ...input/000_pickle_line_and_closed_orbit.py b/...print/000_pickle_line_and_closed_orbit.py → ...input/000_pickle_line_and_closed_orbit.py
@@ -1,5 +1,4 @@
 import sixtracktools
-import pyblep
 import pysixtrack
 import pickle
 import os
@@ -16,14 +15,12 @@
 sixinput = sixtracktools.SixInput('.')
 p0c_eV = sixinput.initialconditions[-3]*1e6
 
-# Build pyblep line from sixtrack input
-pbline, other_data = pyblep.from_sixtrack_input(sixinput)
+# Build pysixtrack line from sixtrack input
+line, other_data = pysixtrack.Line.from_sixinput(sixinput)
 
 # Info on sixtrack->pyblep conversion 
 iconv = other_data['iconv']
 
-# Build pysixtrack line
-line = pysixtrack.Line.fromline(pbline)
 
 ########################################################
 #                  Search closed orbit                 #
@@ -64,7 +61,7 @@
 #################################
 
 with open('line.pkl', 'wb') as fid:
-    pickle.dump(line.to_pyblep_line(), fid)
+    pickle.dump(line.to_dict(keepextra=True), fid)
 
 #########################################
 # Save particle on closed orbit as dict #

diff --git a/..._footprint/001_checks_against_sixtrack.py → ...rack_input/001_checks_against_sixtrack.py b/..._footprint/001_checks_against_sixtrack.py → ...rack_input/001_checks_against_sixtrack.py
@@ -6,9 +6,7 @@
 
 # Load machine
 with open('line.pkl', 'rb') as fid:
-    pbline = pickle.load(fid)
-
-line = pysixtrack.Line.fromline(pbline)
+    line = pysixtrack.Line.from_dict(pickle.load(fid))
 
 # Load particle on CO
 with open('particle_on_CO.pkl', 'rb') as fid:

diff --git a/...tprint/002_compare_individual_particle.py → ..._input/002_compare_individual_particle.py b/...tprint/002_compare_individual_particle.py → ..._input/002_compare_individual_particle.py
@@ -7,7 +7,7 @@
 n_turns = 100
 
 with open('line.pkl', 'rb') as fid:
-    line = pickle.load(fid)
+    line = pysixtrack.Line.from_dict(pickle.load(fid))
 
 with open('particle_on_CO.pkl', 'rb') as fid:
     partCO = pickle.load(fid)

diff --git a/..._footprint/003_gen_coord_for_footprint.py → ...rack_input/003_gen_coord_for_footprint.py b/..._footprint/003_gen_coord_for_footprint.py → ...rack_input/003_gen_coord_for_footprint.py
@@ -15,7 +15,7 @@
 
 
 with open('line.pkl', 'rb') as fid:
-    line = pickle.load(fid)
+    line = pysixtrack.Line.from_dict(pickle.load(fid))
 
 with open('particle_on_CO.pkl', 'rb') as fid:
     partCO = pickle.load(fid)

diff --git a/.../test_workflow_footprint/004_footprint.py → ...rint_from_sixtrack_input/004_footprint.py b/.../test_workflow_footprint/004_footprint.py → ...rint_from_sixtrack_input/004_footprint.py
@@ -15,7 +15,7 @@
 n_turns = 100
 
 with open('line.pkl', 'rb') as fid:
-    line = pickle.load(fid)
+    line = pysixtrack.Line.from_dict(pickle.load(fid))
 
 with open('particle_on_CO.pkl', 'rb') as fid:
     partCO = pickle.load(fid)

diff --git a/...thon/test_workflow_footprint/footprint.py → ...ootprint_from_sixtrack_input/footprint.py b/...thon/test_workflow_footprint/footprint.py → ...ootprint_from_sixtrack_input/footprint.py
diff --git a/...es/python/test_workflow_footprint/fort.16 → ...est_footprint_from_sixtrack_input/fort.16 b/...es/python/test_workflow_footprint/fort.16 → ...est_footprint_from_sixtrack_input/fort.16
diff --git a/...les/python/test_workflow_footprint/fort.2 → ...test_footprint_from_sixtrack_input/fort.2 b/...les/python/test_workflow_footprint/fort.2 → ...test_footprint_from_sixtrack_input/fort.2
diff --git a/...les/python/test_workflow_footprint/fort.3 → ...test_footprint_from_sixtrack_input/fort.3 b/...les/python/test_workflow_footprint/fort.3 → ...test_footprint_from_sixtrack_input/fort.3
diff --git a/...les/python/test_workflow_footprint/fort.8 → ...test_footprint_from_sixtrack_input/fort.8 b/...les/python/test_workflow_footprint/fort.8 → ...test_footprint_from_sixtrack_input/fort.8
diff --git a/...python/test_workflow_footprint/helpers.py → ..._footprint_from_sixtrack_input/helpers.py b/...python/test_workflow_footprint/helpers.py → ..._footprint_from_sixtrack_input/helpers.py
@@ -156,8 +156,6 @@ def track_particle_pysixtrack(line, part, Dx_wrt_CO_m, Dpx_wrt_CO_rad,
                               Dy_wrt_CO_m, Dpy_wrt_CO_rad,
                               Dsigma_wrt_CO_m, Ddelta_wrt_CO, n_turns, verbose=False):
 
-    line = pysixtrack.Line.fromline(line)
-
     Dx_wrt_CO_m, Dpx_wrt_CO_rad,\
         Dy_wrt_CO_m, Dpy_wrt_CO_rad,\
         Dsigma_wrt_CO_m, Ddelta_wrt_CO = vectorize_all_coords(

diff --git a/...les/python/test_workflow_footprint/runsix → ...test_footprint_from_sixtrack_input/runsix b/...les/python/test_workflow_footprint/runsix → ...test_footprint_from_sixtrack_input/runsix
diff --git a/...n/test_workflow_footprint/runsix_trackfun → ...print_from_sixtrack_input/runsix_trackfun b/...n/test_workflow_footprint/runsix_trackfun → ...print_from_sixtrack_input/runsix_trackfun
diff --git a/examples/python/test_sis18/test_timings.py b/examples/python/test_sis18/test_timings.py
@@ -1,5 +1,6 @@
 from cpymad.madx import Madx
-import pysixtracklib as pyst
+import pysixtracklib as pystlib
+import pysixtrack
 
 import time
 from scipy.constants import e, m_p, c
@@ -26,13 +27,17 @@
 sis18 = mad.sequence.FODO
 
 nturns = 1
-elements = pyst.Elements.from_mad(sis18)
+ps_line, _ = pysixtrack.Line.from_madx_sequence(sis18)
+elements=pystlib.Elements()
+elements.append_line(ps_line)
+
+
 
 def prepare(npart=int(1e6), p0c=p0c, elements=elements, device='cpu'):
-    particles = pyst.Particles.from_ref(npart, p0c=p0c)
+    particles = pystlib.Particles.from_ref(npart, p0c=p0c)
     particles.x += np.linspace(0, 1e-6, npart)
 
-    job = pyst.TrackJob(elements, particles, device=device)
+    job = pystlib.TrackJob(elements, particles, device=device)
     return job
 
 class Timer(object):

diff --git a/examples/python/test_sps_mad/test_sps_mad.py b/examples/python/test_sps_mad/test_sps_mad.py
@@ -1,8 +1,8 @@
 import numpy as np
 import matplotlib.pyplot as pl
 from cpymad.madx import Madx
-import pysixtracklib as pyst
-
+import pysixtracklib as pystlib
+import pysixtrack
 
 # prepare madx
 mad = Madx()
@@ -15,23 +15,28 @@
 print(q1mad, q2mad)
 
 # Build elements for SixTrackLib
-elements = pyst.Elements.from_mad(mad.sequence.sps)
+elements = pystlib.Elements.from_line(
+        pysixtrack.Line.from_madx_sequence(mad.sequence.sps)[0])
 nturns = 2**14
+
+ps_line, _ = pysixtrack.Line.from_madx_sequence(mad.sequence.sps)
+elements=pystlib.Elements()
+elements.append_line(ps_line)
 bpm = elements.BeamMonitor(num_stores=nturns)
 
 # Track one turn
 npart = 10
-particles = pyst.Particles.from_ref(npart, p0c=26e6)
+particles = pystlib.Particles.from_ref(npart, p0c=26e6)
 particles.x += np.linspace(0, 1e-6, npart)
-job = pyst.TrackJob(elements, particles, until_turn_elem_by_elem=1)
+job = pystlib.TrackJob(elements, particles, until_turn_elem_by_elem=1)
 job.track_elem_by_elem(1)
 pl.plot(job.output.particles[0].x[1::10])
 
 # Track many turns CPU
 npart = 10
-particles = pyst.Particles.from_ref(npart, p0c=26e6)
+particles = pystlib.Particles.from_ref(npart, p0c=26e6)
 particles.x += np.linspace(0, 1e-6, npart)
-job = pyst.TrackJob(elements, particles)
+job = pystlib.TrackJob(elements, particles)
 job.track(nturns)
 
 # Find tunes
@@ -46,9 +51,9 @@
 npart = 5000
 nturns = 256
 bpm.num_stores = nturns
-particles = pyst.Particles.from_ref(npart, p0c=26e6)
+particles = pystlib.Particles.from_ref(npart, p0c=26e6)
 particles.x += np.linspace(0, 1e-1, npart)
-job = pyst.TrackJob(elements, particles, device="opencl:0.0")
+job = pystlib.TrackJob(elements, particles)#, device="opencl:0.0")
 job.track(nturns)
 job.collect()