diff --git a/src/FTDY/commons/corrections.h b/src/FTDY/commons/corrections.h deleted file mode 100644 index ac793ea0..00000000 --- a/src/FTDY/commons/corrections.h +++ /dev/null @@ -1,276 +0,0 @@ -* -*-fortran-*- -* -* Corrections (see Extended Data Tab. 3 in 2103.04024) -* - double precision MASS(1:10,1:6) - double precision XTDAT(1:10,1:6) - double precision XBDAT(1:10,1:6) - double precision ACCEPTANCE(1:10,1:6) -* - data MASS / - $ 5d0, !fake value - $ 5d0, !fake value - $ 5d0, !fake value - $ 5d0, !fake value - $ 5d0, !fake value - $ 4.71d0, - $ 4.71d0, - $ 4.71d0, - $ 4.71d0, - $ 4.71d0, -* - $ 5d0, !fake value - $ 5d0, !fake value - $ 5d0, !fake value - $ 4.88d0, - $ 4.8d0, - $ 4.88d0, - $ 4.88d0, - $ 4.88d0, - $ 4.88d0, - $ 4.88d0, -* - $ 5d0, !fake value - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, - $ 5.11d0, -* - $ 5d0, !fake value - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, - $ 5.46d0, -* - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, - $ 5.87d0, -* - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0, - $ 6.36d0 / -* - data ACCEPTANCE / - $ 0d0, - $ 0d0, - $ 0d0, - $ 0d0, - $ 0d0, - $ 0.0007d0, - $ 0.0064d0, - $ 0.0175d0, - $ 0.0304d0, - $ 0.0370d0, -* - $ 0d0, - $ 0d0, - $ 0d0, - $ 0.0007d0, - $ 0.0071d0, - $ 0.0188d0, - $ 0.0299d0, - $ 0.0366d0, - $ 0.0432d0, - $ 0.0471d0, -* - $ 0d0, - $ 0.0001d0, - $ 0.0023d0, - $ 0.0105d0, - $ 0.0205d0, - $ 0.0298d0, - $ 0.0384d0, - $ 0.0456d0, - $ 0.0510d0, - $ 0.0557d0, -* - $ 0d0, - $ 0.0015d0, - $ 0.0078d0, - $ 0.0176d0, - $ 0.0270d0, - $ 0.0364d0, - $ 0.0436d0, - $ 0.0499d0, - $ 0.0550d0, - $ 0.0591d0, -* - $ 0.0002d0, - $ 0.0035d0, - $ 0.0120d0, - $ 0.0207d0, - $ 0.0298d0, - $ 0.0379d0, - $ 0.0455d0, - $ 0.0518d0, - $ 0.0544d0, - $ 0.0568d0, -* - $ 0.0006d0, - $ 0.0052d0, - $ 0.0125d0, - $ 0.0203d0, - $ 0.0268d0, - $ 0.0336d0, - $ 0.0374d0, - $ 0.0405d0, - $ 0.0415d0, - $ 0.0413d0 / -* - data XBDAT / - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0, -* - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.475d0, - $ 0.524d0, - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0, -* - $ 0.5d0, !fake value - $ 0.380d0, - $ 0.426d0, - $ 0.475d0, - $ 0.524d0, - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0, -* - $ 0.5d0, !fake value - $ 0.380d0, - $ 0.426d0, - $ 0.475d0, - $ 0.524d0, - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0, -* - $ 0.340d0, - $ 0.380d0, - $ 0.426d0, - $ 0.475d0, - $ 0.524d0, - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0, -* - $ 0.340d0, - $ 0.380d0, - $ 0.426d0, - $ 0.475d0, - $ 0.524d0, - $ 0.575d0, - $ 0.624d0, - $ 0.673d0, - $ 0.722d0, - $ 0.771d0 / -* - data XTDAT / - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.147d0, - $ 0.147d0, - $ 0.147d0, - $ 0.147d0, - $ 0.147d0, -* - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.5d0, !fake value - $ 0.179d0, - $ 0.179d0, - $ 0.179d0, - $ 0.179d0, - $ 0.179d0, - $ 0.179d0, - $ 0.179d0, -* - $ 0.5d0, !fake value - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, - $ 0.216d0, -* - $ 0.5d0, !fake value - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, - $ 0.263d0, -* - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, - $ 0.315d0, -* - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0, - $ 0.385d0 / diff --git a/src/FTDY/src/ComputeFKTables.f b/src/FTDY/src/ComputeFKTables.f index a47f7fe1..6bf3d3a9 100644 --- a/src/FTDY/src/ComputeFKTables.f +++ b/src/FTDY/src/ComputeFKTables.f @@ -51,8 +51,26 @@ subroutine ComputeFKTables(inputfile,outputpath,Q0,flmap) * if(set.eq."DYE886R")then set = "DYE886R_P" - elseif(set.eq."DYE906R")then + elseif(set.eq."DYE906R_BIN01")then set = "DYE906R_P_BIN01" + elseif(set.eq."DYE906R_BIN02")then + set = "DYE906R_P_BIN02" + elseif(set.eq."DYE906R_BIN03")then + set = "DYE906R_P_BIN03" + elseif(set.eq."DYE906R_BIN04")then + set = "DYE906R_P_BIN04" + elseif(set.eq."DYE906R_BIN05")then + set = "DYE906R_P_BIN05" + elseif(set.eq."DYE906R_BIN06")then + set = "DYE906R_P_BIN06" + elseif(set.eq."DYE906R_BIN07")then + set = "DYE906R_P_BIN07" + elseif(set.eq."DYE906R_BIN08")then + set = "DYE906R_P_BIN08" + elseif(set.eq."DYE906R_BIN09")then + set = "DYE906R_P_BIN09" + elseif(set.eq."DYE906R_BIN10")then + set = "DYE906R_P_BIN10" elseif(set.eq."CDFWASYM")then set = "CDFWASYM_WP" endif @@ -77,46 +95,29 @@ subroutine ComputeFKTables(inputfile,outputpath,Q0,flmap) obs(idat) = "DYP_E886P" elseif(set.eq."DYE886R_D")then obs(idat) = "DYP_E886D" - elseif(set.eq."DYE906R_P_BIN01")then - obs(idat) = "DYP_E906P_BIN01" - elseif(set.eq."DYE906R_P_BIN02")then - obs(idat) = "DYP_E906P_BIN02" - elseif(set.eq."DYE906R_P_BIN03")then - obs(idat) = "DYP_E906P_BIN03" - elseif(set.eq."DYE906R_P_BIN04")then - obs(idat) = "DYP_E906P_BIN04" - elseif(set.eq."DYE906R_P_BIN05")then - obs(idat) = "DYP_E906P_BIN05" - elseif(set.eq."DYE906R_P_BIN06")then - obs(idat) = "DYP_E906P_BIN06" - elseif(set.eq."DYE906R_P_BIN07")then - obs(idat) = "DYP_E906P_BIN07" - elseif(set.eq."DYE906R_P_BIN08")then - obs(idat) = "DYP_E906P_BIN08" - elseif(set.eq."DYE906R_P_BIN09")then - obs(idat) = "DYP_E906P_BIN09" - elseif(set.eq."DYE906R_P_BIN10")then - obs(idat) = "DYP_E906P_BIN10" - elseif(set.eq."DYE906R_D_BIN01")then - obs(idat) = "DYP_E906D_BIN01" - elseif(set.eq."DYE906R_D_BIN02")then - obs(idat) = "DYP_E906D_BIN02" - elseif(set.eq."DYE906R_D_BIN03")then - obs(idat) = "DYP_E906D_BIN03" - elseif(set.eq."DYE906R_D_BIN04")then - obs(idat) = "DYP_E906D_BIN04" - elseif(set.eq."DYE906R_D_BIN05")then - obs(idat) = "DYP_E906D_BIN05" - elseif(set.eq."DYE906R_D_BIN06")then - obs(idat) = "DYP_E906D_BIN06" - elseif(set.eq."DYE906R_D_BIN07")then - obs(idat) = "DYP_E906D_BIN07" - elseif(set.eq."DYE906R_D_BIN08")then - obs(idat) = "DYP_E906D_BIN08" - elseif(set.eq."DYE906R_D_BIN09")then - obs(idat) = "DYP_E906D_BIN09" - elseif(set.eq."DYE906R_D_BIN10")then - obs(idat) = "DYP_E906D_BIN10" + elseif(set.eq."DYE906R_P_BIN01" + 1 .or.set.eq."DYE906R_P_BIN02" + 1 .or.set.eq."DYE906R_P_BIN03" + 1 .or.set.eq."DYE906R_P_BIN03" + 1 .or.set.eq."DYE906R_P_BIN04" + 1 .or.set.eq."DYE906R_P_BIN05" + 1 .or.set.eq."DYE906R_P_BIN06" + 1 .or.set.eq."DYE906R_P_BIN07" + 1 .or.set.eq."DYE906R_P_BIN08" + 1 .or.set.eq."DYE906R_P_BIN09" + 1 .or.set.eq."DYE906R_P_BIN10")then + obs(idat) = "DYP_E906P" + elseif(set.eq."DYE906R_D_BIN01" + 1 .or.set.eq."DYE906R_D_BIN02" + 1 .or.set.eq."DYE906R_D_BIN03" + 1 .or.set.eq."DYE906R_D_BIN04" + 1 .or.set.eq."DYE906R_D_BIN05" + 1 .or.set.eq."DYE906R_D_BIN06" + 1 .or.set.eq."DYE906R_D_BIN07" + 1 .or.set.eq."DYE906R_D_BIN08" + 1 .or.set.eq."DYE906R_D_BIN09" + 1 .or.set.eq."DYE906R_D_BIN10")then + obs(idat) = "DYP_E906D" elseif(set.eq."CDFWASYM_WP")then obs(idat) = "EWK_WASYM_WP" elseif(set.eq."CDFWASYM_WM")then @@ -143,62 +144,35 @@ subroutine ComputeFKTables(inputfile,outputpath,Q0,flmap) set = "DYE886R_D" goto 103 elseif(set.eq."DYE906R_P_BIN01")then - set = "DYE906R_P_BIN02" - goto 103 - elseif(set.eq."DYE906R_P_BIN02")then - set = "DYE906R_P_BIN03" - goto 103 - elseif(set.eq."DYE906R_P_BIN03")then - set = "DYE906R_P_BIN04" - goto 103 - elseif(set.eq."DYE906R_P_BIN04")then - set = "DYE906R_P_BIN05" - goto 103 - elseif(set.eq."DYE906R_P_BIN05")then - set = "DYE906R_P_BIN06" - goto 103 - elseif(set.eq."DYE906R_P_BIN06")then - set = "DYE906R_P_BIN07" - goto 103 - elseif(set.eq."DYE906R_P_BIN07")then - set = "DYE906R_P_BIN08" - goto 103 - elseif(set.eq."DYE906R_P_BIN08")then - set = "DYE906R_P_BIN09" - goto 103 - elseif(set.eq."DYE906R_P_BIN09")then - set = "DYE906R_P_BIN10" - goto 103 - elseif(set.eq."DYE906R_P_BIN10")then set = "DYE906R_D_BIN01" goto 103 - elseif(set.eq."DYE906R_D_BIN01")then + elseif(set.eq."DYE906R_P_BIN02")then set = "DYE906R_D_BIN02" goto 103 - elseif(set.eq."DYE906R_D_BIN02")then + elseif(set.eq."DYE906R_P_BIN03")then set = "DYE906R_D_BIN03" goto 103 - elseif(set.eq."DYE906R_D_BIN03")then + elseif(set.eq."DYE906R_P_BIN04")then set = "DYE906R_D_BIN04" goto 103 - elseif(set.eq."DYE906R_D_BIN04")then + elseif(set.eq."DYE906R_P_BIN05")then set = "DYE906R_D_BIN05" goto 103 - elseif(set.eq."DYE906R_D_BIN05")then + elseif(set.eq."DYE906R_P_BIN06")then set = "DYE906R_D_BIN06" goto 103 - elseif(set.eq."DYE906R_D_BIN06")then + elseif(set.eq."DYE906R_P_BIN07")then set = "DYE906R_D_BIN07" goto 103 - elseif(set.eq."DYE906R_D_BIN07")then + elseif(set.eq."DYE906R_P_BIN08")then set = "DYE906R_D_BIN08" goto 103 - elseif(set.eq."DYE906R_D_BIN08")then + elseif(set.eq."DYE906R_P_BIN09")then set = "DYE906R_D_BIN09" goto 103 - elseif(set.eq."DYE906R_D_BIN09")then + elseif(set.eq."DYE906R_P_BIN10")then set = "DYE906R_D_BIN10" - goto 103 + goto 103 elseif(set.eq."CDFWASYM_WP")then set = "CDFWASYM_WM" goto 103 diff --git a/src/FTDY/src/sigmafk_dy.f b/src/FTDY/src/sigmafk_dy.f index d631c7dd..f9d0721c 100644 --- a/src/FTDY/src/sigmafk_dy.f +++ b/src/FTDY/src/sigmafk_dy.f @@ -27,7 +27,6 @@ subroutine sigmafk_dy(idat,Q0) include "../commons/sigmafk.h" include "../commons/xxDY.h" include "../commons/cutoff.h" - include "../commons/corrections.h" ** * Input Variables * @@ -52,7 +51,6 @@ subroutine sigmafk_dy(idat,Q0) integer ibin double precision norm double precision zarat - double precision acc double precision tau,shad,m2,Q,as double precision gmu,GetGFermi double precision mz,GetZMass @@ -129,76 +127,16 @@ subroutine sigmafk_dy(idat,Q0) zarat = 1d0 ! Proton target ich = 1 ibos = 1 ! Photon production - if(obslbl(11:15).eq."BIN01")then - ibin = 1 - elseif(obslbl(11:15).eq."BIN02")then - ibin = 2 - elseif(obslbl(11:15).eq."BIN03")then - ibin = 3 - elseif(obslbl(11:15).eq."BIN04")then - ibin = 4 - elseif(obslbl(11:15).eq."BIN05")then - ibin = 5 - elseif(obslbl(11:15).eq."BIN06")then - ibin = 6 - elseif(obslbl(11:15).eq."BIN07")then - ibin = 7 - elseif(obslbl(11:15).eq."BIN08")then - ibin = 8 - elseif(obslbl(11:15).eq."BIN09")then - ibin = 9 - elseif(obslbl(11:15).eq."BIN10")then - ibin = 10 - else - write(*,*) "A problem occurred - invalid bin" - endif - m2 = MASS(ibin,idat)**2d0 !q2dat(idat) - x1dat(idat) = XTDAT(ibin,idat) - x2dat(idat) = XBDAT(ibin,idat) - tau = x1dat(idat) * x2dat(idat) - shad = m2 / tau - Q = MASS(ibin,idat) - acc = ACCEPTANCE(ibin,idat) fact1 = ( 4d0 * pi *alphae**2d0 ) / ( 9d0 * m2 * shad ) fact2 = 2d0 * m2**2d0 - norm = acc * fact1 * fact2 * convfact * 1d-3 + norm = fact1 * fact2 * convfact * 1d-3 elseif(obslbl(1:9).eq."DYP_E906D")then zarat = 0.5d0 ! Isoscalar target ich = 1 ibos = 1 ! Photon production - if(obslbl(11:15).eq."BIN01")then - ibin = 1 - elseif(obslbl(11:15).eq."BIN02")then - ibin = 2 - elseif(obslbl(11:15).eq."BIN03")then - ibin = 3 - elseif(obslbl(11:15).eq."BIN04")then - ibin = 4 - elseif(obslbl(11:15).eq."BIN05")then - ibin = 5 - elseif(obslbl(11:15).eq."BIN06")then - ibin = 6 - elseif(obslbl(11:15).eq."BIN07")then - ibin = 7 - elseif(obslbl(11:15).eq."BIN08")then - ibin = 8 - elseif(obslbl(11:15).eq."BIN09")then - ibin = 9 - elseif(obslbl(11:15).eq."BIN10")then - ibin = 10 - else - write(*,*) "A problem occurred - invalid bin" - endif - m2 = MASS(ibin,idat)**2d0 !q2dat(idat) - x1dat(idat) = XTDAT(ibin,idat) - x2dat(idat) = XBDAT(ibin,idat) - tau = x1dat(idat) * x2dat(idat) - shad = m2 / tau - Q = MASS(ibin,idat) - acc = ACCEPTANCE(ibin,idat) fact1 = ( 4d0 * pi *alphae**2d0 ) / ( 9d0 * m2 * shad ) fact2 = 2d0 * m2**2d0 - norm = acc * fact1 * fact2 * convfact * 1d-3 + norm = fact1 * fact2 * convfact * 1d-3 elseif(obslbl.eq."EWK_ZRAP")then zarat = 1d0 ! antiproton target ich = - 1