diff --git a/event.f b/event.f index 14cd460999e9fb87cb32af38e126b45ecc741b6a..dad8a6a87c3939affec1d14694c1774158f95c7c 100644 --- a/event.f +++ b/event.f @@ -1398,19 +1398,26 @@ CDJG Calculate the "Collins" (phi_pq+phi_targ) and "Sivers"(phi_pq-phi_targ) ang main%sigcc = peepi(vertex,main) C Use Clebsch-Gordon coefficients to approximate xsec for Delta final states C This ignores the fact that the g*p and g*n cross sections may not be the same +C 6/24/2021: Coefficients for Delta final states updated from Peter Bosted's +C empirical check's. if(which_pion.eq.2) then ! pi+ Delta if(doing_hydpi) then - main%sigcc = main%sigcc/4.0 !(pi+ Delta0)/(pi+ n) +c main%sigcc = main%sigcc/4.0 !(pi+ Delta0)/(pi+ n) + main%sigcc = 0.6*main%sigcc !(pi+ Delta0)/(pi+ n) elseif(doing_deutpi) then - main%sigcc = main%sigcc/4.0 !(pi+ Delta0)/pi+ n) - > + 0.75*main%sigcc !(pi+ Delta-)/(pi+ n) +c main%sigcc = main%sigcc/4.0 !(pi+ Delta0)/pi+ n) +c > + 0.75*main%sigcc !(pi+ Delta-)/(pi+ n) + main%sigcc = 0.6*main%sigcc !(pi+ Delta0)/pi+ n) + > + 1.0**main%sigcc !(pi+ Delta-)/(pi+ n) endif elseif (which_pion.eq.3) then !pi- Delta if(doing_hydpi) then - main%sigcc = 3.0*main%sigcc/5.0 ! (pi- Delta++)/(pi- p) + main%sigcc = 0.6*main%sigcc ! (pi- Delta++)/(pi- p) elseif(doing_deutpi) then - main%sigcc = 3.0*main%sigcc/5.0 ! (pi- Delta++)/(pi- p) - > + 0.25*main%sigcc !(pi- Delta+)/(pi- p) +c main%sigcc = 3.0*main%sigcc/5.0 ! (pi- Delta++)/(pi- p) +c > + 0.25*main%sigcc !(pi- Delta+)/(pi- p) + main%sigcc = 0.6*main%sigcc ! (pi- Delta++)/(pi- p) + > + 0.6*main%sigcc !(pi- Delta+)/(pi- p) endif endif main%sigcc_recon = 1.0 diff --git a/util/ntuple/Makefile b/util/ntuple/Makefile index 72cb99f11b6e3dc826b671b4ff1087f2f29834b0..e26f4b746facb3bafdaed8d0d9063d468036992d 100644 --- a/util/ntuple/Makefile +++ b/util/ntuple/Makefile @@ -13,7 +13,7 @@ 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 +CERNLIBS = -Wl,-static -lgeant$(GEANTVER) -lpawlib -lgraflib -lgrafX11 -lpacklib -lkernlib -lmathlib -Wl,-dy #For use with gfortran compiler