Skip to content
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

Jump to bottom

Omega branch pull request #39

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Omega branch pull request #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ae02f98
omega v1.0
huberg Apr 17, 2014
e0332ef
omega v1.0.1
huberg Apr 17, 2014
505432b
first attempt at phi, update K+ generators
huberg Jan 9, 2015
4d53f01
Changes for new gfortran treatment of double precision variables and …
huberg Nov 25, 2015
b01d072
Add physics_piKmodel.f which allows simulations using VGL or VR model
huberg Dec 4, 2015
cc063c9
suppress warning after 500 prints
huberg Jan 9, 2016
9e0a242
1) Added HMS collimator routines from Fpi-2 analysis
huberg Mar 1, 2016
3355ed0
New release of u-channel generators for omega,phi and background chan…
Dec 28, 2017
fe88b2f
Changes to u-channel generators:
huberg Feb 5, 2018
c8a27c5
event.f physics_pizero.f -- bug fixes.
huberg Feb 23, 2018
d220033
minor fix
huberg Feb 23, 2018
0894b3f
Initial u-channel DVCS generator based on KM15 model.
huberg Mar 11, 2018
61db176
Merge remote-tracking branch 'upstream/master' into omega
huberg Jan 20, 2020
4a278db
Misc input file changes
huberg Jan 20, 2020
e8f023d
Update for latest changes in JLab Master
huberg Jun 24, 2021
2e93668
Update for latest changes from JLab Master
huberg Jun 24, 2021
a72e38d
Merge remote-tracking branch 'upstream/master' into omega
huberg Jun 25, 2021
616f772
Merge remote-tracking branch 'upstream/master' into omega
huberg Jun 25, 2021
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
117,000 changes: 117,000 additions & 0 deletions CFFoutput_LO.dat
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ D = $(simcdir)/fdss/

OBJ1 = target.o brem.o gauss1.o NtupleInit.o NtupleClose.o enerloss_new.o
OBJ2 = radc.o init.o dbase.o physics_kaon.o physics_pion.o physics_delta.o physics_proton.o loren.o sf_lookup.o
OBJ3 = semi_physics.o rho_physics.o rho_decay.o generate_rho.o trg_track.o semi_dilution.o
#gh: switch between physics_piKmodel and physics_pion,kaon
#OBJ2 = radc.o init.o dbase.o physics_piKmodel.o physics_delta.o physics_proton.o loren.o sf_lookup.o
OBJ3 = semi_physics.o rho_physics.o rho_decay.o generate_rho.o trg_track.o semi_dilution.o
OBJ3a = physics_omega.o physics_Xphasespace.o physics_rho_recoil.o physics_phi.o
OBJ3b = physics_eta.o physics_eta_prime.o physics_pizero.o physics_dvcs.o
OBJ4 = results_write.o event.o call_ranlux.o jacobians.o F1F2IN21.o
OBJ5 = $(A)musc.o $(A)musc_ext.o $(A)project.o $(A)transp.o
OBJ6 = $(A)rotate_haxis.o $(A)rotate_vaxis.o $(A)locforunt.o
OBJ7 = $(H)mc_hms.o $(H)mc_hms_hut.o $(H)mc_hms_recon.o
OBJ7 = $(H)mc_hms.o $(H)mc_hms_hut.o $(H)mc_hms_recon.o $(H)coll_absorb.o $(H)mc_hms_coll.o
OBJ8 = $(S)mc_sos.o $(S)mc_sos_hut.o $(S)mc_sos_recon.o
OBJ9 = $(R)mc_hrsr.o $(R)mc_hrsr_hut.o $(R)mc_hrsr_recon.o
OBJA = $(L)mc_hrsl.o $(L)mc_hrsl_hut.o $(L)mc_hrsl_recon.o
Expand All @@ -39,15 +43,14 @@ OBJC = $(T)Ctq5Pdf.o
OBJD = $(C)mc_calo.o $(C)mc_calo_recon.o
OBJCH = $(CH)lfit.o $(CH)ranlux.o $(CH)fint.o $(CH)kerset.o $(CH)abend.o
OBJF = $(D)fdss.o

my_objs = $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) $(OBJ9) $(OBJA) $(OBJB) $(OBJC) $(OBJD) $(OBJCH) $(OBJF)

my_objs = $(OBJ1) $(OBJ2) $(OBJ3) $(OBJ3a) $(OBJ3b) $(OBJ4) $(OBJ5) $(OBJ6) $(OBJ7) $(OBJ8) $(OBJ9) $(OBJA) $(OBJB) $(OBJC) $(OBJD) $(OBJCH) $(OBJF)
my_deps = $(my_objs:.o=.d)

MYOS := $(subst -,,$(shell uname))
#CERNLIBS = -lgeant$(GEANTVER) -lpawlib -lgraflib -lgrafX11 -lpacklib -lmathlib
#CERNLIBS = -Wl,-static -lgeant$(GEANTVER) -lpawlib -lgraflib -lgrafX11 -lpacklib -lkernlib -lmathlib -ljetset74 -Wl,-dy

# static version
CERNLIBS = -Wl,-static -lgeant$(GEANTVER) -lpawlib -lgraflib -lgrafX11 -lpacklib -lkernlib -lmathlib -Wl,-dy

#For use with gfortran compiler
# -fno-automatic - all program storage treated as static
Expand Down
89 changes: 58 additions & 31 deletions NtupleInit.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,70 +96,97 @@ subroutine NtupleInit(filename)
NtupleTag(m) = 'thetapq' ! 32
m = m+1
NtupleTag(m) = 'phipq' ! 33
if (doing_pion .or. doing_kaon .or. doing_delta) then
if (doing_pion .or. doing_kaon .or. doing_eep .or. doing_eepx
> .or. doing_delta .or. doing_Xphasespace) then
m = m+1
NtupleTag(m) = 'missmass' ! 34
NtupleTag(m) = 'thetacm' ! 34
m = m+1
NtupleTag(m) = 'mmnuc' ! 35
NtupleTag(m) = 'missmass' ! 35
m = m+1
NtupleTag(m) = 'phad' ! 36
NtupleTag(m) = 'mmnuc' ! 36
m = m+1
NtupleTag(m) = 't' ! 37
NtupleTag(m) = 'phad' ! 37
m = m+1
NtupleTag(m) = 'pmpar' ! 38
NtupleTag(m) = 't' ! 38
m = m+1
NtupleTag(m) = 'pmper' ! 39
NtupleTag(m) = 'pmpar' ! 39
m = m+1
NtupleTag(m) = 'pmoop' ! 40
NtupleTag(m) = 'pmper' ! 40
m = m+1
NtupleTag(m) = 'fry' ! 41 !+y is up.
NtupleTag(m) = 'pmoop' ! 41
m = m+1
NtupleTag(m) = 'radphot' ! 42
NtupleTag(m) = 'fry' ! 42 !+y is up.
m = m+1
NtupleTag(m) = 'radphot' ! 43
m = m+1
NtupleTag(m) = 'pfermi' ! 44
m = m+1
NtupleTag(m) = 'pfermi' ! 43
NtupleTag(m) = 'siglab' ! 45
m = m+1
NtupleTag(m) = 'siglab' ! 44
NtupleTag(m) = 'sigcm' ! 46
m = m+1
NtupleTag(m) = 'sigcm' ! 45
NtupleTag(m) = 'Weight' ! 47
m = m+1
NtupleTag(m) = 'Weight' ! 46
NtupleTag(m) = 'decdist' ! 48
m = m+1
NtupleTag(m) = 'decdist' ! 47
NtupleTag(m) = 'Mhadron' ! 49
m = m+1
NtupleTag(m) = 'Mhadron' ! 48
c NtupleTag(m) = 'pdotqhat' ! 50
NtupleTag(m) = 'MM2' ! 50
m = m+1
NtupleTag(m) = 'pdotqhat' ! 49
NtupleTag(m) = 'Q2i' ! 51
m = m+1
NtupleTag(m) = 'Q2i' ! 50
NtupleTag(m) = 'Wi' ! 52
m = m+1
NtupleTag(m) = 'Wi' ! 51
NtupleTag(m) = 'ti' ! 53
m = m+1
NtupleTag(m) = 'ti' ! 52
NtupleTag(m) = 'thetapqi' ! 54
m = m+1
NtupleTag(m) = 'phipqi' ! 53
NtupleTag(m) = 'phipqi' ! 55
m = m+1
NtupleTag(m) = 'thetacmi' ! 56
m = m+1
NtupleTag(m) = 'PMsigned' ! 57
if(using_tgt_field) then
m = m+1
NtupleTag(m) = 'th_tarq' ! 54
NtupleTag(m) = 'th_tarq' ! 58
m = m+1
NtupleTag(m) = 'phitarq' ! 55
NtupleTag(m) = 'phitarq' ! 59
m = m+1
NtupleTag(m) = 'beta' ! 56
NtupleTag(m) = 'beta' ! 60
m = m+1
NtupleTag(m) = 'phis' ! 57
NtupleTag(m) = 'phis' ! 61
m = m+1
NtupleTag(m) = 'phic' ! 58
NtupleTag(m) = 'phic' ! 62
m = m+1
NtupleTag(m) = 'betai' ! 59
NtupleTag(m) = 'betai' ! 63
m = m+1
NtupleTag(m) = 'phisi' ! 60
NtupleTag(m) = 'phisi' ! 64
m = m+1
NtupleTag(m) = 'phici' ! 61
NtupleTag(m) = 'phici' ! 65
endif
if (doing_kaon) then
m = m+1
NtupleTag(m) = 'saghai' ! 54
NtupleTag(m) = 'saghai' ! 58 or 66
m = m+1
NtupleTag(m) = 'factor' ! 59 or 67
else if (doing _eepx.or.doing_Xphasespace) then
m = m+1
NtupleTag(m) = 'thetamq' ! 58 or 66
m = m+1
NtupleTag(m) = 'factor' ! 55
NtupleTag(m) = 'phimq' ! 59 or 67
m=m+1
NtupleTag(m) = 'minus_u' ! 60 or 68
m=m+1
NtupleTag(m) = 'phicmi' ! 61 or 69
m=m+1
NtupleTag(m) = 'tprimei' ! 62 or 70
m=m+1
NtupleTag(m) = 'wcmi' ! 63 or 71
m=m+1
NtupleTag(m) = 'epsiloni' ! 64 or 72
m=m+1
NtupleTag(m) = 'ui' ! 65 or 73
endif
else if (doing_semi.or.doing_rho) then
m = m+1
Expand Down
93 changes: 53 additions & 40 deletions constants.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,58 @@
! CONSTANTS.INC

! Note: All angles are in radians
! All distances are in cm
! All energies (momenta,masses) are in MeV
! All deltas are in percent
! All densities (thicknesses) are in g/cm3 (g/cm2)
! All B fields are in kG
! All roads lead to infinity
! All distances are in cm
! All energies (momenta,masses) are in MeV
! All deltas are in percent
! All densities (thicknesses) are in g/cm3 (g/cm2)
! All B fields are in kG
! All roads lead to infinity

! ... some physical constants
real*8 Me, Me2, Mp, Mp2, Mn, Mn2, Mpi, Mpi2, Mpi0, Mpi02
real*8 Mk, Mk2, Mrho, Mrho2,Md, Md2
real*8 Mlambda, Msigma0, Msigma_minus
real*8 MDelta, Delta_width
real*8 amu, hbarc, pi, twopi, alpha, alpi, degrad, euler
parameter (Me=0.51099906)
parameter (Me2=Me**2)
parameter (Mp=938.27231)
parameter (Mp2=Mp**2)
parameter (Mn=939.56563)
parameter (Mn2=Mn**2)
parameter (Mpi=139.57018)
parameter (Mpi2=Mpi**2)
parameter (Mpi0=134.9766)
parameter (Mpi02=Mpi0**2)
parameter (Mk=493.677)
parameter (Mk2=Mk**2)
parameter (Mrho=769.3)
parameter (Mrho2=Mrho**2)
parameter (Md=1875.613)
parameter (Md2=Md**2)
parameter (Mlambda=1115.68)
parameter (Msigma0=1192.64)
parameter (Msigma_minus=1197.45)
parameter (MDelta = 1232.0)
parameter (Delta_width = 117.0)
parameter (amu=931.49432)
parameter (hbarc=197.327053)
parameter (pi=3.141592653589793)
parameter (twopi=2.*pi)
parameter (alpha=1./137.0359895)
parameter (alpi=alpha/pi)
parameter (degrad=180./pi)
parameter (euler=0.577215665)
real*8 Me, Me2, Mp, Mp2, Mn, Mn2, Mpi, Mpi2, Mpi0, Mpi02
real*8 Meta, Meta2, Mk, Mk2, Mrho, Mrho2, MrhoW
real*8 Momega, Momega2, MomegaW, Md, Md2
real*8 Metap, Metap2, Mphi, Mphi2, MphiW
real*8 Mlambda, Msigma0, Msigma_minus
real*8 MDelta, Delta_width
real*8 amu, hbarc, pi, twopi, alpha, alpi, degrad, euler
parameter (Me=0.51099906)
parameter (Me2=Me**2)
parameter (Mpi=139.57018)
parameter (Mpi2=Mpi**2)
parameter (Mpi0=134.9766)
parameter (Mpi02=Mpi0**2)
parameter (Mk=493.677)
parameter (Mk2=Mk**2)
parameter (Meta=547.86) !2014 PDG value
parameter (Meta2=Meta**2)
parameter (Mrho=775.5) !2006 PDG value
parameter (Mrho2=Mrho**2)
parameter (MrhoW=149.4) !2006 PDG value
parameter (Momega=782.65) !2006 PDG value
parameter (Momega2=Momega**2)
parameter (MomegaW=8.49) !2006 PDG value
parameter (Mp=938.27231)
parameter (Mp2=Mp**2)
parameter (Mn=939.56563)
parameter (Mn2=Mn**2)
parameter (Metap=957.78) !2014 PDG value
parameter (Metap2=Metap**2)
parameter (Mphi=1019.455)
parameter (Mphi2=Mphi**2)
parameter (MphiW=4.26)
parameter (Mlambda=1115.68)
parameter (Msigma0=1192.64)
parameter (Msigma_minus=1197.45)
parameter (MDelta = 1232.0)
parameter (Delta_width = 117.0)
parameter (Md=1875.613)
parameter (Md2=Md**2)
parameter (amu=931.49432)
parameter (hbarc=197.327053)
parameter (pi=3.141592653589793)
parameter (twopi=2.*pi)
parameter (alpha=1./137.0359895)
parameter (alpi=alpha/pi)
parameter (degrad=180./pi)
parameter (euler=0.577215665)
Loading