Commit 73e2a075 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

bug in reading "mixed" echos 

test updated to read original echos
need to find out why mixed echos are reading incorrectly
parent b67775d7

examples/macro_mk

+9 −2
Original line number Diff line number Diff line
@@ -8,14 +8,21 @@ macro 
bins pix nbins 8

bins tof custom 2 13 26 39



! ==== set histogramming

set A  1e-10

set ns 1e-9



histo tau  nbins 20 min 0.002*ns max 200.0*ns log

histo q    nbins 20 min 0.000/A  max 0.5/A



c ==== read data

read s5848.echo s5849.echo s5850.echo s5851.echo s5852.echo s5853.echo as resolution

read s5854.echo s5855.echo s5857.echo s5858.echo s5859.echo s58600.echo as sample

read s5854.echo s5855.echo s5857.echo s5858.echo s5859.echo s5860.echo s5861.echo as sample



c === process

match all

fit   all

collect !auto nq 10 ntau 9

collect



report start

report dir details

examples/s5860.echo

0 → 100644
+10037546 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/s5861.echo

0 → 100644
+2336941 −0

File added.

Preview size limit exceeded, changes collapsed.

tests/macro_test

+2 −3
Original line number Diff line number Diff line
@@ -16,10 +16,9 @@ histo q nbins 20 min 0.000/A max 0.5/A 


c ==== read data

read s5848.echo s5849.echo s5850.echo s5851.echo s5852.echo s5853.echo as resolution

read s5854.echo s5855.echo s5857.echo s5858.echo s5859.echo s58600.echo as sample

read s5854.echo s5855.echo s5857.echo s5858.echo s5859.echo s5860.echo s5861.echo as sample



c === process



match all

fit   all

collect

tests/macro_test.last_sqt.dat.1_0

+39 −41
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -51,7 +51,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -93,7 +93,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -135,7 +135,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -177,7 +177,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -219,7 +219,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -248,7 +248,7 @@ _AAO_413 fqt vs t/ns 585408 


parameter

q          0.1860809E+00

q_var      0.1101319E-02

q_var      0.1101318E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -261,7 +261,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -280,7 +280,7 @@ values 
  0.2882412E+01  0.6003523E+00  0.4999679E-02  0.6363838E-01  0.4527493E+00        82  0.1859425E+00

  0.4820141E+01  0.5540781E+00  0.7157154E-02  0.6245321E-01  0.4001535E-02        40  0.1854010E+00

  0.8797281E+01  0.4518620E+00  0.7204329E-02  0.5574061E-01  0.1663866E+01        43  0.1860764E+00

  0.1509942E+02  0.3787163E+00  0.7955161E-02  0.4274646E-01  0.2673022E+01        43  0.1869680E+00

  0.1509942E+02  0.3787210E+00  0.7955165E-02  0.4248561E-01  0.2673024E+01        42  0.1869680E+00

  0.2400915E+02  0.3309249E+00  0.1707653E-01  0.5125114E-01  0.5818640E-01        11  0.1829259E+00



#nxt
@@ -288,8 +288,8 @@ _AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117 
_AAO_413  fqt   vs   t/ns   585409



parameter

q          0.2116827E+00

q_var      0.3080021E-02

q          0.2123656E+00

q_var      0.1745610E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -302,7 +302,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -320,9 +320,9 @@ values 
  0.1303696E+01  0.6204836E+00  0.9780627E-02  0.7790386E-01  0.1648489E+00        38  0.2110234E+00

  0.2554730E+01  0.5407140E+00  0.6886181E-02  0.8009581E-01  0.4572681E+00        77  0.2113431E+00

  0.4831015E+01  0.4615467E+00  0.1127284E-01  0.8227314E-01  0.7764065E-02        33  0.2122510E+00

  0.7253384E+01  0.3709474E+00  0.9980614E-02  0.6439989E-01  0.6893839E+00        40  0.2113289E+00

  0.1331829E+02  0.2972537E+00  0.1850230E-01  0.1015880E+00  0.2099950E+01        29  0.2103881E+00

  0.2399669E+02  0.4032723E+00  0.2139020E+00  0.4307451E-01  0.5222098E-01         2  0.2011628E+00

  0.7253384E+01  0.3709489E+00  0.9980614E-02  0.6413159E-01  0.6893835E+00        39  0.2113289E+00

  0.1331619E+02  0.2963429E+00  0.1851077E-01  0.7769687E-01  0.2099767E+01        20  0.2103860E+00

  0.2743627E+02  0.2301481E+00  0.3003871E-01  0.5921650E-01  0.4879170E+00        12  0.2134569E+00

  0.3717656E+02  0.2208655E+00  0.3855123E-01  0.8951195E-01  0.6280370E-06         8  0.2147724E+00



#nxt
@@ -330,8 +330,8 @@ _AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117 
_AAO_413  fqt   vs   t/ns   585410



parameter

q          0.2357145E+00

q_var      0.3077557E-02

q          0.2358443E+00

q_var      0.2832326E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -344,7 +344,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -362,9 +362,9 @@ values 
  0.1447351E+01  0.5556136E+00  0.5742217E-02  0.5333017E-01  0.1335004E+00        66  0.2367128E+00

  0.2886498E+01  0.4478295E+00  0.6248520E-02  0.7014825E-01  0.3204787E+00        77  0.2374399E+00

  0.4762819E+01  0.3708994E+00  0.7104335E-02  0.7298508E-01  0.6303960E-01        60  0.2379628E+00

  0.7430422E+01  0.3274089E+00  0.1319311E-01  0.1179789E+00  0.1185085E+00        37  0.2338758E+00

  0.1577455E+02 -0.8520894E-01  0.2539803E+00  0.7752960E+00  0.7444901E-01        12  0.2322061E+00

  0.2363774E+02  0.2114122E+00  0.3092177E-01  0.1091509E+00  0.2509581E+00         9  0.2427168E+00

  0.7427147E+01  0.3256090E+00  0.1320153E-01  0.9929719E-01  0.7508105E-01        24  0.2338645E+00

  0.1750155E+02  0.1937097E+00  0.2144167E-01  0.6745455E-01  0.2282144E+00        13  0.2416728E+00

  0.2575142E+02  0.1824302E+00  0.2082367E-01  0.1140932E+00  0.1932886E+01        22  0.2355973E+00

  0.3717656E+02  0.1828254E+00  0.4135904E-01  0.1528457E+00  0.0000000E+00         7  0.2292836E+00



#nxt
@@ -372,8 +372,8 @@ _AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117 
_AAO_413  fqt   vs   t/ns   585411



parameter

q          0.2620411E+00

q_var      0.3967965E-02

q          0.2616407E+00

q_var      0.3907342E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -386,7 +386,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -404,9 +404,9 @@ values 
  0.1512583E+01  0.4573601E+00  0.6084120E-02  0.5411413E-01  0.4247323E-01        52  0.2638018E+00

  0.2993399E+01  0.3512066E+00  0.5732734E-02  0.5892833E-01  0.2900129E+00        77  0.2639920E+00

  0.4736763E+01  0.2760762E+00  0.6501575E-02  0.5729865E-01  0.5180794E-01        50  0.2632329E+00

  0.7639100E+01  0.2798156E+00  0.8054645E-01  0.4892330E+00  0.7366129E+00        31  0.2529232E+00

  0.1576753E+02 -0.3692659E+00  0.2015742E+00  0.6030767E-01  0.4664859E-02         2  0.2676556E+00

  0.2361096E+02  0.1188518E+00  0.1688532E-01  0.4831880E-01  0.2371492E+00        19  0.2607833E+00

  0.7434288E+01  0.2082596E+00  0.8542246E-01  0.3265187E-01  0.0000000E+00         2  0.2516102E+00

  0.1742826E+02  0.1370902E+00  0.1178218E-01  0.7831856E-01  0.6930151E+00        33  0.2617967E+00

  0.2362368E+02  0.1192297E+00  0.1685774E-01  0.4984963E-01  0.3246577E+00        21  0.2607490E+00

  0.3717656E+02 -0.6713497E+00  0.8327731E+00  0.8841943E+00  0.0000000E+00         2  0.2502673E+00



#nxt
@@ -414,8 +414,8 @@ _AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117 
_AAO_413  fqt   vs   t/ns   585412



parameter

q          0.2842346E+00

q_var      0.1274917E-02

q          0.2841346E+00

q_var      0.1178824E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -428,7 +428,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -446,8 +446,7 @@ values 
  0.1515851E+01  0.4026186E+00  0.1104598E-01  0.7183564E-01  0.1434707E-01        29  0.2837457E+00

  0.2819681E+01  0.2837973E+00  0.8600761E-02  0.7362314E-01  0.4679336E+00        59  0.2849655E+00

  0.4724580E+01  0.2159776E+00  0.1320464E-01  0.7333246E-01  0.4561349E-01        23  0.2818193E+00

  0.7937623E+01  0.2962034E-01  0.3755894E+00  0.1363861E+01  0.1656666E+01        19  0.2863999E+00

  0.1576767E+02  0.9296303E-01  0.4676052E-01  0.9351956E-01  0.0000000E+00         5  0.2834657E+00

  0.1426929E+02  0.1031860E+00  0.2807500E-01  0.9710003E-01  0.2420232E+01        16  0.2840305E+00

  0.2359218E+02  0.1584471E+00  0.9670286E-01  0.2203100E+00  0.2250688E+00         6  0.2822407E+00



#nxt
@@ -455,8 +454,8 @@ _AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117 
_AAO_413  fqt   vs   t/ns   585413



parameter

q          0.3102877E+00

q_var      0.1873989E-02

q          0.3102038E+00

q_var      0.2149781E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -469,7 +468,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -483,16 +482,15 @@ values 
  0.5050690E+00  0.4776411E+00  0.1566906E-01  0.7891626E-01  0.0000000E+00        20  0.3108672E+00

  0.1009428E+01  0.3684479E+00  0.1524581E-01  0.8287030E-01  0.0000000E+00        20  0.3109424E+00

  0.2578370E+01  0.2323857E+00  0.1126404E-01  0.8900729E-01  0.5509693E+00        38  0.3109412E+00

  0.6621775E+01  0.1596282E-01  0.2712722E+00  0.5594930E+00  0.0000000E+00         9  0.3105285E+00

  0.1576767E+02 -0.3218733E-01  0.4722313E-01  0.1407386E+00  0.0000000E+00         7  0.3041555E+00

  0.1335862E+02 -0.1255628E-01  0.3032377E-01  0.1459718E+00  0.2017957E+01        15  0.3034734E+00



#nxt

_AAO_413p0K _AAO_413p0K; Krutyeva M; 10/20/2014 - 10/31/2014 (IPTS-117

_AAO_413  fqt   vs   t/ns   585414



parameter

q          0.3306525E+00

q_var      0.2466322E-02

q          0.3304596E+00

q_var      0.2166400E-02

q_unit_SI  0.1000000E+11

t_unit_SI  0.1000000E-08

temp       0.3000000E+03
@@ -505,7 +503,7 @@ volfrac 0.1000000E+01 
qbins           20

tbins           20

oor_cnt          0

upd_cnt       9057

upd_cnt       9053



values

        tau/ns    S(q,t)/S(q)    err(sqt/sq)    var(sqt/sq)    var(tau)/ns   nupdates   Qeff/A**-1
@@ -519,6 +517,6 @@ values 
  0.5050690E+00  0.4537880E+00  0.3679333E-01  0.1061786E+00  0.0000000E+00        10  0.3292946E+00

  0.1009428E+01  0.3494779E+00  0.4108585E-01  0.1170544E+00  0.0000000E+00         8  0.3276620E+00

  0.2329851E+01  0.2468300E+00  0.4192899E-01  0.1406622E+00  0.4798236E+00        15  0.3286630E+00

  0.6621775E+01 -0.1016401E+02  0.1941818E+02  0.0000000E+00  0.0000000E+00         1  0.3352187E+00

  0.1166826E+02 -0.3114115E+00  0.2248837E+00  0.1261283E-01  0.1570092E-06         2  0.3330970E+00



#nxt