Commit d8983ea9 authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

fixes issues with matching 

- see reopened issue:20
- added more testing
parent 89501586

Makefile.version

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ export PROJECT=drspine 


export VERSION_MAJOR=1

export VERSION_MINOR=4

export VERSION_RELEASE=0.rc4

export VERSION_RELEASE=0.rc5



export PROJLIB=lib$(PROJECT).a

export PROJARCH=$(PROJECT)-$(VERSION_MAJOR).$(VERSION_MINOR)

examples/match_test

+24 −2
Original line number Diff line number Diff line
@@ -8,8 +8,30 @@ bins pix nbins 8 
bins tof custom 2 13 26 39

! ==== read data

read s5848.echo s5849.echo s5853.echo            as resolution

read s5848.echo s5849.echo s5853.echo            as buffer



! ==== match resolution and buffer

match all

match show





clear sample

! ==== sample cleared

match show

read s5854.echo s5855.echo s5860.echo s5861.echo as sample

! ==== match

! ==== match sample 1st time

match all

match show



clear sample

! ==== sample cleared

match show

read s5854.echo s5855.echo s5860.echo s5861.echo as sample

! ==== match sample 2nd time

match all

match show



! ==== match clear

match clear

match show

examples/matching_a_lot

0 → 100644
+149 −0
Original line number Diff line number Diff line 
macro



! ================================================================

! A lot of matching

! ================================================================



clear all



set tfac08 0.9

set tfac11 0.9



! we use resolution measured for IPTS-27065

datapath /SNS/NSE/IPTS-27065

read s10949.echo as res ! 11A Q=0.035

read s10950.echo as res ! 11A Q=0.053

read s10951.echo as res ! 11A Q=0.071

read s10952.echo as res !  8A Q=0.050

read s10953.echo as res !  8A Q=0.070



datapath /SNS/NSE/IPTS-26896



! buffer data

read s11162.echo as buf ! 11A Q=0.035

read s11163.echo as buf !  8A Q=0.050

read s11164.echo as buf !  8A Q=0.070

read s11165.echo as buf ! 11A Q=0.053

read s11166.echo as buf ! 11A Q=0.071



match all



! Sample1 T=45C

clear sample

read s11157.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11158.echo as sam tfac (tfac08) !  8A Q=0.050

read s11159.echo as sam tfac (tfac08) !  8A Q=0.070

read s11160.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11161.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample2 T=45C

clear sample

read s11167.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11168.echo as sam tfac (tfac08) !  8A Q=0.050

read s11169.echo as sam tfac (tfac08) !  8A Q=0.070

read s11170.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11171.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample3 T=32C

clear sample

read s11172.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11173.echo as sam tfac (tfac08) !  8A Q=0.050

read s11174.echo as sam tfac (tfac08) !  8A Q=0.070

read s11175.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11176.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample3 T=37C

clear sample

read s11177.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11178.echo as sam tfac (tfac08) !  8A Q=0.050

read s11179.echo as sam tfac (tfac08) !  8A Q=0.070

read s11180.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11181.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample3 T=42C

clear sample

read s11182.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11183.echo as sam tfac (tfac08) !  8A Q=0.050

read s11184.echo as sam tfac (tfac08) !  8A Q=0.070

read s11185.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11186.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample3 T=45C

clear sample

read s11187.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11188.echo as sam tfac (tfac08) !  8A Q=0.050

read s11189.echo as sam tfac (tfac08) !  8A Q=0.070

read s11190.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11191.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample4 T=40C

clear sample

read s11192.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11193.echo as sam tfac (tfac08) !  8A Q=0.050

read s11194.echo as sam tfac (tfac08) !  8A Q=0.070

read s11195.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11196.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample4 T=45C

clear sample

read s11197.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11198.echo as sam tfac (tfac08) !  8A Q=0.050

read s11199.echo as sam tfac (tfac08) !  8A Q=0.070

read s11200.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11201.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample4 T=50C

clear sample

read s11202.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11203.echo as sam tfac (tfac08) !  8A Q=0.050

read s11204.echo as sam tfac (tfac08) !  8A Q=0.070

read s11205.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11206.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample5 T=49C

clear sample

read s11207.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11208.echo as sam tfac (tfac08) !  8A Q=0.050

read s11209.echo as sam tfac (tfac08) !  8A Q=0.070

read s11210.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11211.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample5 T=54C

clear sample

read s11212.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11213.echo as sam tfac (tfac08) !  8A Q=0.050

read s11214.echo as sam tfac (tfac08) !  8A Q=0.070

read s11215.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11216.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample5 T=59C

clear sample

read s11217.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11218.echo as sam tfac (tfac08) !  8A Q=0.050

read s11219.echo as sam tfac (tfac08) !  8A Q=0.070

read s11220.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11221.echo as sam tfac (tfac11) ! 11A Q=0.071

match all



! Sample6 T=54C

clear sample

read s11222.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11223.echo as sam tfac (tfac08) !  8A Q=0.050

read s11224.echo as sam tfac (tfac08) !  8A Q=0.070

read s11225.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11226.echo as sam tfac (tfac11) ! 11A Q=0.071

match all

examples/matching_loop

0 → 100644
+50 −0
Original line number Diff line number Diff line 
macro



! ================================================================

! A lot of matching

! ================================================================



clear all



set tfac08 0.9

set tfac11 0.9



! we use resolution measured for IPTS-27065

datapath /SNS/NSE/IPTS-27065

read s10949.echo as res ! 11A Q=0.035

read s10950.echo as res ! 11A Q=0.053

read s10951.echo as res ! 11A Q=0.071

read s10952.echo as res !  8A Q=0.050

read s10953.echo as res !  8A Q=0.070



datapath /SNS/NSE/IPTS-26896



! buffer data

read s11162.echo as buf ! 11A Q=0.035

read s11163.echo as buf !  8A Q=0.050

read s11164.echo as buf !  8A Q=0.070

read s11165.echo as buf ! 11A Q=0.053

read s11166.echo as buf ! 11A Q=0.071



match all



! Sample1 T=45C

clear sample

read s11157.echo as sam tfac (tfac11) ! 11A Q=0.035

read s11158.echo as sam tfac (tfac08) !  8A Q=0.050

read s11159.echo as sam tfac (tfac08) !  8A Q=0.070

read s11160.echo as sam tfac (tfac11) ! 11A Q=0.053

read s11161.echo as sam tfac (tfac11) ! 11A Q=0.071

match all 

match show



!set i 0

!

!:xloop

!

!print term (i)

!match all

!set i (i+1)

!

!if (i) < 20 then goto :xloop

sources/data_types.f90

+7 −0
Original line number Diff line number Diff line
@@ -749,6 +749,13 @@ CONTAINS 
    nullify(this%matching_bgr)

    nullify(this%matching_cal)



    do i=1, size(this%matching_ref_arr)

        nullify(this%matching_ref_arr(i)%ptr)

    end do

    do i=1, size(this%matching_bgr_arr)

        nullify(this%matching_bgr_arr(i)%ptr)

    end do



    do i=0, MAX_NO_MONITORS

       call init_spectrum_struct(this%spectrum(i))

    end do