Merge pull request #32 from scarrazza/SeaQuest

SeaQuest
scarrazza · May 26, 2021 · f375305 · f375305
2 parents fdfd068 + c128bb0
commit f375305
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 1 deletion.
diff --git a/src/FTDY/src/ComputeFKTables.f b/src/FTDY/src/ComputeFKTables.f
@@ -51,6 +51,26 @@ subroutine ComputeFKTables(inputfile,outputpath,Q0,flmap)
 *
       if(set.eq."DYE886R")then
          set = "DYE886R_P"
+      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
@@ -75,6 +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"
+     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
@@ -100,6 +143,36 @@ subroutine ComputeFKTables(inputfile,outputpath,Q0,flmap)
       if(set.eq."DYE886R_P")then
          set = "DYE886R_D"
          goto 103
+      elseif(set.eq."DYE906R_P_BIN01")then
+         set = "DYE906R_D_BIN01"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN02")then
+         set = "DYE906R_D_BIN02"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN03")then
+         set = "DYE906R_D_BIN03"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN04")then
+         set = "DYE906R_D_BIN04"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN05")then
+         set = "DYE906R_D_BIN05"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN06")then
+         set = "DYE906R_D_BIN06"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN07")then
+         set = "DYE906R_D_BIN07"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN08")then
+         set = "DYE906R_D_BIN08"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN09")then
+         set = "DYE906R_D_BIN09"
+         goto 103
+      elseif(set.eq."DYE906R_P_BIN10")then
+         set = "DYE906R_D_BIN10"
+         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
@@ -48,6 +48,7 @@ subroutine sigmafk_dy(idat,Q0)
       integer ipt,GetPerturbativeOrder
       integer i,kx
       integer ixpfk(2)
+      integer ibin
       double precision norm
       double precision zarat
       double precision tau,shad,m2,Q,as
@@ -104,7 +105,7 @@ subroutine sigmafk_dy(idat,Q0)
       if(obslbl.eq."DYP_E605")then
          zarat = 0.5d0      ! Isoscalar target
          ich   = 1
-         ibos  = 1          ! Photon production
+         ibos  = 1                    ! Photon production
          fact1 = ( 4d0 * pi * alphae**2d0 ) / ( 9d0 * m2 * shad )
          fact2 = 2d0 * shad**( 3d0 / 2d0 ) * dsqrt(m2)
          norm  = fact1 * fact2 * convfact * 1d-3
@@ -122,6 +123,20 @@ subroutine sigmafk_dy(idat,Q0)
          fact1 = ( 4d0 * pi *alphae**2d0 ) / ( 9d0 * m2 * shad )
          fact2 = 2d0 * m2**2d0
          norm  = fact1 * fact2 * convfact * 1d-3
+      elseif(obslbl(1:9).eq."DYP_E906P")then
+         zarat = 1d0        ! Proton target
+         ich   = 1
+         ibos  = 1          ! Photon production
+         fact1 = ( 4d0 * pi *alphae**2d0 ) / ( 9d0 * m2 * shad )
+         fact2 = 2d0 * m2**2d0
+         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
+         fact1 = ( 4d0 * pi *alphae**2d0 ) / ( 9d0 * m2 * shad )
+         fact2 = 2d0 * m2**2d0
+         norm  =  fact1 * fact2 * convfact * 1d-3
       elseif(obslbl.eq."EWK_ZRAP")then
          zarat = 1d0        ! antiproton target
          ich   = - 1