Skip to content

fixed wire insallation for lhcb4 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −17
Open

fixed wire insallation for lhcb4 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions python_examples/run3_collisions_wire/bbcw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@
('bbcwe.4r5.d.b2' ,'147.35+(308-ip5ofs.b2)*ds','ip5'),
('bbcwi.4r5.d.b2' ,'147.35+(308-ip5ofs.b2)*ds','ip5')]

WIRE_INSTALL_FALLBACK['b4'] = [('bbcwb.a4r1.d.b2','-145.35+(0-ip1ofs.b2)*ds' ,'ip1'),
('bbcwt.a4r1.d.b2','-145.35+(0-ip1ofs.b2)*ds' ,'ip1'),
('bbcwb.a4r1.u.b2','-146.54+(0-ip1ofs.b2)*ds' ,'ip1'),
('bbcwt.a4r1.u.b2','-146.54+(0-ip1ofs.b2)*ds' ,'ip1'),
('bbcwe.4r5.u.b2' ,'-148.54+(308-ip5ofs.b2)*ds','ip5'),
('bbcwi.4r5.u.b2' ,'-148.54+(308-ip5ofs.b2)*ds','ip5'),
('bbcwe.4r5.d.b2' ,'-147.35+(308-ip5ofs.b2)*ds','ip5'),
('bbcwi.4r5.d.b2' ,'-147.35+(308-ip5ofs.b2)*ds','ip5')]




Expand Down Expand Up @@ -79,14 +88,19 @@

# Utilities
#=====================================================
def install_wires(mad,configuration,seq_name):
def install_wires(mad,mylhcbeam,configuration,seq_name):

# installing monitors if not in seq_name:
if configuration['wires_at_fallback']:
to_install = pd.DataFrame(WIRE_INSTALL_FALLBACK[seq_name[-2:]],columns=['element','at','from'])
# Remove first
to_remove = pd.DataFrame(WIRE_INSTALL_FALLBACK[f'b{mylhcbeam}'],columns=['element','at','from'])
to_remove.insert(0,'mode','remove')
pmTools.seqedit(mad,seq_name=seq_name,editing = to_remove)

# Then install
to_install = pd.DataFrame(WIRE_INSTALL_FALLBACK[f'b{mylhcbeam}'],columns=['element','at','from'])
to_install.insert(0,'mode','install')
to_install.insert(2,'class','monitor')

pmTools.seqedit(mad,seq_name=seq_name,editing = to_install)


Expand Down
21 changes: 7 additions & 14 deletions python_examples/run3_collisions_wire/optics_specific_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ def build_sequence(mad, beam, configuration):
#slicefactor = 2 # For testing
slicefactor = 8 # For production

pm.make_links(force=True, links_dict={
'optics_runII': '/afs/cern.ch/eng/lhc/optics/runII',
'optics_runIII': '/afs/cern.ch/eng/lhc/optics/runIII',})

mylhcbeam = int(beam)

mad.input('ver_lhc_run = 3')
Expand All @@ -27,7 +23,7 @@ def build_sequence(mad, beam, configuration):
mad.input('option, -echo,warn, -info;')

# optics dependent macros (for splitting)
mad.call('optics_runII/2018/toolkit/macro.madx')
mad.call('tracking_tools/macro.madx')

# Redefine macros
_redefine_crossing_save_disable_restore(mad)
Expand All @@ -37,23 +33,20 @@ def build_sequence(mad, beam, configuration):

assert mylhcbeam in [1, 2, 4], "Invalid mylhcbeam (it should be in [1, 2, 4])"

# if mylhcbeam in [1, 2]:
# mad.call('/afs/cern.ch/eng/acc-models/lhc/current/lhc.seq')
# else:
# mad.call('/afs/cern.ch/eng/acc-models/lhc/current/lhcb4.seq')

if mylhcbeam in [1, 2]:
mad.call('optics_runII/2018/lhc_as-built.seq')
mad.call('tracking_tools/../../Sequences/lhc.seq')
else:
mad.call('optics_runII/2018/lhcb4_as-built.seq')
mad.call('tracking_tools/../../Sequences/lhcb4.seq')

# New IR7 MQW layout and cabling
mad.call('optics_runIII/RunIII_dev/IR7-Run3seqedit.madx')
mad.call('tracking_tools/IR7-Run3seqedit.madx')

# Makethin part
if slicefactor > 0:
# the variable in the macro is slicefactor
mad.input(f'slicefactor={slicefactor};')
mad.call('optics_runII/2018/toolkit/myslice.madx')
mad.call('tracking_tools/myslice.madx')
mad.beam()
for my_sequence in ['lhcb1','lhcb2']:
if my_sequence in list(mad.sequence):
Expand All @@ -71,7 +64,7 @@ def build_sequence(mad, beam, configuration):
# Installing wires in collimators
if configuration['install_wires']:
for my_sequence in ['lhcb1','lhcb2']:
bbcw.install_wires(mad,configuration,seq_name=my_sequence)
bbcw.install_wires(mad,mylhcbeam,configuration,seq_name=my_sequence)



Expand Down