← Back to branch summary

~madteam/mg5amcnlo/series2.0

« back to all changes in this revision

Viewing changes to Template/LO/Source/PDF/pdg2pdf_lhapdf6.f

  • Committer: olivier-mattelaer
  • Date: 2020-08-21 09:16:56 UTC
  • mfrom: (284.2.24 python3)
  • Revision ID: olivier-mattelaer-20200821091656-iizux2mj94tkssuo
pass to 2.8.0 (and move to python3 branch)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Template/LO/Source/PDF/pdg2pdf_lhapdf6.f
24
24
      integer i,j,ihlast(20),ipart,iporg,ireuse,imemlast(20),iset,imem
25
25
     &     ,i_replace,ii,ipartlast(20)
26
26
      double precision xlast(20),xmulast(20),pdflast(-7:7,20)
27
 
      double precision epa_proton, epa_electron
 
27
      double precision epa_proton, epa_lepton
28
28
      save ihlast,xlast,xmulast,pdflast,imemlast,ipartlast
29
29
      data ihlast/20*-99/
30
30
      data ipartlast/20*-99/
139
139
            pdg2pdf = get_ion_pdf(pdflast(-7, i_replace), ipart, nb_proton(beamid), nb_neutron(beamid))
140
140
         endif
141
141
         pdg2pdf=pdg2pdf/x
142
 
      else if(ih.eq.3) then       !from the electron
143
 
            pdg2pdf=epa_electron(x,xmu*xmu)
 
142
      else if(abs(ih).eq.3.or.abs(ih).eq.4) then       !from the electron
 
143
            pdg2pdf=epa_lepton(x,xmu*xmu, ih)
144
144
      else if(ih.eq.2) then ! photon from a proton without breaking
145
145
          pdg2pdf = epa_proton(x,xmu*xmu)
146
146
      else