Skip to content
Snippets Groups Projects
Unverified Commit 563e28a7 authored by Mark K Jones's avatar Mark K Jones Committed by GitHub
Browse files

Update the HB vertical aperture and SHMS collimator distance (#37)

* Update mc_shms.f

Update collimator distance to HB center from 80cm to 82.79892cm from update drawing fro Bert Metzger on Dec 2020.
Also removed 0.8cm "flare" from the HB collimator exit size since the code is now using the correcct exit sizes instead of flaring 0.8cm from
the entrance sizes.

* Update apertures_shms.inc

Modified vertical HB acceptance from 11.5 to 11.2 cm according to drawing from Bert Metzger Dec 2020
parent 8799a8f6
Branches master
No related tags found
No related merge requests found
......@@ -6,7 +6,7 @@ C Aperture Limits:
real*8 r_D1
real*8 r_BP
parameter (r_HBx = 11.5) !HB vertical radius
parameter (r_HBx = 11.2) !HB vertical radius
parameter (r_HBfym = -4.13) !HB entrance -y
parameter (r_HBfyp = 11.75)!HB entrance +y
......
......@@ -189,7 +189,7 @@ C Distances for 2017 ME's
parameter(zd_hbmex = 80.0)
parameter(zd_hbout = 17.61)
c parameter (z_entr = 52.04) ! 6.35 cm in front of Q1
parameter (z_entr = 22.4) ! 80 cm from center of HB
parameter (z_entr = 25.189) ! 82.789cm from center of HB
parameter (z_thick =6.35) !6.35 cm thick
parameter(zd_q1in = 58.39)
parameter(zd_q1men = 28.35) !shms-2017 ME's
......@@ -496,23 +496,21 @@ c call project(xt,yt,zdrift,decay_flag,dflag,m2,p,pathlen) !project
goto 500
endif
! back of collimator 0.8 cm (80 mrad) flare in all directions
zdrift = z_thick
xt=xt + zdrift*dxdzs
yt=yt + zdrift*dydzs
c call project(xt,yt,zdrift,decay_flag,dflag,m2,p,pathlen) !project
if (abs(yt-y_off).gt.(h_exit+0.8)) then
if (abs(yt-y_off).gt.(h_exit)) then
shmsSTOP_COLL_hor = shmsSTOP_COLL_hor + 1
shmsSTOP_id = 5
goto 500
endif
if (abs(xt-x_off).gt.(v_exit+0.8)) then
if (abs(xt-x_off).gt.(v_exit)) then
shmsSTOP_COLL_vert = shmsSTOP_COLL_vert + 1
shmsSTOP_id = 5
goto 500
endif
if (abs(xt-x_off).gt. ((-v_exit-0.8)/(h_exit+0.8)*abs(yt-y_off)+3*(v_exit+0.8)/2)) then
if (abs(xt-x_off).gt. ((-v_exit)/(h_exit)*abs(yt-y_off)+3*(v_exit)/2)) then
shmsSTOP_COLL_oct = shmsSTOP_COLL_oct + 1
shmsSTOP_id = 5
goto 500
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment