diff --git a/F1F2IN21.f b/F1F2IN21.f
index c2607601948e7807e871daf97dcf578a51413c97..0cb5683c03ed48654734b93c6b673272013f1e94 100644
--- a/F1F2IN21.f
+++ b/F1F2IN21.f
@@ -1100,14 +1100,14 @@ CCC
tau = q2/(4*mp2) !!! for elastic at this Q^2 !!!
c ww = mp2 + 2.d0*mp*nu - q2 !!! Fermi smeared !!!
gamma2 = (1. + 4.*mp2*x*x/q2)
- write(6,'(//''gamma2='',8f8.3)') gamma2,q2,w2,mp2,
+ write(6,'(" F1F2IN21: gamma2=",8f8.3)') gamma2,q2,w2,mp2,
> x,tau,q
if(gamma2.LE.6.and.firsty) then
gamma = sqrt(gamma2)
- write(6,'(//''calling getfy'',l2)') firsty
+ write(6,'('' F1F2IN21: calling getfy'',l2)') firsty
call getfy(gamma,x,wfn,fy11,fy12,fy2,firsty)
firsty = .true.
- write(6,'(//''calling getfyoff'',l2)') firsty
+ write(6,'('' F1F2IN21: calling getfyoff'',l2)') firsty
call getfyoff(gamma,x,wfn,fy11off,fy12off,fy2off,firsty)
endif
@@ -1183,7 +1183,7 @@ C ***********************************************************************
logical thend,first,firsty
data wfnorm / 1.0,1.0,1.05,1.02,1.0,1.0,1.0,1.0,1.0,1.0 /
- write(6,2001) x,q2,gm2,ge2
+cdg write(6,2001) x,q2,gm2,ge2
c off = 2
@@ -1196,7 +1196,7 @@ c do i=1,10
c wfnorm(i) = 1.0D0
c enddo
- write(6,*) w2,q2,wfn
+cdg write(6,*) w2,q2,wfn
hc = 0.197327D0 !!! convert from GeV -> fm !!!
mp = (0.938272+0.939565)/2.0D0 !!! average p,n !!!
@@ -1230,7 +1230,7 @@ c enddo
pvmax = mp*prod*(1.D0+rt)
pvinc = (pvmax-pvmin)/float(nbins)
- write(6,*) "offshellqe: ",w2,q2,x,rt
+ write(6,*) "F1F2IN21: offshellqe: ",w2,q2,x,rt
pv = pvmin-pvinc
CCC Loop over initial nucleon 3-momentum, pv CCC
@@ -1388,8 +1388,8 @@ c firsty = .true.
enddo
999 thend = .true.
- write(6,'(///''read in '',i6,
- > '' points in getfy''///)') i
+ write(6,'('' F1F2IN21: read in '',i6,
+ > '' points in getfy'')') i
endif
firsty = .false.
@@ -1504,8 +1504,8 @@ c firsty = .true.
enddo
999 thend = .true.
- write(6,'(///''read in '',i6,
- > '' points in getfyoff''///)') i
+ write(6,'('' F1F2IN21: read in '',i6,
+ > '' points in getfyoff'')') i
endif
firsty = .false.
close(34)
@@ -2245,7 +2245,7 @@ C **********************************************************************
IF (init) GO TO 999 ! Data already read
C...Read data from file
OPEN (10, FORM='FORMATTED',
- & FILE='cdbn.qwave',
+ & FILE='f1f2tables/cdbn.qwave',
& STATUS='OLD')
c READ (10,100)
READ (10,*)
diff --git a/f1f2tables/cdbn.qwave b/f1f2tables/cdbn.qwave
new file mode 100644
index 0000000000000000000000000000000000000000..9b91e92c116ea53b095cc92948e08e585988afb0
--- /dev/null
+++ b/f1f2tables/cdbn.qwave
@@ -0,0 +1,98 @@
+deuteron wave functions in q-space for: cdbn c = 250. n = 96
+n 96
+ 0.6096577117183D-01 0.1564497655275D+00 0.4606852169784D-02 0.2067309514589D-09
+ 0.3211542249269D+00 0.3640249503900D+00 0.4606626143903D-02 0.5736213251816D-08
+ 0.7889659037353D+00 0.5715265480347D+00 0.4605445870540D-02 0.3461002743063D-07
+ 0.1464018483101D+01 0.7784651194832D+00 0.4601992741360D-02 0.1190828254715D-06
+ 0.2345635637002D+01 0.9846230771113D+00 0.4594384781260D-02 0.3051760860213D-06
+ 0.3432943021486D+01 0.1189816939419D+01 0.4580217864457D-02 0.6516378282158D-06
+ 0.4724894470183D+01 0.1393886491668D+01 0.4556643280892D-02 0.1227979255418D-05
+ 0.6220295818218D+01 0.1596696413430D+01 0.4520496567325D-02 0.2111207238340D-05
+ 0.7917831259856D+01 0.1798139252781D+01 0.4468489595954D-02 0.3380948641837D-05
+ 0.9816092719463D+01 0.1998138398966D+01 0.4397469442405D-02 0.5112875561399D-05
+ 0.1191361207478D+02 0.2196650795633D+01 0.4304732859751D-02 0.7370717617901D-05
+ 0.1420889593448D+02 0.2393669331612D+01 0.4188365851195D-02 0.1019764044340D-04
+ 0.1670046263970D+02 0.2589224898486D+01 0.4047558624172D-02 0.1360825800408D-04
+ 0.1938688116048D+02 0.2783388126012D+01 0.3882834680015D-02 0.1758284242014D-04
+ 0.2226681157635D+02 0.2976270819983D+01 0.3696136668310D-02 0.2206519432251D-04
+ 0.2533904686019D+02 0.3168027137438D+01 0.3490734482934D-02 0.2696505488725D-04
+ 0.2860255572372D+02 0.3358854542653D+01 0.3270958729464D-02 0.3216497924121D-04
+ 0.3205652633019D+02 0.3548994594486D+01 0.3041803286808D-02 0.3753055578292D-04
+ 0.3570041073341D+02 0.3738733621542D+01 0.2808469652772D-02 0.4292211571087D-04
+ 0.3953396996117D+02 0.3928403346360D+01 0.2575933081316D-02 0.4820589184865D-04
+ 0.4355731972435D+02 0.4118381523625D+01 0.2348595585650D-02 0.5326296439663D-04
+ 0.4777097679937D+02 0.4309092660315D+01 0.2130061869426D-02 0.5799507291711D-04
+ 0.5217590620104D+02 0.4501008888060D+01 0.1923042939379D-02 0.6232717124516D-04
+ 0.5677356933383D+02 0.4694651059914D+01 0.1729368118443D-02 0.6620721525829D-04
+ 0.6156597338290D+02 0.4890590145626D+01 0.1550073653047D-02 0.6960399303336D-04
+ 0.6655572228130D+02 0.5089449001519D+01 0.1385534271888D-02 0.7250385321129D-04
+ 0.7174606966696D+02 0.5291904593593D+01 0.1235609297007D-02 0.7490705430714D-04
+ 0.7714097432338D+02 0.5498690755791D+01 0.1099783198265D-02 0.7682424575435D-04
+ 0.8274515868198D+02 0.5710601569805D+01 0.9772887888338D-03 0.7827338020999D-04
+ 0.8856417105307D+02 0.5928495458697D+01 0.8672079526708D-03 0.7927718603234D-04
+ 0.9460445234878D+02 0.6153300094331D+01 0.7685493783900D-03 0.7986121230641D-04
+ 0.1008734081655D+03 0.6386018228626D+01 0.6803054406865D-03 0.8005239147484D-04
+ 0.1073794872104D+03 0.6627734571239D+01 0.6014915904657D-03 0.7987803349138D-04
+ 0.1141322671847D+03 0.6879623852148D+01 0.5311718918772D-03 0.7936515956853D-04
+ 0.1211425493888D+03 0.7142960227186D+01 0.4684740866259D-03 0.7854008986381D-04
+ 0.1284224634769D+03 0.7419128208610D+01 0.4125970629935D-03 0.7742821341369D-04
+ 0.1359855839933D+03 0.7709635332144D+01 0.3628130385887D-03 0.7605388291819D-04
+ 0.1438470605442D+03 0.8016126807527D+01 0.3184662290142D-03 0.7444039134658D-04
+ 0.1520237637308D+03 0.8340402442735D+01 0.2789693144190D-03 0.7260999902072D-04
+ 0.1605344492842D+03 0.8684436184255D+01 0.2437986442184D-03 0.7058398940127D-04
+ 0.1693999432138D+03 0.9050398678824D+01 0.2124888329421D-03 0.6838273921940D-04
+ 0.1786433512263D+03 0.9440683338453D+01 0.1846271851218D-03 0.6602579379251D-04
+ 0.1882902961952D+03 0.9857936483066D+01 0.1598482305958D-03 0.6353194226100D-04
+ 0.1983691880932D+03 0.1030509224751D+02 0.1378285406963D-03 0.6091928999744D-04
+ 0.2089115315510D+03 0.1078541307651D+02 0.1182819188618D-03 0.5820532709942D-04
+ 0.2199522771090D+03 0.1130253679846D+02 0.1009550072362D-03 0.5540699283832D-04
+ 0.2315302233212D+03 0.1186053147361D+02 0.8562331717146D-04 0.5254073642079D-04
+ 0.2436884781859D+03 0.1246395946458D+02 0.7208767019265D-04 0.4962257462992D-04
+ 0.2564749899760D+03 0.1311795248810D+02 0.6017102368421D-04 0.4666814674111D-04
+ 0.2699431594868D+03 0.1382829979279D+02 0.4971564909094D-04 0.4369276694931D-04
+ 0.2841525480958D+03 0.1460155208867D+02 0.4058062797955D-04 0.4071147411200D-04
+ 0.2991696989438D+03 0.1544514445483D+02 0.3263963138913D-04 0.3773907822532D-04
+ 0.3150690921346D+03 0.1636754220752D+02 0.2577894973588D-04 0.3479020239898D-04
+ 0.3319342592951D+03 0.1737841466505D+02 0.1989574338616D-04 0.3187931855938D-04
+ 0.3498590883509D+03 0.1848884295736D+02 0.1489648745238D-04 0.2902077426395D-04
+ 0.3689493562646D+03 0.1971156957399D+02 0.1069558839920D-04 0.2622880719189D-04
+ 0.3893245361273D+03 0.2106129932883D+02 0.7214154378917D-05 0.2351754286323D-04
+ 0.4111199358982D+03 0.2255506398128D+02 0.4378905847636D-05 0.2090097000003D-04
+ 0.4344892399160D+03 0.2421266608088D+02 0.2121218047810D-05 0.1839288673933D-04
+ 0.4596075419514D+03 0.2605722195172D+02 0.3762923596660D-06 0.1600680962723D-04
+ 0.4866749812133D+03 0.2811582945684D+02 -0.9175407841759D-06 0.1375583620032D-04
+ 0.5159211219785D+03 0.3042039376957D+02 -0.1819378731744D-05 0.1165245113496D-04
+ 0.5476102555541D+03 0.3300865450866D+02 -0.2386148579606D-05 0.9708265827586D-05
+ 0.5820478531208D+03 0.3592547122792D+02 -0.2672834354688D-05 0.7933682395644D-05
+ 0.6195884637647D+03 0.3922444275259D+02 -0.2732505702421D-05 0.6337476156557D-05
+ 0.6606454394935D+03 0.4296996118288D+02 -0.2616123550318D-05 0.4926296656313D-05
+ 0.7057029863978D+03 0.4723983638419D+02 -0.2372102507457D-05 0.3704097358698D-05
+ 0.7553311999825D+03 0.5212867562344D+02 -0.2045621789817D-05 0.2671519343448D-05
+ 0.8102049597921D+03 0.5775227188638D+02 -0.1677699468885D-05 0.1825275636999D-05
+ 0.8711278581548D+03 0.6425335263068D+02 -0.1304081605603D-05 0.1157610042380D-05
+ 0.9390627561045D+03 0.7180918248051D+02 -0.9540495001933D-06 0.6559355117980D-06
+ 0.1015171150000D+04 0.8064172057244D+02 -0.6493116757114D-06 0.3027867805063D-06
+ 0.1100864376388D+04 0.9103134032390D+02 -0.4032112465775D-06 0.7623933726216D-07
+ 0.1197870905379D+04 0.1033355811988D+03 -0.2205215405493D-06 -0.4906575037731D-07
+ 0.1308325769902D+04 0.1180151077099D+03 -0.9808819060065D-07 -0.1002178703663D-06
+ 0.1434890860951D+04 0.1356701479237D+03 -0.2646372887323D-07 -0.1037236704264D-06
+ 0.1580918892319D+04 0.1570924213534D+03 0.7554317826142D-08 -0.8288003872353D-07
+ 0.1750680138296D+04 0.1833403750587D+03 0.1790127399946D-07 -0.5539320990522D-07
+ 0.1949680990268D+04 0.2158501898852D+03 0.1646541128830D-07 -0.3198341002474D-07
+ 0.2185119420925D+04 0.2566028841655D+03 0.1135372096437D-07 -0.1661048792889D-07
+ 0.2466548972613D+04 0.3083815316406D+03 0.6670981019740D-08 -0.8408589408187D-08
+ 0.2806867960673D+04 0.3751771634772D+03 0.3588145154156D-08 -0.4545376744193D-08
+ 0.3223829531044D+04 0.4628474669400D+03 0.1860952374094D-08 -0.2602129410515D-08
+ 0.3742411294128D+04 0.5802201239680D+03 0.9488535583395D-09 -0.1430640387253D-08
+ 0.4398652807944D+04 0.7410090393604D+03 0.4654169371560D-09 -0.7112955797623D-09
+ 0.5246099974357D+04 0.9672842803935D+03 0.2102326237457D-09 -0.3188665060681D-09
+ 0.6367095522242D+04 0.1296069466383D+04 0.8402071791567D-10 -0.1278725064376D-09
+ 0.7893575645755D+04 0.1792630803512D+04 0.2861835732667D-10 -0.4429521345357D-10
+ 0.1004775364814D+05 0.2579171904658D+04 0.7972483560589D-11 -0.1267187210589D-10
+ 0.1322780866206D+05 0.3902322882503D+04 0.1746453176362D-11 -0.2850737602176D-11
+ 0.1820595320366D+05 0.6309965351711D+04 0.2877977277563D-12 -0.4753177599285D-12
+ 0.2664522955487D+05 0.1118481809400D+05 0.3290767231824D-13 -0.5364773614228D-13
+ 0.4269071785735D+05 0.2270001039007D+05 0.2212284090880D-14 -0.3480496280220D-14
+ 0.7921761853599D+05 0.5738520746089D+05 0.6228063780072D-16 -0.9336715536763D-16
+ 0.1946105489169D+06 0.2205890189705D+06 0.3296513299913D-18 -0.4685144409181D-18
+ 0.1025165413292D+07 0.2630769453971D+07 0.0000000000000D+00 0.0000000000000D+00
diff --git a/semi_physics.f b/semi_physics.f
index f322e049989a745acfbe225899b8cf342984736c..86cc80958b257b58c645aa4ba207d74e5c59c5a7 100644
--- a/semi_physics.f
+++ b/semi_physics.f
@@ -118,6 +118,7 @@ c parameter (b=4.68) !GeV^-2
parameter (Q2zero=2.0) !Gev^2 for u,d,s,g
data first /.TRUE./
+ data firstqe /.TRUE./
data first_cent /.TRUE./
c this is for DSS
@@ -253,7 +254,8 @@ C DJG convert some stuff to GeV
c needed by f1f2in21
if(firstqe) then
- write(6,'(////''calling sqesub'')')
+ write(6,*) 'Initializing F1F2IN21:'
+ write(6,*) 'F1F2IN21: calling sqesub'
q2qe=1.
w2qe=1.
wfn=2