Skip to content
Snippets Groups Projects
Commit 08598b44 authored by Dave Gaskell's avatar Dave Gaskell
Browse files

Replace fry with xtar in call to mc_shms/mc_hms (mimic hcana behavior)

parent fbbff869
No related branches found
No related tags found
No related merge requests found
...@@ -1295,6 +1295,7 @@ c enddo ...@@ -1295,6 +1295,7 @@ c enddo
real*8 x_E_arm,y_E_arm,z_E_arm,dx_E_arm,dy_E_arm,delta_E_arm real*8 x_E_arm,y_E_arm,z_E_arm,dx_E_arm,dy_E_arm,delta_E_arm
real*8 x_P_arm,y_P_arm,z_P_arm,dx_P_arm,dy_P_arm,delta_P_arm real*8 x_P_arm,y_P_arm,z_P_arm,dx_P_arm,dy_P_arm,delta_P_arm
real*8 xtar_init
real*8 xfp, yfp, dxfp, dyfp real*8 xfp, yfp, dxfp, dyfp
real*8 eloss_E_arm, eloss_P_arm, r, beta, dangles(2), dang_in(2) real*8 eloss_E_arm, eloss_P_arm, r, beta, dangles(2), dang_in(2)
logical success logical success
...@@ -1422,6 +1423,7 @@ C DJG moved this to the last part of generate!!! ...@@ -1422,6 +1423,7 @@ C DJG moved this to the last part of generate!!!
x_P_arm = x_P_arm - z_P_arm*dx_P_arm x_P_arm = x_P_arm - z_P_arm*dx_P_arm
y_P_arm = y_P_arm - z_P_arm*dy_P_arm y_P_arm = y_P_arm - z_P_arm*dy_P_arm
z_P_arm = 0.0 z_P_arm = 0.0
xtar_init=x_P_arm
main%SP%p%z=y_P_arm main%SP%p%z=y_P_arm
...@@ -1447,7 +1449,7 @@ C DJG moved this to the last part of generate!!! ...@@ -1447,7 +1449,7 @@ C DJG moved this to the last part of generate!!!
call mc_hms(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm, call mc_hms(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm,
> y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp, > y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp,
> m2, mc_smear, mc_smear, doing_decay, > m2, mc_smear, mc_smear, doing_decay,
> ntup%resfac, fry, ok_P_arm, pathlen) > ntup%resfac, xtar_init, ok_P_arm, pathlen)
else if (hadron_arm.eq.2) then else if (hadron_arm.eq.2) then
call mc_sos(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm, call mc_sos(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm,
> y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp, > y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp,
...@@ -1467,7 +1469,7 @@ C DJG moved this to the last part of generate!!! ...@@ -1467,7 +1469,7 @@ C DJG moved this to the last part of generate!!!
call mc_shms(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm, call mc_shms(spec%p%P, spec%p%theta, delta_P_arm, x_P_arm,
> y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp, > y_P_arm, z_P_arm, dx_P_arm, dy_P_arm, xfp, dxfp, yfp, dyfp,
> m2, mc_smear, mc_smear, doing_decay, > m2, mc_smear, mc_smear, doing_decay,
> ntup%resfac, fry, ok_P_arm, pathlen, hadron_arm, use_first_cer) > ntup%resfac, xtar_init, ok_P_arm, pathlen, hadron_arm)
endif endif
...@@ -1606,6 +1608,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100. ...@@ -1606,6 +1608,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100.
x_E_arm = x_E_arm - z_E_arm*dx_E_arm x_E_arm = x_E_arm - z_E_arm*dx_E_arm
y_E_arm = y_E_arm - z_E_arm*dy_E_arm y_E_arm = y_E_arm - z_E_arm*dy_E_arm
z_E_arm = 0.0 z_E_arm = 0.0
xtar_init = x_E_arm
main%SP%e%z=y_E_arm main%SP%e%z=y_E_arm
...@@ -1630,7 +1633,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100. ...@@ -1630,7 +1633,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100.
call mc_hms(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm, call mc_hms(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm,
> y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp, > y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp,
> me2, mc_smear, mc_smear, .false., > me2, mc_smear, mc_smear, .false.,
> tmpfact, fry, ok_E_arm, pathlen) > tmpfact, xtar_init, ok_E_arm, pathlen)
else if (electron_arm.eq.2) then else if (electron_arm.eq.2) then
call mc_sos(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm, call mc_sos(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm,
> y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp, > y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp,
...@@ -1650,7 +1653,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100. ...@@ -1650,7 +1653,7 @@ C recon%p%delta = (recon%p%P-spec%p%P)/spec%p%P*100.
call mc_shms(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm, call mc_shms(spec%e%P, spec%e%theta, delta_E_arm, x_E_arm,
> y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp, > y_E_arm, z_E_arm, dx_E_arm, dy_E_arm, xfp, dxfp, yfp, dyfp,
> me2, mc_smear, mc_smear, .false., > me2, mc_smear, mc_smear, .false.,
> tmpfact, fry, ok_E_arm, pathlen, electron_arm, use_first_cer) > tmpfact, xtar_init, ok_E_arm, pathlen, electron_arm)
else if (electron_arm.eq.7 .or. electron_arm .eq. 8) then else if (electron_arm.eq.7 .or. electron_arm .eq. 8) then
if (abs(spec%p%phi-pi/2) .eq. 10.) then if (abs(spec%p%phi-pi/2) .eq. 10.) then
zhadron = -recon%p%z*(cos(spec%p%theta)/tan(spec%p%theta+recon%p%yptar)+sin(spec%p%theta)) ! recon.p.z is really ytgt zhadron = -recon%p%z*(cos(spec%p%theta)/tan(spec%p%theta+recon%p%yptar)+sin(spec%p%theta)) ! recon.p.z is really ytgt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment