Skip to content

Commit

Permalink
Cosmetics, run3 machine, and optics links.
Browse files Browse the repository at this point in the history
  • Loading branch information
freddieknets committed Mar 31, 2020
1 parent 94bdb92 commit 64f45f2
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions optics/hl14_injection.madx
1 change: 1 addition & 0 deletions optics/lhcRun3_collision.madx
1 change: 1 addition & 0 deletions sequences/hl14_thin.madx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ver_lhc_run = 0;
ver_hllhc_optics = 1.4;

! Get the toolkit
option, -echo, warn,-info;
call, file="/afs/cern.ch/eng/lhc/optics/HLLHCV1.4/toolkit/macro.madx";


Expand Down
36 changes: 36 additions & 0 deletions sequences/lhcRun3_thin.madx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
! Specify machine version
ver_lhc_run = 3;
ver_hllhc_optics = 0;

! Get the toolkit
call, file="/afs/cern.ch/eng/lhc/optics/runII/2018/toolkit/macro.madx";


if (mylhcbeam==4){
call,file="/afs/cern.ch/eng/lhc/optics/runII/2018/lhcb4_as-built.seq";
} else {
call,file="/afs/cern.ch/eng/lhc/optics/runII/2018/lhc_as-built.seq";
};

option, -echo,warn,-info;

call,file="/afs/cern.ch/eng/lhc/optics/runIII/RunIII_dev/IR7-Run3seqedit.madx"; ! New IR7 MQW layout and cabling



slicefactor=4;
option rbarc=true;
call, file = "/afs/cern.ch/eng/lhc/optics/runII/2018/toolkit/myslice.madx";


beam; // a generic beam definitions
use, sequence=lhcb1;
makethin, sequence=lhcb1, style=teapot, makedipedge=false ;
use, sequence=lhcb2;
makethin, sequence=lhcb2, style=teapot, makedipedge=false;

!Cycling w.r.t. to IP3 (mandatory to find closed orbit in collision in the presence of errors)
if (mylhcbeam<3){
seqedit, sequence=lhcb1; flatten; cycle, start=IP3; flatten; endedit;
};
seqedit, sequence=lhcb2; flatten; cycle, start=IP3; flatten; endedit;

0 comments on commit 64f45f2

Please sign in to comment.