Merge branch 'release/0.96.1'

Author: szymonlopaciuk

test_data/hllhc14_no_errors_with_coupling_knobs/000_generate_line_jsons.py

@@ -10,33 +10,26 @@
 import xpart as xp
 import xobjects as xo
 
-mad_b1 = Madx()
+env = xt.load('lhcb1_seq.madx')
+line_b1 = env.lhcb1
+line_b1.set_particle_ref('proton', energy0=7000e9)
 
-mad_b1.call("lhcb1_seq.madx")
-mad_b1.use('lhcb1')
-mad_b1.twiss()
-
-line_b1 = xt.Line.from_madx_sequence(sequence=mad_b1.sequence.lhcb1,
-    deferred_expressions=True, apply_madx_errors=True, install_apertures=True)
-line_b1.particle_ref = xp.Particles(mass0=xp.PROTON_MASS_EV, q0=1,
-                                    gamma0=mad_b1.sequence.lhcb1.beam.gamma)
+# Set cavity frequency
+tt_cav = line_b1.get_table().rows.match(element_type='Cavity')
+for nn in tt_cav['name']:
+    line_b1[nn].frequency = 400.79e6
 
 with open('line_b1.json', 'w') as fid:
     json.dump(line_b1.to_dict(), fid, cls=xo.JEncoder)
 
-mad_b4 = Madx()
-mad_b4.call("lhcb4_seq.madx")
-mad_b4.use('lhcb2')
-mad_b4.twiss()
-
-line_b4 = xt.Line.from_madx_sequence(sequence=mad_b4.sequence.lhcb2,
-    deferred_expressions=True, apply_madx_errors=True, install_apertures=True)
+env4 = xt.load('lhcb4_seq.madx')
+line_b4 = env4.lhcb2
+line_b4.set_particle_ref('proton', energy0=7000e9)
 
-line_b4.particle_ref = xp.Particles(mass0=xp.PROTON_MASS_EV, q0=1,
-                                    gamma0=mad_b4.sequence.lhcb2.beam.gamma)
+# Set cavity frequency
+tt_cav = line_b4.get_table().rows.match(element_type='Cavity')
+for nn in tt_cav['name']:
+    line_b4[nn].frequency = 400.79e6
 
 with open('line_b4.json', 'w') as fid:
     json.dump(line_b4.to_dict(), fid, cls=xo.JEncoder)
-
-
-

test_data/hllhc14_no_errors_with_coupling_knobs/line_b1.json

@@ -22,22 +22,18 @@
 nemitt_x=2.5e-6
 nemitt_y=2.5e-6
 
-mad = Madx()
-mad.call('sps_thin.seq')
-mad.use(seq_name)
+env = xt.load('sps_thin.seq')
+line = env.sps
+line.set_particle_ref('proton', energy0=26e9)
 
-line = xt.Line.from_madx_sequence(
-                                            mad.sequence[seq_name],
-                                            install_apertures=True)
 # enable RF
 V_RF = 3e6
 line['acta.31637'].voltage = V_RF
 line['acta.31637'].lag = 180.
+line['acta.31637'].frequency = 200.266e6
 
 # A test particle
-part = xp.Particles(gamma0=mad.sequence[seq_name].beam.gamma,
-                    mass0=xp.PROTON_MASS_EV)
-line.particle_ref = part.copy()
+part = line.particle_ref.copy()
 part.x += 2e-3
 part.y += 3e-3
 part.zeta += 20e-2