Adapt example

Author: giadarol

examples/multiline_matching/000_multiline_match.py

@@ -52,11 +52,12 @@
 assert np.isclose(tw1.lhcb2.qy, 60.325, atol=1e-4, rtol=0)
 
 # Match bumps in the two likes
+tw0 = collider.twiss(lines=['lhcb1', 'lhcb2'])
 collider.match(
     lines=['lhcb1', 'lhcb2'],
     ele_start=['mq.33l8.b1', 'mq.22l8.b2'],
     ele_stop=['mq.23l8.b1', 'mq.32l8.b2'],
-    twiss_init='preserve',
+    twiss_init=tw0, ele_init=xt.START,
     vary=[
         xt.VaryList([
             'acbv30.l8b1', 'acbv28.l8b1', 'acbv26.l8b1', 'acbv24.l8b1'],
@@ -71,10 +72,10 @@
         xt.Target('y', at='mb.b27l8.b2', line='lhcb2', value=2e-3, tol=1e-4, scale=1),
         xt.Target('py', at='mb.b27l8.b2', line='lhcb2', value=0, tol=1e-6, scale=1000),
         # I want the bump to be closed
-        xt.TargetList(['y'], at='mq.23l8.b1', line='lhcb1', value='preserve', tol=1e-6, scale=1),
-        xt.TargetList(['py'], at='mq.23l8.b1', line='lhcb1', value='preserve', tol=1e-7, scale=1000),
-        xt.TargetList(['y'], at='mq.32l8.b2', line='lhcb2', value='preserve', tol=1e-6, scale=1),
-        xt.Target('py', at='mq.32l8.b2', line='lhcb2', value='preserve', tol=1e-10, scale=1000),
+        xt.TargetList(['y'], at='mq.23l8.b1', line='lhcb1', value=tw0, tol=1e-6, scale=1),
+        xt.TargetList(['py'], at='mq.23l8.b1', line='lhcb1', value=tw0, tol=1e-7, scale=1000),
+        xt.TargetList(['y'], at='mq.32l8.b2', line='lhcb2', value=tw0, tol=1e-6, scale=1),
+        xt.Target('py', at='mq.32l8.b2', line='lhcb2', value=tw0, tol=1e-10, scale=1000),
     ]
 )
 tw_bump = collider.twiss(lines=['lhcb1', 'lhcb2'])

xmask/lhc/leveling.py

@@ -46,6 +46,7 @@ def luminosity_leveling(collider, config_lumi_leveling, config_beambeam):
         else:
             raise ValueError('Either `luminosity` or `separation_in_sigmas` must be specified')
 
+        tw0 = collider.twiss()
         if config_this_ip['impose_separation_orthogonal_to_crossing']:
             targets.append(
                 xt.TargetSeparationOrthogonalToCrossing(ip_name='ip8'))
@@ -62,10 +63,10 @@ def luminosity_leveling(collider, config_lumi_leveling, config_beambeam):
         for line_name in ['lhcb1', 'lhcb2']:
             targets += [
                 # Preserve crossing angle
-                xt.TargetList(['px', 'py'], at=ip_name, line=line_name, value='preserve', tol=1e-7, scale=1e3),
+                xt.TargetList(['px', 'py'], at=ip_name, line=line_name, value=tw0, tol=1e-7, scale=1e3),
                 # Close the bumps
-                xt.TargetList(['x', 'y'], at=bump_range[line_name][-1], line=line_name, value='preserve', tol=1e-5, scale=1),
-                xt.TargetList(['px', 'py'], at=bump_range[line_name][-1], line=line_name, value='preserve', tol=1e-5, scale=1e3),
+                xt.TargetList(['x', 'y'], at=bump_range[line_name][-1], line=line_name, value=tw0, tol=1e-5, scale=1),
+                xt.TargetList(['px', 'py'], at=bump_range[line_name][-1], line=line_name, value=tw0, tol=1e-5, scale=1e3),
             ]
 
         vary.append(xt.VaryList(config_this_ip['corrector_knob_names'], step=1e-7))
@@ -75,7 +76,7 @@ def luminosity_leveling(collider, config_lumi_leveling, config_beambeam):
             lines=['lhcb1', 'lhcb2'],
             ele_start=[bump_range['lhcb1'][0], bump_range['lhcb2'][0]],
             ele_stop=[bump_range['lhcb1'][-1], bump_range['lhcb2'][-1]],
-            twiss_init='preserve',
+            twiss_init=tw0, ele_init=xt.START,
             targets=targets,
             vary=vary,
             solve=False,