Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
simc_gfortran
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jlab
hallc
simulation
simc_gfortran
Commits
08598b44
Commit
08598b44
authored
2 years ago
by
Dave Gaskell
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
simc.f
+7
-4
7 additions, 4 deletions
simc.f
with
7 additions
and
4 deletions
simc.f
+
7
−
4
View file @
08598b44
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment