/[PAMELA software]/DarthVader/ToFLevel2/src/toftrk.for

Diff of /DarthVader/ToFLevel2/src/toftrk.for

Parent Directory | Revision Log | View Patch Patch

-revision 1.10 by mocchiut,
Wed Feb  7 08:17:17 2007 UTC
+revision 1.20 by mocchiut,
Wed Feb 17 11:50:54 2010 UTC
 Line 7 
 C     Changed to use DOTRACK2
  C     Beta calculation: now the flightpath (instead of cos(theta)) is used
  C     Beta calculation: all 4 TDV measurements must be < 4095 (in the old
  C     routine it was (t1+t2)<8000
  C
  C     08-12-06 WM:
  C     adc_c-bug :  The raw ADC value was multiplied with cos(theta)
  C     and AFTER that there was an if statement "if tof32(right,i,iadc) < 4095"
  C
  C  jan-07 GF: ADC/TDCflags(4,12) inserted to flag artificial ADC/TDC
  C             values
  C  jan-07 WM: artificial ADC values created using attenuation calibration
  C  jan-07 WM: artificial TDC values created using xy_coor calibration
 Line 20 
 C  jan-07 WM: modified xtofpos flag "101
  C             dimension of the paddle +/- 10 cm
  C  jan-07 WM: if xtofpos=101 then this paddle is not used for beta
  C             calculation
  C  jan-07 WM: in the xtofpos calculation a check for TDC.ne.4095 was
  C             inserted. In the old code one would still calculate a
  C             xtofpos-value even if the TDC information was missing
  C  jan-07 WM: flag for PMTs #10 and #35 added, TDC=819 due to bit-shift
  C  jan-05 WM: bug fixed: calculation of zenith angles using DOTRACK2
  C             was incorrect
  C  jan-07 WM: bug fixed: in some cases tdc_tw was calculated due to a
  C             leftover "xhelp" value
+ C  apr-07 WM: attenuation fit curve is now a double exponential fit
+ C             conversion from raw ADC to pC using calibration function
+ C             new variables xtr_tof(6) and ytr_tof(6) give track position
+ C             at ToF layers
+ C  aug-07 WM: artificial ADC creation revised: Now an ADC value is created
+ C             only if there is a TDC value (before ADC was created in ANY
+ C             case)
+ C  jan-08 WM: Major Update: Time Walk correction introduced
+ C             Additionally we use the information from the "check_charge"
+ C             function to fill artificial ADC values and make small corrections
+ C             to the k1-parameter (for Z>2)
+ C  feb-08 WM: Calculation of beta(13) changed: First a mean beta is calculated,
+ C             then in a second step we check the residuals of the single
+ C             measurements, reject if > 10 sigma, calculate chi2 and "quality"
+ C             beta is taken as good if chi2<20 and quality>10
+ C             The function "newbeta" is located in "tofl2com.for"
+ C  mar-08 WM: Call to "newbeta" changed, now a flag tells the function if the
+ C             call comes from "tofl2com" or form "toftrack"
+ C  mar-08 WM: Bug found in dEdx if check_charge>1
+ C  apr-08 WM: Bug found in S22 artificial ADC, mismatch found between the track
+ C             length  from DOTRACK2 and "GetLength" method for 4 combinations
+ C  oct-08 WM: New method to create artificial ADC values. Do NOT take the position
+ C             from the tracking, but the position from timing. This method gives a
+ C             better time resolution
+ C  nov-09 WM: the dEdx part ("adc_c") moved to the new dEdx routine from Napoli
+ C  feb-10 WM: k1 values now for Z=1, Z=2, Z>2, k2 values are fix
+ C  feb-10 WM: charge calculation with tracker dEdx vs. deflection^2
+ C
  C****************************************************************************
        IMPLICIT NONE
  C
        include  'input_tof.txt'
        include  'output_tof.txt'
        include  'tofcomm.txt'
  C
  c     =======================================
  c     variables for tracking routine
  c     =======================================
-Line 54 
 c     define TOF Z-coordinates
+Line 82 
 c     define TOF Z-coordinates
       &     xout(NPOINT_MAX),yout(NPOINT_MAX),zin(NPTOF),
       &     THXOUT(NPOINT_MAX),THYOUT(NPOINT_MAX),TLOUT(NPOINT_MAX)
+       DOUBLE PRECISION dedxtrk
+       DOUBLE PRECISION deflection
        INTEGER IFAIL
  c      REAL dx,dy,dr
        REAL ds
        REAL t1,t2,t3,t4
        REAL yhelp,xhelp,xhelp1,xhelp2
-       REAL c1,c2,sw,sxw,w_i
+       REAL yhelp1,yhelp2
-       REAL dist,dl,F
+       REAL c1,c2
-       INTEGER icount,ievent
+ C     REAL sw,sxw,w_i
-       REAL xhelp_a,xhelp_t
+       REAL dist,dl,F
+       INTEGER ievent
-       REAL beta_mean
+ C      INTEGER icount
+ C      REAL beta_mean
+       REAL btemp(12)
        REAL hepratio
-       INTEGER j
+       INTEGER j,hitvec(6)
+       real atten,pc_adc,newbeta
+ C      real check_charge
        REAL theta,phi
  C--   DATA ZTOF/53.74,53.04,23.94,23.44,-23.49,-24.34/ !Sergio 9.05.2006
        REAL tofarm12
        PARAMETER (tofarm12 = 29.70) ! from 53.39 to 23.69
        REAL tofarm23
        PARAMETER (tofarm23 = 47.61) ! from 23.69 to -23.92
        REAL tofarm13
        PARAMETER (tofarm13 = 77.31) ! from 53.39 to -23.92
+ C--- new
+       REAL xtofpre(3),ytofpre(3)
+       REAL y_coor_lin11c(8,2),x_coor_lin12c(6,2)
+       REAL x_coor_lin21c(2,2),y_coor_lin22c(2,2)
+       REAL y_coor_lin31c(3,2),x_coor_lin32c(3,2)
+       DATA y_coor_lin11c(1,1),y_coor_lin11c(1,2) /-20.66,-2.497/
+       DATA y_coor_lin11c(2,1),y_coor_lin11c(2,2) /-9.10, -2.52/
+       DATA y_coor_lin11c(3,1),y_coor_lin11c(3,2) /-24.07,-2.12/
+       DATA y_coor_lin11c(4,1),y_coor_lin11c(4,2) /-13.40,-2.47/
+       DATA y_coor_lin11c(5,1),y_coor_lin11c(5,2) /-31.07,-2.32/
+       DATA y_coor_lin11c(6,1),y_coor_lin11c(6,2) /-21.69,-2.63/
+       DATA y_coor_lin11c(7,1),y_coor_lin11c(7,2) /-12.37,-2.65/
+       DATA y_coor_lin11c(8,1),y_coor_lin11c(8,2) /-10.81,-3.15/
+       DATA x_coor_lin12c(1,1),x_coor_lin12c(1,2) /12.96, -2.65/
+       DATA x_coor_lin12c(2,1),x_coor_lin12c(2,2) /17.12,-2.44/
+       DATA x_coor_lin12c(3,1),x_coor_lin12c(3,2) /7.26, -1.98/
+       DATA x_coor_lin12c(4,1),x_coor_lin12c(4,2) /-22.52,-2.27/
+       DATA x_coor_lin12c(5,1),x_coor_lin12c(5,2) /-18.54,-2.28/
+       DATA x_coor_lin12c(6,1),x_coor_lin12c(6,2) /-7.67,-2.15/
+       DATA x_coor_lin21c(1,1),x_coor_lin21c(1,2) /22.56,-1.56/
+       DATA x_coor_lin21c(2,1),x_coor_lin21c(2,2) /13.94,-1.56/
+       DATA y_coor_lin22c(1,1),y_coor_lin22c(1,2) /-24.24,-2.23/
+       DATA y_coor_lin22c(2,1),y_coor_lin22c(2,2) /-45.99,-1.68/
+       DATA y_coor_lin31c(1,1),y_coor_lin31c(1,2) /-22.99,-3.54/
+       DATA y_coor_lin31c(2,1),y_coor_lin31c(2,2) /-42.28,-4.10/
+       DATA y_coor_lin31c(3,1),y_coor_lin31c(3,2) /-41.29,-3.69/
+       DATA x_coor_lin32c(1,1),x_coor_lin32c(1,2) /0.961, -3.22/
+       DATA x_coor_lin32c(2,1),x_coor_lin32c(2,2) /4.98,-3.48/
+       DATA x_coor_lin32c(3,1),x_coor_lin32c(3,2) /-22.08,-3.37/
+ C---
        INTEGER ihelp
        REAL xkorr,xpos
+       INTEGER IZ
        REAL yl,yh,xl,xh
  C
        REAL hmemor(9000000)
        INTEGER Iquest(100)
  C
        DATA ievent / 0 /
+       INTEGER ifst
+       DATA ifst /0/
        COMMON / pawcd / hmemor
        save / pawcd /
  C
        Common / QUESTd / Iquest
        save / questd /
  C
  C     Begin !
  C
        TOFTRK = 0
  *******************************************************************
-       ievent = ievent +1
+        if (ifst.eq.0) then
+        ifst=1
  C  ratio helium to proton ca. 4
-       hepratio = 4.5
+       hepratio = 4.
        offset = 1
        slope = 2
-Line 118 
 C  ratio helium to proton ca. 4
+Line 199 
 C  ratio helium to proton ca. 4
        itdc = 1
        iadc = 2
+       ENDIF   ! ifst
+ *******************************************************************
+       ievent = ievent +1
        do i=1,13
           beta_a(i) = 100.
        enddo
-Line 153 
 C  ratio helium to proton ca. 4
+Line 240 
 C  ratio helium to proton ca. 4
        THYOUT(j) = 0.
        enddo
+       do j=1,6
+       xtr_tof(j) = 100.
+       ytr_tof(j) = 100.
+       enddo
  C----------------------------------------------------------------------
  C-------------------------get ToF data --------------------------------
  C     we cannot use the tofxx(x,x,x)  data  from tofl2com since it is
  C     manipulated (Time-walk, artificila ADc and TDC values using ToF
  C     standalone information
  C----------------------------------------------------------------------
- C     put the adc and tdc values from ntuple into tofxx(i,j,k) variables
+ c     put the adc and tdc values from ntuple into tofxx(i,j,k) variables
        do j=1,8
-          tof11(1,j,2) = adc(ch11a(j),hb11a(j))
+          tof11(1,j,2) = pc_adc(adc(ch11a(j),hb11a(j)))
-          tof11(2,j,2) = adc(ch11b(j),hb11b(j))
+          tof11(2,j,2) = pc_adc(adc(ch11b(j),hb11b(j)))
-          tof11(1,j,1) = tdc(ch11a(j),hb11a(j))
+          tof11(1,j,1) = (tdc(ch11a(j),hb11a(j)))
-          tof11(2,j,1) = tdc(ch11b(j),hb11b(j))
+          tof11(2,j,1) = (tdc(ch11b(j),hb11b(j)))
        enddo
        do j=1,6
-          tof12(1,j,2) = adc(ch12a(j),hb12a(j))
+          tof12(1,j,2) = pc_adc(adc(ch12a(j),hb12a(j)))
-          tof12(2,j,2) = adc(ch12b(j),hb12b(j))
+          tof12(2,j,2) = pc_adc(adc(ch12b(j),hb12b(j)))
-          tof12(1,j,1) = tdc(ch12a(j),hb12a(j))
+          tof12(1,j,1) = (tdc(ch12a(j),hb12a(j)))
-          tof12(2,j,1) = tdc(ch12b(j),hb12b(j))
+          tof12(2,j,1) = (tdc(ch12b(j),hb12b(j)))
        enddo
        do j=1,2
-          tof21(1,j,2) = adc(ch21a(j),hb21a(j))
+          tof21(1,j,2) = pc_adc(adc(ch21a(j),hb21a(j)))
-          tof21(2,j,2) = adc(ch21b(j),hb21b(j))
+          tof21(2,j,2) = pc_adc(adc(ch21b(j),hb21b(j)))
-          tof21(1,j,1) = tdc(ch21a(j),hb21a(j))
+          tof21(1,j,1) = (tdc(ch21a(j),hb21a(j)))
-          tof21(2,j,1) = tdc(ch21b(j),hb21b(j))
+          tof21(2,j,1) = (tdc(ch21b(j),hb21b(j)))
        enddo
        do j=1,2
-          tof22(1,j,2) = adc(ch22a(j),hb22a(j))
+          tof22(1,j,2) = pc_adc(adc(ch22a(j),hb22a(j)))
-          tof22(2,j,2) = adc(ch22b(j),hb22b(j))
+          tof22(2,j,2) = pc_adc(adc(ch22b(j),hb22b(j)))
-          tof22(1,j,1) = tdc(ch22a(j),hb22a(j))
+          tof22(1,j,1) = (tdc(ch22a(j),hb22a(j)))
-          tof22(2,j,1) = tdc(ch22b(j),hb22b(j))
+          tof22(2,j,1) = (tdc(ch22b(j),hb22b(j)))
        enddo
        do j=1,3
-          tof31(1,j,2) = adc(ch31a(j),hb31a(j))
+          tof31(1,j,2) = pc_adc(adc(ch31a(j),hb31a(j)))
-          tof31(2,j,2) = adc(ch31b(j),hb31b(j))
+          tof31(2,j,2) = pc_adc(adc(ch31b(j),hb31b(j)))
-          tof31(1,j,1) = tdc(ch31a(j),hb31a(j))
+          tof31(1,j,1) = (tdc(ch31a(j),hb31a(j)))
-          tof31(2,j,1) = tdc(ch31b(j),hb31b(j))
+          tof31(2,j,1) = (tdc(ch31b(j),hb31b(j)))
        enddo
        do j=1,3
-          tof32(1,j,2) = adc(ch32a(j),hb32a(j))
+          tof32(1,j,2) = pc_adc(adc(ch32a(j),hb32a(j)))
-          tof32(2,j,2) = adc(ch32b(j),hb32b(j))
+          tof32(2,j,2) = pc_adc(adc(ch32b(j),hb32b(j)))
-          tof32(1,j,1) = tdc(ch32a(j),hb32a(j))
+          tof32(1,j,1) = (tdc(ch32a(j),hb32a(j)))
-          tof32(2,j,1) = tdc(ch32b(j),hb32b(j))
+          tof32(2,j,1) = (tdc(ch32b(j),hb32b(j)))
        enddo
  C----------------------------------------------------------------------
-Line 250 
 C---------------------------------------
+Line 343 
 C---------------------------------------
           if (abs(tof32(2,i,iadc)).gt.10000.) tof32(2,i,iadc)= 10000.
        ENDDO
- C-------------------------------------------------------------------
+ C----------------------------------------------------------------------
  C------read  tracking routine
  *     igoodevent = igoodevent+1
-Line 264 
 C     COPY THE ALFA VECTOR FROM AL_PP TO
+Line 357 
 C     COPY THE ALFA VECTOR FROM AL_PP TO
        do i=1,5
           AL_P(i) = al_pp(i)
        enddo
+       deflection = AL_P(5)
+ *     3) tracker dEdx
+       dedxtrk = trkmip
  c      write(*,*) AL_P
+ c      write(*,*) 'Rig, Def, dEdx ',(1./AL_P(5)),AL_P(5),dedxtrk
+ C--  charge selection with tracker using dedx vs. deflection^2  ----
+        yhelp1 = 3.5 + 4.5*deflection*deflection
+        yhelp2 = 9. + 20.*deflection*deflection
+ c       write(*,*) yhelp1,yhelp2
+        iz = 0
+        if  (dedxtrk.lt.yhelp1) iz=1
+        if ((dedxtrk.gt.yhelp1).and.(dedxtrk.lt.yhelp2)) iz=2
+        if  (dedxtrk.gt.yhelp2) iz=3
+ c       write(*,*) 'tracker charge ',iz
+ C--------------------------------------------------------------------
        if (al_p(5).eq.0.) THEN
-          PRINT *,' TOF - WARNING F77: track with R = 0, discarded'
+ c         PRINT *,' TOF - WARNING F77: track with R = 0, discarded'
           GOTO 969
        ENDIF
  *     -------- *** tracking routine *** --------
-Line 276 
 c      write(*,*) AL_P
+Line 388 
 c      write(*,*) AL_P
  C     call DOTRACK(NPTOF,ZIN,XOUT,YOUT,AL_P,IFAIL)
        call DOTRACK2(NPTOF,ZIN,XOUT,YOUT,THXOUT,THYOUT,TLOUT,AL_P,IFAIL)
  C     write(*,*) (TLOUT(i),i=1,6)
        if(IFAIL.ne.0)then
-          print *,' TOF - WARNING F77: tracking failed '
+ c         print *,' TOF - WARNING F77: tracking failed '
           goto 969
        endif
  *     ------------------------------------------
  continue
+ C---  Fill xtr_tof  and ytr_tof: positions from tracker at ToF layers
+       do j=1,6
+       xtr_tof(j) = XOUT(j)
+       ytr_tof(j) = YOUT(j)
+ c      write(*,*) XOUT(j),YOUT(j)
+       enddo
  C---  convert  angles to radian
        do j=1,6
        THXOUT(j) = 3.1415927*THXOUT(j)/180.
-Line 366 
 c     DATA tof21_y/  3.75,-3.75/  ! padd
+Line 485 
 c     DATA tof21_y/  3.75,-3.75/  ! padd
  c     DATA tof22_x/ -4.5,4.5/
  c     DATA tof31_x/ -6.0,0.,6.0/
  c     DATA tof32_y/ -5.0,0.0,5.0/
  c
  c     S11 8 paddles  33.0 x 5.1 cm
  c     S12 6 paddles  40.8 x 5.5 cm
  c     S21 2 paddles  18.0 x 7.5 cm
-Line 374 
 c     S22 2 paddles  15.0 x 9.0 cm
+Line 493 
 c     S22 2 paddles  15.0 x 9.0 cm
  c     S31 3 paddles  15.0 x 6.0 cm
  c     S32 3 paddles  18.0 x 5.0 cm
- c     write(*,*) xout(1),xout(2),xout(3),xout(4),xout(5),xout(6)
- c     write(*,*) yout(1),yout(2),yout(3),yout(4),yout(5),yout(6)
  C--------------S11 --------------------------------------
-Line 397 
 C--------------S11 ---------------------
+Line 514 
 C--------------S11 ---------------------
  C--------------S12 --------------------------------------
        tof12_i = none_find
        xl = -40.8/2.
        xh =  40.8/2.
-Line 414 
 C--------------S12 ---------------------
+Line 531 
 C--------------S12 ---------------------
  C--------------S21 --------------------------------------
        tof21_i = none_find
        xl = -18./2.
        xh =  18./2.
-Line 431 
 C--------------S21 ---------------------
+Line 548 
 C--------------S21 ---------------------
  C--------------S22 --------------------------------------
        tof22_i = none_find
        yl = -15./2.
        yh =  15./2.
-Line 448 
 C--------------S22 ---------------------
+Line 565 
 C--------------S22 ---------------------
  C--------------S31 --------------------------------------
        tof31_i = none_find
        yl = -15.0/2.
        yh =  15.0/2.
-Line 465 
 C--------------S31 ---------------------
+Line 582 
 C--------------S31 ---------------------
  C--------------S32 --------------------------------------
        tof32_i = none_find
        xl = -18.0/2.
        xh =  18.0/2.
-Line 480 
 C--------------S32 ---------------------
+Line 597 
 C--------------S32 ---------------------
        endif
- C     write(*,*) tof11_i,tof12_i,tof21_i,tof22_i,tof31_i,tof32_i
- C-----------------------------------------------------------------------
+        hitvec(1)=tof11_i
- C--------------------Insert Artifical TDC Value  ---------------------
+        hitvec(2)=tof12_i
- C     For each Paddle perform check:
+        hitvec(3)=tof21_i
- C     if left paddle=4095  and right paddle OK => create TDC value left
+        hitvec(4)=tof22_i
- C     if right paddle=4095  and left paddle OK => create TDC value right
+        hitvec(5)=tof31_i
- C-----------------------------------------------------------------------
+        hitvec(6)=tof32_i
- C-----------------------S11 -----------------------------------------
-       IF (tof11_i.GT.none_find) THEN
+ C----------------------------------------------------------------------
-          xpos = yout(1)
+ C--- check charge:
-          i = tof11_i
+ C--- if Z=2 we should use the attenuation curve for helium to
-          if ((tof11(1,tof11_i,itdc).EQ.4095).AND.
+ C--- fill the artificail ADC values and NOT divide by "hepratio"
-      &        (tof11(2,tof11_i,itdc).LT.4095)) THEN
+ C--- if Z>2 we should do a correction to
+ C--- the k1 constants in the beta calculation
+ C----------------------------------------------------------------------
- c       write(*,*)'11lb4 ',i,tof11(1,tof11_i,itdc),tof11(2,tof11_i,itdc)
+        theta=0.
+        dist = ZTOF(1) - ZTOF(5)
+        dl = 0.
+        DO I=1,5
+          dl = dl + TLOUT(i)
+        ENDDO
+        F = dl/dist
+        theta = acos(1/F)
+ c       iz = int(check_charge(theta,hitvec))
+ c       write(*,*) 'in toftrk',iz
-             tof11(1,tof11_i,itdc) = tof11(2,tof11_i,itdc)
-      &           + 2*(y_coor_lin11(tof11_i,offset)
-      &           + xpos*y_coor_lin11(tof11_i,slope))
- c       write(*,*)'11laf ',i,tof11(1,tof11_i,itdc),tof11(2,tof11_i,itdc)
+ C-------------------------------  new  ---------------------------
+ C--  calculate track position in paddle using timing difference
+ C--  this calculation is preliminary and uses some standard
+ C--  calibration values, but we need to find a rough position to
+ C--  be able to calculate artificial ADC values (needed for the
+ C--  timewalk...
+ C------------------------------------------------------------------
-             tdcflag(ch11a(i),hb11a(i)) = 1
+        do i=1,3
+          xtofpre(i)=100.
-         ENDIF
+          ytofpre(i)=100.
-          if ((tof11(2,tof11_i,itdc).EQ.4095).AND.
+        enddo
-      &        (tof11(1,tof11_i,itdc).LT.4095)) THEN
- c       write(*,*)'11rb4 ',i,tof11(1,tof11_i,itdc),tof11(2,tof11_i,itdc)
+ C-----------------------------S1 --------------------------------
-             tof11(2,tof11_i,itdc) = tof11(1,tof11_i,itdc)
+       IF (tof11_i.GT.none_find) THEN
-      &           - 2*(y_coor_lin11(tof11_i,offset)
+       IF ((tof11(1,tof11_i,itdc).LT.2000).AND.
-      &           + xpos*y_coor_lin11(tof11_i,slope))
+      +                             (tof11(2,tof11_i,itdc).LT.2000))
- c       write(*,*)'11raf ',i,tof11(1,tof11_i,itdc),tof11(2,tof11_i,itdc)
+      +    ytofpre(1)  = ((tof11(1,tof11_i,itdc)-tof11(2,tof11_i,itdc))/2.
+      +   -y_coor_lin11c(tof11_i,offset))/y_coor_lin11c(tof11_i,slope)
+       endif
-             tdcflag(ch11b(i),hb11b(i)) = 1
+       IF (tof12_i.GT.none_find) THEN
-          ENDIF
+       IF ((tof12(1,tof12_i,itdc).LT.2000).AND.
-       ENDIF
+      +                             (tof12(2,tof12_i,itdc).LT.2000))
+      +    xtofpre(1)  = ((tof12(1,tof12_i,itdc)-tof12(2,tof12_i,itdc))/2.
+      +   -x_coor_lin12c(tof12_i,offset))/x_coor_lin12c(tof12_i,slope)
+       endif
- C-----------------------S12 -----------------------------------------
-       IF (tof12_i.GT.none_find) THEN
+ C-----------------------------S2 --------------------------------
-          xpos = xout(2)
-          i = tof12_i
-          if ((tof12(1,tof12_i,itdc).EQ.4095).AND.
-      &        (tof12(2,tof12_i,itdc).LT.4095)) THEN
-             tof12(1,tof12_i,itdc) = tof12(2,tof12_i,itdc)
-      &           + 2*(x_coor_lin12(tof12_i,offset)
-      &           + xpos*x_coor_lin12(tof12_i,slope))
-             tdcflag(ch12a(i),hb12a(i)) = 1
-          ENDIF
-          if ((tof12(2,tof12_i,itdc).EQ.4095).AND.
-      &        (tof12(1,tof12_i,itdc).LT.4095)) THEN
-             tof12(2,tof12_i,itdc) = tof12(1,tof12_i,itdc)
-      &           - 2*(x_coor_lin12(tof12_i,offset)
-      &           + xpos*x_coor_lin12(tof12_i,slope))
-             tdcflag(ch12b(i),hb12b(i)) = 1
-          ENDIF
-       ENDIF
- C-----------------------S21 -----------------------------------------
        IF (tof21_i.GT.none_find) THEN
-          xpos = xout(3)
+       IF ((tof21(1,tof21_i,itdc).LT.2000).AND.
-          i = tof21_i
+      +                             (tof21(2,tof21_i,itdc).LT.2000))
-          if ((tof21(1,tof21_i,itdc).EQ.4095).AND.
+      +    xtofpre(2) = ((tof21(1,tof21_i,itdc)-tof21(2,tof21_i,itdc))/2.
-      &        (tof21(2,tof21_i,itdc).LT.4095)) THEN
+      +    -x_coor_lin21c(tof21_i,offset))/x_coor_lin21c(tof21_i,slope)
-             tof21(1,tof21_i,itdc) = tof21(2,tof21_i,itdc)
+       endif
-      &           + 2*(x_coor_lin21(tof21_i,offset)
-      &           + xpos*x_coor_lin21(tof21_i,slope))
-             tdcflag(ch21a(i),hb21a(i)) = 1
-          ENDIF
-          if ((tof21(2,tof21_i,itdc).EQ.4095).AND.
-      &        (tof21(1,tof21_i,itdc).LT.4095)) THEN
-             tof21(2,tof21_i,itdc) = tof21(1,tof21_i,itdc)
-      &           - 2*(x_coor_lin21(tof21_i,offset)
-      &           + xpos*x_coor_lin21(tof21_i,slope))
-             tdcflag(ch21b(i),hb21b(i)) = 1
-          ENDIF
-       ENDIF
- C-----------------------S22 -----------------------------------------
        IF (tof22_i.GT.none_find) THEN
-          xpos = yout(4)
+       IF ((tof22(1,tof22_i,itdc).LT.2000).AND.
-          i = tof22_i
+      +                             (tof22(2,tof22_i,itdc).LT.2000))
-          if ((tof22(1,tof22_i,itdc).EQ.4095).AND.
+      +    ytofpre(2) = ((tof22(1,tof22_i,itdc)-tof22(2,tof22_i,itdc))/2.
-      &        (tof22(2,tof22_i,itdc).LT.4095)) THEN
+      +    -y_coor_lin22c(tof22_i,offset))/y_coor_lin22c(tof22_i,slope)
-             tof22(1,tof22_i,itdc) = tof22(2,tof22_i,itdc)
+       endif
-      &           + 2*(y_coor_lin22(tof22_i,offset)
-      &           + xpos*y_coor_lin22(tof22_i,slope))
-             tdcflag(ch22a(i),hb22a(i)) = 1
-          ENDIF
-          if ((tof22(2,tof22_i,itdc).EQ.4095).AND.
-      &        (tof22(1,tof22_i,itdc).LT.4095)) THEN
-             tof22(2,tof22_i,itdc) = tof22(1,tof22_i,itdc)
-      &           - 2*(y_coor_lin22(tof22_i,offset)
-      &           + xpos*y_coor_lin22(tof22_i,slope))
-             tdcflag(ch22b(i),hb22b(i)) = 1
-          ENDIF
-       ENDIF
- C-----------------------S31 -----------------------------------------
-       IF (tof31_i.GT.none_find) THEN
-          xpos = yout(5)
-          i = tof31_i
-          if ((tof31(1,tof31_i,itdc).EQ.4095).AND.
-      &        (tof31(2,tof31_i,itdc).LT.4095)) THEN
-             tof31(1,tof31_i,itdc) = tof31(2,tof31_i,itdc)
-      &           + 2*(y_coor_lin31(tof31_i,offset)
-      &           + xpos*y_coor_lin31(tof31_i,slope))
-             tdcflag(ch31a(i),hb31a(i)) = 1
-          ENDIF
-          if ((tof31(2,tof31_i,itdc).EQ.4095).AND.
-      &        (tof31(1,tof31_i,itdc).LT.4095)) THEN
-             tof31(2,tof31_i,itdc) = tof31(1,tof31_i,itdc)
-      &           - 2*(y_coor_lin31(tof31_i,offset)
-      &           + xpos*y_coor_lin31(tof31_i,slope))
-             tdcflag(ch31b(i),hb31b(i)) = 1
-          ENDIF
-       ENDIF
- C-----------------------S32 -----------------------------------------
+ C-----------------------------S3 --------------------------------
+       IF (tof31_i.GT.none_find) THEN
+       IF ((tof31(1,tof31_i,itdc).LT.2000).AND.
+      +                             (tof31(2,tof31_i,itdc).LT.2000))
+      +    ytofpre(3)  = ((tof31(1,tof31_i,itdc)-tof31(2,tof31_i,itdc))/2.
+      +    -y_coor_lin31c(tof31_i,offset))/y_coor_lin31c(tof31_i,slope)
+       endif
        IF (tof32_i.GT.none_find) THEN
-          xpos = xout(6)
+       IF ((tof32(1,tof32_i,itdc).LT.2000).AND.
-          i = tof32_i
+      +                             (tof32(2,tof32_i,itdc).LT.2000))
-          if ((tof32(1,tof32_i,itdc).EQ.4095).AND.
+      +    xtofpre(3)  = ((tof32(1,tof32_i,itdc)-tof32(2,tof32_i,itdc))/2.
-      &        (tof32(2,tof32_i,itdc).LT.4095)) THEN
+      +    -x_coor_lin32c(tof32_i,offset))/x_coor_lin32c(tof32_i,slope)
-             tof32(1,tof32_i,itdc) = tof32(2,tof32_i,itdc)
+       endif
-      &           + 2*(x_coor_lin32(tof32_i,offset)
-      &           + xpos*x_coor_lin32(tof32_i,slope))
-             tdcflag(ch32a(i),hb32a(i)) = 1
+ C--  restrict TDC measurements to physical paddle dimensions +/- 10 cm
-          ENDIF
-          if ((tof32(2,tof32_i,itdc).EQ.4095).AND.
+         if (abs(xtofpre(1)).gt.31.)  xtofpre(1)=100.
-      &        (tof32(1,tof32_i,itdc).LT.4095)) THEN
+         if (abs(xtofpre(2)).gt.19.)  xtofpre(2)=100.
-             tof32(2,tof32_i,itdc) = tof32(1,tof32_i,itdc)
+         if (abs(xtofpre(3)).gt.19.)  xtofpre(3)=100.
-      &           - 2*(x_coor_lin32(tof32_i,offset)
-      &           + xpos*x_coor_lin32(tof32_i,slope))
+         if (abs(ytofpre(1)).gt.26.)  ytofpre(1)=100.
-             tdcflag(ch32b(i),hb32b(i)) = 1
+         if (abs(ytofpre(2)).gt.18.)  ytofpre(2)=100.
-          ENDIF
+         if (abs(ytofpre(3)).gt.18.)  ytofpre(3)=100.
-       ENDIF
  C--------------------------------------------------------------------
- C---- if TDCleft.and.TDCright and NO ADC insert artificial ADC
+ C---- if paddle hit: if we have TDC value but no ADC, create ADC value
- C---- values
+ C---- use the "pre" position if possible, since this gives better time
+ C---- resolution ... october 2008
  C--------------------------------------------------------------------
  c     middle y (or x) position of the upper and middle ToF-Paddle
  c     DATA tof11_x/ -17.85,-12.75,-7.65,-2.55,2.55,7.65,12.75,17.85/
-Line 641 
 c     DATA tof32_y/ -5.0,0.0,5.0/
+Line 716 
 c     DATA tof32_y/ -5.0,0.0,5.0/
  C----------------------------S1 -------------------------------------
-       yhelp=yout(1)
+ c     yhelp=yout(1)
-       IF (tof11_i.GT.none_find.AND.abs(yout(1)).lt.100) THEN
+       yhelp = ytofpre(1)
+       if (yhelp.eq.100) yhelp=yout(1)
+       IF (tof11_i.GT.none_find.AND.abs(yhelp).lt.100) THEN
           i = tof11_i
-          if (tof11(left,i,iadc).eq.4095) then
+          if ((tdc(ch11a(i),hb11a(i)).lt.4095).AND.
+      &       (adc(ch11a(i),hb11a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(1))/tan(THXOUT(1)))
              theta = atan(tan(THXOUT(1))/cos(phi))
-             xkorr=adcx11(left,i,1)*exp(-yhelp/adcx11(left,i,2))
+             xkorr = atten(left,11,i,yhelp)
-             xkorr=xkorr/hepratio
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof11(left,i,iadc)=xkorr/cos(theta)
              adcflag(ch11a(i),hb11a(i)) = 1
           endif
-          if (tof11(right,i,iadc).eq.4095) then
+          if ((tdc(ch11b(i),hb11b(i)).lt.4095).AND.
+      &       (adc(ch11b(i),hb11b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(1))/tan(THXOUT(1)))
              theta = atan(tan(THXOUT(1))/cos(phi))
-             xkorr=adcx11(right,i,1)*exp(yhelp/adcx11(right,i,2))
+             xkorr = atten(right,11,i,yhelp)
-             xkorr=xkorr/hepratio
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof11(right,i,iadc)=xkorr/cos(theta)
              adcflag(ch11b(i),hb11b(i)) = 1
           endif
        ENDIF
-       xhelp=xout(2)
+ c      xhelp=xout(2)
-       IF (tof12_i.GT.none_find.AND.abs(xout(2)).lt.100) THEN
+       xhelp = xtofpre(1)
+       if (xhelp.eq.100) xhelp=xout(2)
+       IF (tof12_i.GT.none_find.AND.abs(xhelp).lt.100) THEN
           i = tof12_i
-          if (tof12(left,i,iadc).eq.4095) then
+          if ((tdc(ch12a(i),hb12a(i)).lt.4095).AND.
+      &       (adc(ch12a(i),hb12a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(2))/tan(THXOUT(2)))
              theta = atan(tan(THXOUT(2))/cos(phi))
-             xkorr=adcx12(left,i,1)*exp(-xhelp/adcx12(left,i,2))
+ c            xkorr=adcx12(left,i,1)*exp(-xhelp/adcx12(left,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(left,12,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof12(left,i,iadc) = xkorr/cos(theta)
              adcflag(ch12a(i),hb12a(i)) = 1
           endif
-          if (tof12(right,i,iadc).eq.4095) then
+          if ((tdc(ch12b(i),hb12b(i)).lt.4095).AND.
+      &       (adc(ch12b(i),hb12b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(2))/tan(THXOUT(2)))
              theta = atan(tan(THXOUT(2))/cos(phi))
-             xkorr=adcx12(right,i,1)*exp(xhelp/adcx12(right,i,2))
+ c            xkorr=adcx12(right,i,1)*exp(xhelp/adcx12(right,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(right,12,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof12(right,i,iadc) = xkorr/cos(theta)
              adcflag(ch12b(i),hb12b(i)) = 1
           endif
-Line 685 
 C----------------------------S1 --------
+Line 772 
 C----------------------------S1 --------
  C-----------------------------S2 --------------------------------
-       xhelp=xout(3)
+ c      xhelp=xout(3)
-       IF (tof21_i.GT.none_find.AND.abs(xout(3)).lt.100) THEN
+       xhelp = xtofpre(2)
+       if (xhelp.eq.100) xhelp=xout(3)
+       IF (tof21_i.GT.none_find.AND.abs(xhelp).lt.100) THEN
           i = tof21_i
-          if (tof21(left,i,iadc).eq.4095) then
+          if ((tdc(ch21a(i),hb21a(i)).lt.4095).AND.
+      &       (adc(ch21a(i),hb21a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(3))/tan(THXOUT(3)))
              theta = atan(tan(THXOUT(3))/cos(phi))
-             xkorr=adcx21(left,i,1)*exp(-xhelp/adcx21(left,i,2))
+ c            xkorr=adcx21(left,i,1)*exp(-xhelp/adcx21(left,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(left,21,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof21(left,i,iadc) = xkorr/cos(theta)
              adcflag(ch21a(i),hb21a(i)) = 1
           endif
-          if (tof21(right,i,iadc).eq.4095) then
+          if ((tdc(ch21b(i),hb21b(i)).lt.4095).AND.
+      &       (adc(ch21b(i),hb21b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(3))/tan(THXOUT(3)))
              theta = atan(tan(THXOUT(3))/cos(phi))
-             xkorr=adcx21(right,i,1)*exp(xhelp/adcx21(right,i,2))
+ c            xkorr=adcx21(right,i,1)*exp(xhelp/adcx21(right,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(right,21,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof21(right,i,iadc) = xkorr/cos(theta)
              adcflag(ch21b(i),hb21b(i)) = 1
           endif
        ENDIF
-       yhelp=yout(4)
+ c      yhelp=yout(4)
-       IF (tof22_i.GT.none_find.AND.abs(yout(4)).lt.100) THEN
+       yhelp = ytofpre(2)
+       if (yhelp.eq.100) yhelp=yout(4)
+       IF (tof22_i.GT.none_find.AND.abs(yhelp).lt.100) THEN
           i = tof22_i
-          if (tof22(left,i,iadc).eq.4095) then
+          if ((tdc(ch22a(i),hb22a(i)).lt.4095).AND.
+      &       (adc(ch22a(i),hb22a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(4))/tan(THXOUT(4)))
              theta = atan(tan(THXOUT(4))/cos(phi))
-             xkorr=adcx22(left,i,1)*exp(-yhelp/adcx22(left,i,2))
+ c            xkorr=adcx22(left,i,1)*exp(-yhelp/adcx22(left,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(left,22,i,yhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof22(left,i,iadc) = xkorr/cos(theta)
              adcflag(ch22a(i),hb22a(i)) = 1
           endif
-          if (tof22(right,i,iadc).eq.4095) then
+          if ((tdc(ch22b(i),hb22b(i)).lt.4095).AND.
+      &       (adc(ch22b(i),hb22b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(4))/tan(THXOUT(4)))
              theta = atan(tan(THXOUT(4))/cos(phi))
-             xkorr=adcx22(right,i,1)*exp(yhelp/adcx22(right,i,2))
+ c            xkorr=adcx22(right,i,1)*exp(yhelp/adcx22(right,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(right,22,i,yhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof22(right,i,iadc) = xkorr/cos(theta)
              adcflag(ch22b(i),hb22b(i)) = 1
           endif
-Line 730 
 C-----------------------------S2 -------
+Line 831 
 C-----------------------------S2 -------
  C-----------------------------S3 --------------------------------
-       yhelp=yout(5)
+ c      yhelp=yout(5)
-       IF (tof31_i.GT.none_find.AND.abs(yout(5)).lt.100) THEN
+       yhelp = ytofpre(3)
+       if (yhelp.eq.100) yhelp=yout(5)
+       IF (tof31_i.GT.none_find.AND.abs(yhelp).lt.100) THEN
           i = tof31_i
-          if (tof31(left,i,iadc).eq.4095) then
+          if ((tdc(ch31a(i),hb31a(i)).lt.4095).AND.
+      &       (adc(ch31a(i),hb31a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(5))/tan(THXOUT(5)))
              theta = atan(tan(THXOUT(5))/cos(phi))
-             xkorr=adcx31(left,i,1)*exp(-yhelp/adcx31(left,i,2))
+ c            xkorr=adcx31(left,i,1)*exp(-yhelp/adcx31(left,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(left,31,i,yhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof31(left,i,iadc) = xkorr/cos(theta)
              adcflag(ch31a(i),hb31a(i)) = 1
           endif
-          if (tof31(right,i,iadc).eq.4095) then
+          if ((tdc(ch31b(i),hb31b(i)).lt.4095).AND.
+      &       (adc(ch31b(i),hb31b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(5))/tan(THXOUT(5)))
              theta = atan(tan(THXOUT(5))/cos(phi))
-             xkorr=adcx31(right,i,1)*exp(yhelp/adcx31(right,i,2))
+ c            xkorr=adcx31(right,i,1)*exp(yhelp/adcx31(right,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(right,31,i,yhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof31(right,i,iadc) = xkorr/cos(theta)
              adcflag(ch31b(i),hb31b(i)) = 1
           endif
        ENDIF
-       xhelp=xout(6)
+ c      xhelp=xout(6)
+       xhelp = xtofpre(3)
+       if (xhelp.eq.100) xhelp=xout(6)
        IF (tof32_i.GT.none_find.AND.abs(xout(6)).lt.100) THEN
           i = tof32_i
-          if (tof32(left,i,iadc).eq.4095) then
+          if ((tdc(ch32a(i),hb32a(i)).lt.4095).AND.
+      &       (adc(ch32a(i),hb32a(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(6))/tan(THXOUT(6)))
              theta = atan(tan(THXOUT(6))/cos(phi))
-             xkorr=adcx32(left,i,1)*exp(-xhelp/adcx32(left,i,2))
+ c            xkorr=adcx32(left,i,1)*exp(-xhelp/adcx32(left,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(left,32,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof32(left,i,iadc) = xkorr/cos(theta)
              adcflag(ch32a(i),hb32a(i)) = 1
           endif
-          if (tof32(right,i,iadc).eq.4095) then
+          if ((tdc(ch32b(i),hb32b(i)).lt.4095).AND.
+      &       (adc(ch32b(i),hb32b(i)).eq.4095)) then
              phi   = atan(tan(THYOUT(6))/tan(THXOUT(6)))
              theta = atan(tan(THXOUT(6))/cos(phi))
-             xkorr=adcx32(right,i,1)*exp(xhelp/adcx32(right,i,2))
+ c            xkorr=adcx32(right,i,1)*exp(xhelp/adcx32(right,i,2))
-             xkorr=xkorr/hepratio
+             xkorr = atten(right,32,i,xhelp)
+             if (iz.le.1) xkorr=xkorr/hepratio
              tof32(right,i,iadc) = xkorr/cos(theta)
              adcflag(ch32b(i),hb32b(i)) = 1
           endif
        ENDIF
+ C-------------------------------------------------------------------
+ C Now there is for each hitted paddle a TDC and ADC value, if the
+ C TDC was < 4095.
+ C There might be also TDC-ADC pairs in paddles not hitted
+ C Let's correct the raw TDC value with the time walk
+ C-------------------------------------------------------------------
+ C--------------------Time walk correction  -------------------------
+ C-------------------------------------------------------------------
+       DO i=1,8
+          if ((tdc(ch11a(i),hb11a(i)).lt.4095).and.
+      &             (tof11(left,i,iadc).lt.3786)) THEN
+          xhelp = tw11(left,i)/(tof11(left,i,iadc)**0.5)
+          tof11(left,i,itdc) = tof11(left,i,itdc) + xhelp
+          tdc_c(ch11a(i),hb11a(i))=tof11(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch11b(i),hb11b(i)).lt.4095).and.
+      &             (tof11(right,i,iadc).lt.3786)) THEN
+          xhelp = tw11(right,i)/(tof11(right,i,iadc)**0.5)
+          tof11(right,i,itdc) = tof11(right,i,itdc) + xhelp
+          tdc_c(ch11b(i),hb11b(i))=tof11(right,i,itdc)
+                                              ENDIF
+       ENDDO
+       DO i=1,6
+          if ((tdc(ch12a(i),hb12a(i)).lt.4095).and.
+      &             (tof12(left,i,iadc).lt.3786)) THEN
+          xhelp = tw12(left,i)/(tof12(left,i,iadc)**0.5)
+          tof12(left,i,itdc) = tof12(left,i,itdc) + xhelp
+          tdc_c(ch12a(i),hb12a(i))=tof12(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch12b(i),hb12b(i)).lt.4095).and.
+      &             (tof12(right,i,iadc).lt.3786)) THEN
+          xhelp = tw12(right,i)/(tof12(right,i,iadc)**0.5)
+          tof12(right,i,itdc) = tof12(right,i,itdc) + xhelp
+          tdc_c(ch12b(i),hb12b(i))=tof12(right,i,itdc)
+                                              ENDIF
+       ENDDO
+ C----
+       DO I=1,2
+          if ((tdc(ch21a(i),hb21a(i)).lt.4095).and.
+      &             (tof21(left,i,iadc).lt.3786)) THEN
+          xhelp = tw21(left,i)/(tof21(left,i,iadc)**0.5)
+          tof21(left,i,itdc) = tof21(left,i,itdc) + xhelp
+          tdc_c(ch21a(i),hb21a(i))=tof21(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch21b(i),hb21b(i)).lt.4095).and.
+      &             (tof21(right,i,iadc).lt.3786)) THEN
+          xhelp = tw21(right,i)/(tof21(right,i,iadc)**0.5)
+          tof21(right,i,itdc) = tof21(right,i,itdc) + xhelp
+          tdc_c(ch21b(i),hb21b(i))=tof21(right,i,itdc)
+                                              ENDIF
+       ENDDO
+       DO I=1,2
+          if ((tdc(ch22a(i),hb22a(i)).lt.4095).and.
+      &             (tof22(left,i,iadc).lt.3786)) THEN
+          xhelp = tw22(left,i)/(tof22(left,i,iadc)**0.5)
+          tof22(left,i,itdc) = tof22(left,i,itdc) + xhelp
+          tdc_c(ch22a(i),hb22a(i))=tof22(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch22b(i),hb22b(i)).lt.4095).and.
+      &             (tof22(right,i,iadc).lt.3786)) THEN
+          xhelp = tw22(right,i)/(tof22(right,i,iadc)**0.5)
+          tof22(right,i,itdc) = tof22(right,i,itdc) + xhelp
+          tdc_c(ch22b(i),hb22b(i))=tof22(right,i,itdc)
+                                              ENDIF
+       ENDDO
+ C----
+       DO I=1,3
+          if ((tdc(ch31a(i),hb31a(i)).lt.4095).and.
+      &             (tof31(left,i,iadc).lt.3786)) THEN
+          xhelp = tw31(left,i)/(tof31(left,i,iadc)**0.5)
+          tof31(left,i,itdc) = tof31(left,i,itdc) + xhelp
+          tdc_c(ch31a(i),hb31a(i))=tof31(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch31b(i),hb31b(i)).lt.4095).and.
+      &             (tof31(right,i,iadc).lt.3786)) THEN
+          xhelp = tw31(right,i)/(tof31(right,i,iadc)**0.5)
+          tof31(right,i,itdc) = tof31(right,i,itdc) + xhelp
+          tdc_c(ch31b(i),hb31b(i))=tof31(right,i,itdc)
+                                              ENDIF
+       ENDDO
+       DO I=1,3
+          if ((tdc(ch32a(i),hb32a(i)).lt.4095).and.
+      &             (tof32(left,i,iadc).lt.3786)) THEN
+          xhelp = tw32(left,i)/(tof32(left,i,iadc)**0.5)
+          tof32(left,i,itdc) = tof32(left,i,itdc) + xhelp
+          tdc_c(ch32a(i),hb32a(i))=tof32(left,i,itdc)
+                                               ENDIF
+          if ((tdc(ch32b(i),hb32b(i)).lt.4095).and.
+      &             (tof32(right,i,iadc).lt.3786)) THEN
+          xhelp = tw32(right,i)/(tof32(right,i,iadc)**0.5)
+          tof32(right,i,itdc) = tof32(right,i,itdc) + xhelp
+          tdc_c(ch32b(i),hb32b(i))=tof32(right,i,itdc)
+                                              ENDIF
+       ENDDO
+ C-----------------------------------------------------------------------
+ C--------------------Insert Artifical TDC Value  ---------------------
+ C     For each Paddle perform check:
+ C     if left paddle=4095  and right paddle OK => create TDC value left
+ C     if right paddle=4095  and left paddle OK => create TDC value right
+ C-----------------------------------------------------------------------
+ C-----------------------S11 -----------------------------------------
+       IF (tof11_i.GT.none_find) THEN
+          xpos = yout(1)
+          i = tof11_i
+         if ((tdc(ch11a(i),hb11a(i)).EQ.4095).AND.
+      &          (tdc(ch11b(i),hb11b(i)).LT.4095)) THEN
+           tof11(1,tof11_i,itdc) = tof11(2,tof11_i,itdc)
+      &           + 2*(y_coor_lin11(tof11_i,offset)
+      &           + xpos*y_coor_lin11(tof11_i,slope))
+             tdcflag(ch11a(i),hb11a(i)) = 1
+         ENDIF
+         if ((tdc(ch11b(i),hb11b(i)).EQ.4095).AND.
+      &          (tdc(ch11a(i),hb11a(i)).LT.4095)) THEN
+             tof11(2,tof11_i,itdc) = tof11(1,tof11_i,itdc)
+      &           - 2*(y_coor_lin11(tof11_i,offset)
+      &           + xpos*y_coor_lin11(tof11_i,slope))
+             tdcflag(ch11b(i),hb11b(i)) = 1
+          ENDIF
+       ENDIF
+ C-----------------------S12 -----------------------------------------
+       IF (tof12_i.GT.none_find) THEN
+          xpos = xout(2)
+          i = tof12_i
+         if ((tdc(ch12a(i),hb12a(i)).EQ.4095).AND.
+      &          (tdc(ch12b(i),hb12b(i)).LT.4095)) THEN
+             tof12(1,tof12_i,itdc) = tof12(2,tof12_i,itdc)
+      &           + 2*(x_coor_lin12(tof12_i,offset)
+      &           + xpos*x_coor_lin12(tof12_i,slope))
+             tdcflag(ch12a(i),hb12a(i)) = 1
+          ENDIF
+         if ((tdc(ch12b(i),hb12b(i)).EQ.4095).AND.
+      &          (tdc(ch12a(i),hb12a(i)).LT.4095)) THEN
+             tof12(2,tof12_i,itdc) = tof12(1,tof12_i,itdc)
+      &           - 2*(x_coor_lin12(tof12_i,offset)
+      &           + xpos*x_coor_lin12(tof12_i,slope))
+             tdcflag(ch12b(i),hb12b(i)) = 1
+          ENDIF
+       ENDIF
+ C-----------------------S21 -----------------------------------------
+       IF (tof21_i.GT.none_find) THEN
+          xpos = xout(3)
+          i = tof21_i
+         if ((tdc(ch21a(i),hb21a(i)).EQ.4095).AND.
+      &          (tdc(ch21b(i),hb21b(i)).LT.4095)) THEN
+             tof21(1,tof21_i,itdc) = tof21(2,tof21_i,itdc)
+      &           + 2*(x_coor_lin21(tof21_i,offset)
+      &           + xpos*x_coor_lin21(tof21_i,slope))
+             tdcflag(ch21a(i),hb21a(i)) = 1
+          ENDIF
+         if ((tdc(ch21b(i),hb21b(i)).EQ.4095).AND.
+      &          (tdc(ch21a(i),hb21a(i)).LT.4095)) THEN
+             tof21(2,tof21_i,itdc) = tof21(1,tof21_i,itdc)
+      &           - 2*(x_coor_lin21(tof21_i,offset)
+      &           + xpos*x_coor_lin21(tof21_i,slope))
+             tdcflag(ch21b(i),hb21b(i)) = 1
+          ENDIF
+       ENDIF
+ C-----------------------S22 -----------------------------------------
+       IF (tof22_i.GT.none_find) THEN
+          xpos = yout(4)
+          i = tof22_i
+         if ((tdc(ch22a(i),hb22a(i)).EQ.4095).AND.
+      &          (tdc(ch22b(i),hb22b(i)).LT.4095)) THEN
+             tof22(1,tof22_i,itdc) = tof22(2,tof22_i,itdc)
+      &           + 2*(y_coor_lin22(tof22_i,offset)
+      &           + xpos*y_coor_lin22(tof22_i,slope))
+             tdcflag(ch22a(i),hb22a(i)) = 1
+          ENDIF
+         if ((tdc(ch22b(i),hb22b(i)).EQ.4095).AND.
+      &          (tdc(ch22a(i),hb22a(i)).LT.4095)) THEN
+             tof22(2,tof22_i,itdc) = tof22(1,tof22_i,itdc)
+      &           - 2*(y_coor_lin22(tof22_i,offset)
+      &           + xpos*y_coor_lin22(tof22_i,slope))
+             tdcflag(ch22b(i),hb22b(i)) = 1
+          ENDIF
+       ENDIF
+ C-----------------------S31 -----------------------------------------
+       IF (tof31_i.GT.none_find) THEN
+          xpos = yout(5)
+          i = tof31_i
+         if ((tdc(ch31a(i),hb31a(i)).EQ.4095).AND.
+      &          (tdc(ch31b(i),hb31b(i)).LT.4095)) THEN
+             tof31(1,tof31_i,itdc) = tof31(2,tof31_i,itdc)
+      &           + 2*(y_coor_lin31(tof31_i,offset)
+      &           + xpos*y_coor_lin31(tof31_i,slope))
+             tdcflag(ch31a(i),hb31a(i)) = 1
+          ENDIF
+         if ((tdc(ch31b(i),hb31b(i)).EQ.4095).AND.
+      &          (tdc(ch31a(i),hb31a(i)).LT.4095)) THEN
+             tof31(2,tof31_i,itdc) = tof31(1,tof31_i,itdc)
+      &           - 2*(y_coor_lin31(tof31_i,offset)
+      &           + xpos*y_coor_lin31(tof31_i,slope))
+             tdcflag(ch31b(i),hb31b(i)) = 1
+          ENDIF
+       ENDIF
+ C-----------------------S32 -----------------------------------------
+       IF (tof32_i.GT.none_find) THEN
+          xpos = xout(6)
+          i = tof32_i
+         if ((tdc(ch32a(i),hb32a(i)).EQ.4095).AND.
+      &          (tdc(ch32b(i),hb32b(i)).LT.4095)) THEN
+             tof32(1,tof32_i,itdc) = tof32(2,tof32_i,itdc)
+      &           + 2*(x_coor_lin32(tof32_i,offset)
+      &           + xpos*x_coor_lin32(tof32_i,slope))
+             tdcflag(ch32a(i),hb32a(i)) = 1
+          ENDIF
+         if ((tdc(ch32b(i),hb32b(i)).EQ.4095).AND.
+      &          (tdc(ch32a(i),hb32a(i)).LT.4095)) THEN
+             tof32(2,tof32_i,itdc) = tof32(1,tof32_i,itdc)
+      &           - 2*(x_coor_lin32(tof32_i,offset)
+      &           + xpos*x_coor_lin32(tof32_i,slope))
+             tdcflag(ch32b(i),hb32b(i)) = 1
+          ENDIF
+       ENDIF
  C------------------------------------------------------------------
  C---  calculate track position in paddle using timing difference
-Line 781 
 C---------------------------------------
+Line 1145 
 C---------------------------------------
        do i=1,3
           xtofpos(i)=100.
           ytofpos(i)=100.
        enddo
  C-----------------------------S1 --------------------------------
        IF (tof11_i.GT.none_find) THEN
           IF ((tof11(1,tof11_i,itdc).NE.4095).AND.
       &       (tof11(2,tof11_i,itdc).NE.4095)) THEN
           ytofpos(1)  = ((tof11(1,tof11_i,itdc)-tof11(2,tof11_i,itdc))/2.
       +        -y_coor_lin11(tof11_i,offset))/y_coor_lin11(tof11_i,slope)
          if (abs(ytofpos(1)).gt.26.)  ytofpos(1)=101.
+       i=tof11_i
        endif
        endif
-Line 799 
 C-----------------------------S1 -------
+Line 1165 
 C-----------------------------S1 -------
           xtofpos(1)  = ((tof12(1,tof12_i,itdc)-tof12(2,tof12_i,itdc))/2.
       +        -x_coor_lin12(tof12_i,offset))/x_coor_lin12(tof12_i,slope)
          if (abs(xtofpos(1)).gt.31.)  xtofpos(1)=101.
+       i=tof12_i
        endif
        endif
  C-----------------------------S2 --------------------------------
        IF (tof21_i.GT.none_find) THEN
           IF ((tof21(1,tof21_i,itdc).NE.4095).AND.
       &       (tof21(2,tof21_i,itdc).NE.4095)) THEN
           xtofpos(2) = ((tof21(1,tof21_i,itdc)-tof21(2,tof21_i,itdc))/2.
       +        -x_coor_lin21(tof21_i,offset))/x_coor_lin21(tof21_i,slope)
          if (abs(xtofpos(2)).gt.19.)  xtofpos(2)=101.
+       i=tof21_i
        endif
        endif
-Line 819 
 C-----------------------------S2 -------
+Line 1187 
 C-----------------------------S2 -------
           ytofpos(2) = ((tof22(1,tof22_i,itdc)-tof22(2,tof22_i,itdc))/2.
       +        -y_coor_lin22(tof22_i,offset))/y_coor_lin22(tof22_i,slope)
          if (abs(ytofpos(2)).gt.18.)  ytofpos(2)=101.
+       i=tof22_i
        endif
        endif
  C-----------------------------S3 --------------------------------
        IF (tof31_i.GT.none_find) THEN
           IF ((tof31(1,tof31_i,itdc).NE.4095).AND.
       &       (tof31(2,tof31_i,itdc).NE.4095)) THEN
           ytofpos(3)  = ((tof31(1,tof31_i,itdc)-tof31(2,tof31_i,itdc))/2.
       +        -y_coor_lin31(tof31_i,offset))/y_coor_lin31(tof31_i,slope)
          if (abs(ytofpos(3)).gt.18.)  ytofpos(3)=101.
+       i=tof31_i
        endif
        endif
-Line 839 
 C-----------------------------S3 -------
+Line 1209 
 C-----------------------------S3 -------
           xtofpos(3)  = ((tof32(1,tof32_i,itdc)-tof32(2,tof32_i,itdc))/2.
       +        -x_coor_lin32(tof32_i,offset))/x_coor_lin32(tof32_i,slope)
          if (abs(xtofpos(3)).gt.19.)  xtofpos(3)=101.
+       i=tof32_i
        endif
        endif
  c      do i=1,3
  c         if (abs(xtofpos(i)).gt.100.) then
  c            xtofpos(i)=101.
-Line 849 
 c         endif
+Line 1220 
 c         endif
  c         if (abs(ytofpos(i)).gt.100.) then
  c            ytofpos(i)=101.
  c         endif
  c      enddo
  C--------------------------------------------------------------------
- C--------------------Time walk correction  -------------------------
+ C-------------------Corrections on ADC-data -------------------------
- C--------------------------------------------------------------------
-       DO i=1,8
-          xhelp= 0.
-          xhelp_a = tof11(left,i,iadc)
-          xhelp_t = tof11(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw11(left,i)/sqrt(xhelp_a)
-          tof11(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch11a(i),hb11a(i))=tof11(left,i,itdc)
-          xhelp_a = tof11(right,i,iadc)
-          xhelp_t = tof11(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw11(right,i)/sqrt(xhelp_a)
-          tof11(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch11b(i),hb11b(i))=tof11(right,i,itdc)
-       ENDDO
-       DO i=1,6
-          xhelp= 0.
-          xhelp_a = tof12(left,i,iadc)
-          xhelp_t = tof12(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw12(left,i)/sqrt(xhelp_a)
-          tof12(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch12a(i),hb12a(i))=tof12(left,i,itdc)
-          xhelp_a = tof12(right,i,iadc)
-          xhelp_t = tof12(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw12(right,i)/sqrt(xhelp_a)
-          tof12(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch12b(i),hb12b(i))=tof12(right,i,itdc)
-       ENDDO
- C----
-       DO i=1,2
-          xhelp= 0.
-          xhelp_a = tof21(left,i,iadc)
-          xhelp_t = tof21(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw21(left,i)/sqrt(xhelp_a)
-          tof21(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch21a(i),hb21a(i))=tof21(left,i,itdc)
-          xhelp_a = tof21(right,i,iadc)
-          xhelp_t = tof21(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw21(right,i)/sqrt(xhelp_a)
-          tof21(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch21b(i),hb21b(i))=tof21(right,i,itdc)
-       ENDDO
-       DO i=1,2
-          xhelp= 0.
-          xhelp_a = tof22(left,i,iadc)
-          xhelp_t = tof22(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw22(left,i)/sqrt(xhelp_a)
-          tof22(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch22a(i),hb22a(i))=tof22(left,i,itdc)
-          xhelp_a = tof22(right,i,iadc)
-          xhelp_t = tof22(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw22(right,i)/sqrt(xhelp_a)
-          tof22(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch22b(i),hb22b(i))=tof22(right,i,itdc)
-       ENDDO
- C----
-       DO i=1,3
-          xhelp= 0.
-          xhelp_a = tof31(left,i,iadc)
-          xhelp_t = tof31(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw31(left,i)/sqrt(xhelp_a)
-          tof31(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch31a(i),hb31a(i))=tof31(left,i,itdc)
-          xhelp_a = tof31(right,i,iadc)
-          xhelp_t = tof31(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw31(right,i)/sqrt(xhelp_a)
-          tof31(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch31b(i),hb31b(i))=tof31(right,i,itdc)
-       ENDDO
-       DO i=1,3
-          xhelp= 0.
-          xhelp_a = tof32(left,i,iadc)
-          xhelp_t = tof32(left,i,itdc)
-          if(xhelp_a<4095) xhelp = tw32(left,i)/sqrt(xhelp_a)
-          tof32(left,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch32a(i),hb32a(i))=tof32(left,i,itdc)
-          xhelp_a = tof32(right,i,iadc)
-          xhelp_t = tof32(right,i,itdc)
-          if(xhelp_a<4095) xhelp = tw32(right,i)/sqrt(xhelp_a)
-          tof32(right,i,itdc) = xhelp_t  + xhelp
-          tdc_c(ch32b(i),hb32b(i))=tof32(right,i,itdc)
-       ENDDO
- C---------------------------------------------------------------------
- C--------------------Corrections on ADC-data -------------------------
  C-----------------angle and ADC(x) correction -----------------------
+ C----------------   moved to the new dEdx routine -------------------
- C-----------------------------S1 -------------------------------------
+ C--------------------------------------------------------------------
-       yhelp=yout(1)
-       phi   = atan(tan(THYOUT(1))/tan(THXOUT(1)))
-       theta = atan(tan(THXOUT(1))/cos(phi))
-       IF (tof11_i.GT.none_find.AND.yhelp.lt.100) THEN
-          i = tof11_i
-          if (tof11(left,i,iadc).lt.4095) then
-             tof11(left,i,iadc) = tof11(left,i,iadc)*cos(theta)
-             xkorr=adcx11(left,i,1)*exp(-yhelp/adcx11(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch11a(i),hb11a(i))=tof11(left,i,iadc)/xkorr
-          endif
-          if (tof11(right,i,iadc).lt.4095) then
-             tof11(right,i,iadc) = tof11(right,i,iadc)*cos(theta)
-             xkorr=adcx11(right,i,1)*exp(yhelp/adcx11(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch11b(i),hb11b(i))=tof11(right,i,iadc)/xkorr
-          endif
-       ENDIF
-       xhelp=xout(2)
-       phi   = atan(tan(THYOUT(2))/tan(THXOUT(2)))
-       theta = atan(tan(THXOUT(2))/cos(phi))
- c      write(*,*) 'theta12 ',theta
-       IF (tof12_i.GT.none_find.AND.xhelp.lt.100) THEN
-          i = tof12_i
-          if (tof12(left,i,iadc).lt.4095) then
-             tof12(left,i,iadc) = tof12(left,i,iadc)*cos(theta)
-             xkorr=adcx12(left,i,1)*exp(-xhelp/adcx12(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch12a(i),hb12a(i))=tof12(left,i,iadc)/xkorr
-          endif
-          if (tof12(right,i,iadc).lt.4095) then
-             tof12(right,i,iadc) = tof12(right,i,iadc)*cos(theta)
-             xkorr=adcx12(right,i,1)*exp(xhelp/adcx12(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch12b(i),hb12b(i))=tof12(right,i,iadc)/xkorr
-          endif
-       ENDIF
- C-----------------------------S2 --------------------------------
-       xhelp=xout(3)
-       phi   = atan(tan(THYOUT(3))/tan(THXOUT(3)))
-       theta = atan(tan(THXOUT(3))/cos(phi))
- c      write(*,*) 'theta21 ',theta
-       IF (tof21_i.GT.none_find.AND.xhelp.lt.100) THEN
-          i = tof21_i
-          if (tof21(left,i,iadc).lt.4095) then
-             tof21(left,i,iadc) = tof21(left,i,iadc)*cos(theta)
-             xkorr=adcx21(left,i,1)*exp(-xhelp/adcx21(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch21a(i),hb21a(i))=tof21(left,i,iadc)/xkorr
-          endif
-          if (tof21(right,i,iadc).lt.4095) then
-             tof21(right,i,iadc) = tof21(right,i,iadc)*cos(theta)
-             xkorr=adcx21(right,i,1)*exp(xhelp/adcx21(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch21b(i),hb21b(i))=tof21(right,i,iadc)/xkorr
-          endif
-       ENDIF
-       yhelp=yout(4)
-       phi   = atan(tan(THYOUT(4))/tan(THXOUT(4)))
-       theta = atan(tan(THXOUT(4))/cos(phi))
- c      write(*,*) 'theta22 ',theta
-       IF (tof22_i.GT.none_find.AND.yhelp.lt.100) THEN
-          i = tof22_i
-          if (tof22(left,i,iadc).lt.4095) then
-             tof22(left,i,iadc) = tof22(left,i,iadc)*cos(theta)
-             xkorr=adcx22(left,i,1)*exp(-yhelp/adcx22(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch22a(i),hb22a(i))=tof22(left,i,iadc)/xkorr
-          endif
-          if (tof22(right,i,iadc).lt.4095) then
-             tof22(right,i,iadc) = tof22(right,i,iadc)*cos(theta)
-             xkorr=adcx22(right,i,1)*exp(yhelp/adcx22(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch22b(i),hb22b(i))=tof22(right,i,iadc)/xkorr
-          endif
-       ENDIF
- C-----------------------------S3 --------------------------------
-       yhelp=yout(5)
-       phi   = atan(tan(THYOUT(5))/tan(THXOUT(5)))
-       theta = atan(tan(THXOUT(5))/cos(phi))
- c      write(*,*) 'theta31 ',theta
-       IF (tof31_i.GT.none_find.AND.yhelp.lt.100) THEN
-          i = tof31_i
-          if (tof31(left,i,iadc).lt.4095) then
-             tof31(left,i,iadc) = tof31(left,i,iadc)*cos(theta)
-             xkorr=adcx31(left,i,1)*exp(-yhelp/adcx31(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch31a(i),hb31a(i))=tof31(left,i,iadc)/xkorr
-          endif
-          if (tof31(right,i,iadc).lt.4095) then
-             tof31(right,i,iadc) = tof31(right,i,iadc)*cos(theta)
-             xkorr=adcx31(right,i,1)*exp(yhelp/adcx31(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch31b(i),hb31b(i))=tof31(right,i,iadc)/xkorr
-          endif
-       ENDIF
-       xhelp=xout(6)
-       phi   = atan(tan(THYOUT(6))/tan(THXOUT(6)))
-       theta = atan(tan(THXOUT(6))/cos(phi))
- c      write(*,*) 'theta32 ',theta
-       IF (tof32_i.GT.none_find.AND.xhelp.lt.100) THEN
-          i = tof32_i
-          if (tof32(left,i,iadc).lt.4095) then
-             tof32(left,i,iadc) = tof32(left,i,iadc)*cos(theta)
-             xkorr=adcx32(left,i,1)*exp(-xhelp/adcx32(left,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch32a(i),hb32a(i))=tof32(left,i,iadc)/xkorr
-          endif
-          if (tof32(right,i,iadc).lt.4095) then
-             tof32(right,i,iadc) = tof32(right,i,iadc)*cos(theta)
-             xkorr=adcx32(right,i,1)*exp(xhelp/adcx32(right,i,2))
-             xkorr=xkorr/hepratio
-             adc_c(ch32b(i),hb32b(i))=tof32(right,i,iadc)/xkorr
-          endif
-       ENDIF
- C-----------------------------------------------------------------------
  C----------------------calculate Beta  ------------------------------
- C-----------------------------------------------------------------------
+ C--------------------------------------------------------------------
- C-------------------difference of sums  ---------------------------
+ C---------------------difference of sums  ---------------------------
  C
  C     DS = (t1+t2) - t3+t4)
  C     DS = c1 + c2/beta*cos(theta)
  C     c2 = 2d/c   gives c2 = 2d/(c*TDCresolution)  TDC=50ps/channel
  C     =>  c2 =  ca.60 for  0.45 m    c2 = ca.109  for 0.81 m
  C     since TDC resolution varies slightly c2 has to be calibrated
  C     instead of cos(theta) use factor F:
  C     F =  pathlength/d
  C     => beta = c2*F/(DS-c1))
+ C---------------------     S11 - S31  ------------------------
        dist = ZTOF(1) - ZTOF(5)
        dl = 0.
        DO I=1,5
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
- C     S11 - S31
  C      IF (tof11_i.GT.none_find.AND.tof31_i.GT.none_find) THEN
        IF ((tof11_i.GT.none_find).AND.(tof31_i.GT.none_find).AND.
       &    (ytofpos(1).NE.101.).AND.(ytofpos(3).NE.101.)) THEN
-Line 1123 
 C      IF (tof11_i.GT.none_find.AND.tof3
+Line 1261 
 C      IF (tof11_i.GT.none_find.AND.tof3
           t2 = tof11(2,tof11_i,itdc)
           t3 = tof31(1,tof31_i,itdc)
           t4 = tof31(2,tof31_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof11(1,tof11_i,itdc)+tof11(2,tof11_i,itdc)
              xhelp2 = tof31(1,tof31_i,itdc)+tof31(2,tof31_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof11_i-1)*3+tof31_i
-             c1 = k_S11S31(1,ihelp)
+             if (iz.le.1) c1 = k_S11S31(1,ihelp)
-             c2 = k_S11S31(2,ihelp)
+             if (iz.eq.2) c1 = k_S11S31(2,ihelp)
+             if (iz.gt.2) c1 = k_S11S31(3,ihelp)
+ c        write(*,*)k_S11S31(1,ihelp),k_S11S31(2,ihelp),k_S11S31(3,ihelp)
+ c        write(*,*)iz,c1,c2
              beta_a(1) = c2*F/(ds-c1)
- C     write(*,*) 'S11-S31 ',xhelp1,xhelp2, beta_a(1)
+ c       write(*,*) 'S11-S31 ',c1,c2,F
+ c       write(*,*) 'S11-S31 ',xhelp1,xhelp2, beta_a(1)
  C-------ToF Mask - S11 - S31
              tofmask(ch11a(tof11_i),hb11a(tof11_i)) =
-Line 1142 
 C-------ToF Mask - S11 - S31
+Line 1284 
 C-------ToF Mask - S11 - S31
              tofmask(ch31a(tof31_i),hb31a(tof31_i)) =
       $           tofmask(ch31a(tof31_i),hb31a(tof31_i)) + 1
              tofmask(ch31b(tof31_i),hb31b(tof31_i)) =
       $           tofmask(ch31b(tof31_i),hb31b(tof31_i)) + 1
           ENDIF
        ENDIF
+ C---------------------     S11 - S32  ------------------------
        dist = ZTOF(1) - ZTOF(6)
        dl = 0.
        DO I=1,6
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
- C     S11 - S32
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof11_i.GT.none_find.AND.tof32_i.GT.none_find) THEN
         IF ((tof11_i.GT.none_find).AND.(tof32_i.GT.none_find).AND.
       &    (ytofpos(1).NE.101.).AND.(xtofpos(3).NE.101.)) THEN
-Line 1163 
 C      IF (tof11_i.GT.none_find.AND.tof3
+Line 1308 
 C      IF (tof11_i.GT.none_find.AND.tof3
           t2 = tof11(2,tof11_i,itdc)
           t3 = tof32(1,tof32_i,itdc)
           t4 = tof32(2,tof32_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof11(1,tof11_i,itdc)+tof11(2,tof11_i,itdc)
              xhelp2 = tof32(1,tof32_i,itdc)+tof32(2,tof32_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof11_i-1)*3+tof32_i
-             c1 = k_S11S32(1,ihelp)
+             if (iz.le.1) c1 = k_S11S32(1,ihelp)
-             c2 = k_S11S32(2,ihelp)
+             if (iz.eq.2) c1 = k_S11S32(2,ihelp)
+             if (iz.gt.2) c1 = k_S11S32(3,ihelp)
              beta_a(2) = c2*F/(ds-c1)
  C     write(*,*) 'S11-S32 ',xhelp1,xhelp2, beta_a(2)
-Line 1183 
 C-------ToF Mask - S11 - S32
+Line 1329 
 C-------ToF Mask - S11 - S32
              tofmask(ch32a(tof32_i),hb32a(tof32_i)) =
       $           tofmask(ch32a(tof32_i),hb32a(tof32_i)) + 1
              tofmask(ch32b(tof32_i),hb32b(tof32_i)) =
       $           tofmask(ch32b(tof32_i),hb32b(tof32_i)) + 1
  C-------
-Line 1191 
 C-------
+Line 1337 
 C-------
           ENDIF
        ENDIF
- C     S12 - S31
+ C---------------------     S12 - S31  ------------------------
        dist = ZTOF(2) - ZTOF(5)
        dl = 0.
        DO I=2,5
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof12_i.GT.none_find.AND.tof31_i.GT.none_find) THEN
         IF ((tof12_i.GT.none_find).AND.(tof31_i.GT.none_find).AND.
-Line 1206 
 C      IF (tof12_i.GT.none_find.AND.tof3
+Line 1355 
 C      IF (tof12_i.GT.none_find.AND.tof3
           t2 = tof12(2,tof12_i,itdc)
           t3 = tof31(1,tof31_i,itdc)
           t4 = tof31(2,tof31_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof12(1,tof12_i,itdc)+tof12(2,tof12_i,itdc)
              xhelp2 = tof31(1,tof31_i,itdc)+tof31(2,tof31_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof12_i-1)*3+tof31_i
-             c1 = k_S12S31(1,ihelp)
+             if (iz.le.1) c1 = k_S12S31(1,ihelp)
-             c2 = k_S12S31(2,ihelp)
+             if (iz.eq.2) c1 = k_S12S31(2,ihelp)
+             if (iz.gt.2) c1 = k_S12S31(3,ihelp)
              beta_a(3) = c2*F/(ds-c1)
  C     write(*,*) 'S12-S31 ',xhelp1,xhelp2, beta_a(3)
-Line 1226 
 C-------ToF Mask - S12 - S31
+Line 1376 
 C-------ToF Mask - S12 - S31
              tofmask(ch31a(tof31_i),hb31a(tof31_i)) =
       $           tofmask(ch31a(tof31_i),hb31a(tof31_i)) + 1
              tofmask(ch31b(tof31_i),hb31b(tof31_i)) =
       $           tofmask(ch31b(tof31_i),hb31b(tof31_i)) + 1
  C-------
-Line 1234 
 C-------
+Line 1384 
 C-------
           ENDIF
        ENDIF
- C     S12 - S32
+ C---------------------     S12 - S32  ------------------------
        dist = ZTOF(2) - ZTOF(6)
        dl = 0.
        DO I=2,6
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof12_i.GT.none_find.AND.tof32_i.GT.none_find) THEN
         IF ((tof12_i.GT.none_find).AND.(tof32_i.GT.none_find).AND.
-Line 1250 
 C      IF (tof12_i.GT.none_find.AND.tof3
+Line 1402 
 C      IF (tof12_i.GT.none_find.AND.tof3
           t2 = tof12(2,tof12_i,itdc)
           t3 = tof32(1,tof32_i,itdc)
           t4 = tof32(2,tof32_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof12(1,tof12_i,itdc)+tof12(2,tof12_i,itdc)
              xhelp2 = tof32(1,tof32_i,itdc)+tof32(2,tof32_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof12_i-1)*3+tof32_i
-             c1 = k_S12S32(1,ihelp)
+             if (iz.le.1) c1 = k_S12S32(1,ihelp)
-             c2 = k_S12S32(2,ihelp)
+             if (iz.eq.2) c1 = k_S12S32(2,ihelp)
+             if (iz.gt.2) c1 = k_S12S32(3,ihelp)
              beta_a(4) = c2*F/(ds-c1)
  C     write(*,*) 'S12-S32 ',xhelp1,xhelp2, beta_a(4)
-Line 1270 
 C-------ToF Mask - S12 - S32
+Line 1423 
 C-------ToF Mask - S12 - S32
              tofmask(ch32a(tof32_i),hb32a(tof32_i)) =
       $           tofmask(ch32a(tof32_i),hb32a(tof32_i)) + 1
              tofmask(ch32b(tof32_i),hb32b(tof32_i)) =
       $           tofmask(ch32b(tof32_i),hb32b(tof32_i)) + 1
  C-------
-Line 1278 
 C-------
+Line 1431 
 C-------
           ENDIF
        ENDIF
- C     S21 - S31
+ C---------------------     S21 - S31  ------------------------
        dist = ZTOF(3) - ZTOF(5)
        dl = 0.
        DO I=3,5
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof21_i.GT.none_find.AND.tof31_i.GT.none_find) THEN
         IF ((tof21_i.GT.none_find).AND.(tof31_i.GT.none_find).AND.
-Line 1294 
 C      IF (tof21_i.GT.none_find.AND.tof3
+Line 1449 
 C      IF (tof21_i.GT.none_find.AND.tof3
           t2 = tof21(2,tof21_i,itdc)
           t3 = tof31(1,tof31_i,itdc)
           t4 = tof31(2,tof31_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof21(1,tof21_i,itdc)+tof21(2,tof21_i,itdc)
              xhelp2 = tof31(1,tof31_i,itdc)+tof31(2,tof31_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof21_i-1)*3+tof31_i
-             c1 = k_S21S31(1,ihelp)
+             if (iz.le.1) c1 = k_S21S31(1,ihelp)
-             c2 = k_S21S31(2,ihelp)
+             if (iz.eq.2) c1 = k_S21S31(2,ihelp)
+             if (iz.gt.2) c1 = k_S21S31(3,ihelp)
              beta_a(5) = c2*F/(ds-c1)
  C-------ToF Mask - S21 - S31
-Line 1313 
 C-------ToF Mask - S21 - S31
+Line 1469 
 C-------ToF Mask - S21 - S31
              tofmask(ch31a(tof31_i),hb31a(tof31_i)) =
       $           tofmask(ch31a(tof31_i),hb31a(tof31_i)) + 1
              tofmask(ch31b(tof31_i),hb31b(tof31_i)) =
       $           tofmask(ch31b(tof31_i),hb31b(tof31_i)) + 1
  C-------
-Line 1321 
 C-------
+Line 1477 
 C-------
           ENDIF
        ENDIF
- C     S21 - S32
+ C---------------------     S21 - S32  ------------------------
        dist = ZTOF(3) - ZTOF(6)
        dl = 0.
        DO I=3,6
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof21_i.GT.none_find.AND.tof32_i.GT.none_find) THEN
         IF ((tof21_i.GT.none_find).AND.(tof32_i.GT.none_find).AND.
-Line 1337 
 C      IF (tof21_i.GT.none_find.AND.tof3
+Line 1495 
 C      IF (tof21_i.GT.none_find.AND.tof3
           t2 = tof21(2,tof21_i,itdc)
           t3 = tof32(1,tof32_i,itdc)
           t4 = tof32(2,tof32_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof21(1,tof21_i,itdc)+tof21(2,tof21_i,itdc)
              xhelp2 = tof32(1,tof32_i,itdc)+tof32(2,tof32_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof21_i-1)*3+tof32_i
-             c1 = k_S21S32(1,ihelp)
+             if (iz.le.1) c1 = k_S21S32(1,ihelp)
-             c2 = k_S21S32(2,ihelp)
+             if (iz.eq.2) c1 = k_S21S32(2,ihelp)
+             if (iz.gt.2) c1 = k_S21S32(3,ihelp)
              beta_a(6) = c2*F/(ds-c1)
  C-------ToF Mask - S21 - S32
-Line 1356 
 C-------ToF Mask - S21 - S32
+Line 1515 
 C-------ToF Mask - S21 - S32
              tofmask(ch32a(tof32_i),hb32a(tof32_i)) =
       $           tofmask(ch32a(tof32_i),hb32a(tof32_i)) + 1
              tofmask(ch32b(tof32_i),hb32b(tof32_i)) =
       $           tofmask(ch32b(tof32_i),hb32b(tof32_i)) + 1
  C-------
-Line 1364 
 C-------
+Line 1523 
 C-------
           ENDIF
        ENDIF
- C     S22 - S31
+ C---------------------     S22 - S31  ------------------------
        dist = ZTOF(4) - ZTOF(5)
        dl = 0.
        DO I=4,5
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
+ C WM workaround
+       dl = dl - 0.06*F
+       F = dl/dist
  C      IF (tof22_i.GT.none_find.AND.tof31_i.GT.none_find) THEN
         IF ((tof22_i.GT.none_find).AND.(tof31_i.GT.none_find).AND.
-Line 1380 
 C      IF (tof22_i.GT.none_find.AND.tof3
+Line 1545 
 C      IF (tof22_i.GT.none_find.AND.tof3
           t2 = tof22(2,tof22_i,itdc)
           t3 = tof31(1,tof31_i,itdc)
           t4 = tof31(2,tof31_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof22(1,tof22_i,itdc)+tof22(2,tof22_i,itdc)
              xhelp2 = tof31(1,tof31_i,itdc)+tof31(2,tof31_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof22_i-1)*3+tof31_i
-             c1 = k_S22S31(1,ihelp)
+             if (iz.le.1) c1 = k_S22S31(1,ihelp)
-             c2 = k_S22S31(2,ihelp)
+             if (iz.eq.2) c1 = k_S22S31(2,ihelp)
+             if (iz.gt.2) c1 = k_S22S31(3,ihelp)
              beta_a(7) = c2*F/(ds-c1)
  C-------ToF Mask - S22 - S31
-Line 1399 
 C-------ToF Mask - S22 - S31
+Line 1565 
 C-------ToF Mask - S22 - S31
              tofmask(ch31a(tof31_i),hb31a(tof31_i)) =
       $           tofmask(ch31a(tof31_i),hb31a(tof31_i)) + 1
              tofmask(ch31b(tof31_i),hb31b(tof31_i)) =
       $           tofmask(ch31b(tof31_i),hb31b(tof31_i)) + 1
  C-------
           ENDIF
        ENDIF
- C     S22 - S32
+ C---------------------     S22 - S32  ------------------------
        dist = ZTOF(4) - ZTOF(6)
        dl = 0.
        DO I=4,6
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
+ C WM workaround
+       dl = dl - 0.06*F
+       F = dl/dist
  C      IF (tof22_i.GT.none_find.AND.tof32_i.GT.none_find) THEN
         IF ((tof22_i.GT.none_find).AND.(tof32_i.GT.none_find).AND.
-Line 1423 
 C      IF (tof22_i.GT.none_find.AND.tof3
+Line 1597 
 C      IF (tof22_i.GT.none_find.AND.tof3
           t2 = tof22(2,tof22_i,itdc)
           t3 = tof32(1,tof32_i,itdc)
           t4 = tof32(2,tof32_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof22(1,tof22_i,itdc)+tof22(2,tof22_i,itdc)
              xhelp2 = tof32(1,tof32_i,itdc)+tof32(2,tof32_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof22_i-1)*3+tof32_i
-             c1 = k_S22S32(1,ihelp)
+             if (iz.le.1) c1 = k_S22S32(1,ihelp)
-             c2 = k_S22S32(2,ihelp)
+             if (iz.eq.2) c1 = k_S22S32(2,ihelp)
+             if (iz.gt.2) c1 = k_S22S32(3,ihelp)
              beta_a(8) = c2*F/(ds-c1)
  C-------ToF Mask - S22 - S32
-Line 1442 
 C-------ToF Mask - S22 - S32
+Line 1617 
 C-------ToF Mask - S22 - S32
              tofmask(ch32a(tof32_i),hb32a(tof32_i)) =
       $           tofmask(ch32a(tof32_i),hb32a(tof32_i)) + 1
              tofmask(ch32b(tof32_i),hb32b(tof32_i)) =
       $           tofmask(ch32b(tof32_i),hb32b(tof32_i)) + 1
  C-------
-Line 1450 
 C-------
+Line 1625 
 C-------
           ENDIF
        ENDIF
- C     S11 - S21
+ C---------------------     S11 - S21  ------------------------
        dist = ZTOF(1) - ZTOF(3)
        dl = 0.
        DO I=1,3
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
+ C WM workaround
+       dl = dl - 0.442*F
+       F = dl/dist
  C      IF (tof11_i.GT.none_find.AND.tof21_i.GT.none_find) THEN
         IF ((tof11_i.GT.none_find).AND.(tof21_i.GT.none_find).AND.
-Line 1466 
 C      IF (tof11_i.GT.none_find.AND.tof2
+Line 1647 
 C      IF (tof11_i.GT.none_find.AND.tof2
           t2 = tof11(2,tof11_i,itdc)
           t3 = tof21(1,tof21_i,itdc)
           t4 = tof21(2,tof21_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof11(1,tof11_i,itdc)+tof11(2,tof11_i,itdc)
              xhelp2 = tof21(1,tof21_i,itdc)+tof21(2,tof21_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof11_i-1)*2+tof21_i
-             c1 = k_S11S21(1,ihelp)
+             if (iz.le.1) c1 = k_S11S21(1,ihelp)
-             c2 = k_S11S21(2,ihelp)
+             if (iz.eq.2) c1 = k_S11S21(2,ihelp)
+             if (iz.gt.2) c1 = k_S11S21(3,ihelp)
              beta_a(9) = c2*F/(ds-c1)
  C-------ToF Mask - S11 - S21
-Line 1485 
 C-------ToF Mask - S11 - S21
+Line 1667 
 C-------ToF Mask - S11 - S21
              tofmask(ch21a(tof21_i),hb21a(tof21_i)) =
       $           tofmask(ch21a(tof21_i),hb21a(tof21_i)) + 1
              tofmask(ch21b(tof21_i),hb21b(tof21_i)) =
       $           tofmask(ch21b(tof21_i),hb21b(tof21_i)) + 1
  C-------
           ENDIF
        ENDIF
- C     S11 - S22
+ C---------------------     S11 - S22  ------------------------
        dist = ZTOF(1) - ZTOF(4)
        dl = 0.
        DO I=1,4
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof11_i.GT.none_find.AND.tof22_i.GT.none_find) THEN
         IF ((tof11_i.GT.none_find).AND.(tof22_i.GT.none_find).AND.
-Line 1509 
 C      IF (tof11_i.GT.none_find.AND.tof2
+Line 1693 
 C      IF (tof11_i.GT.none_find.AND.tof2
           t2 = tof11(2,tof11_i,itdc)
           t3 = tof22(1,tof22_i,itdc)
           t4 = tof22(2,tof22_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof11(1,tof11_i,itdc)+tof11(2,tof11_i,itdc)
              xhelp2 = tof22(1,tof22_i,itdc)+tof22(2,tof22_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof11_i-1)*2+tof22_i
-             c1 = k_S11S22(1,ihelp)
+             if (iz.le.1) c1 = k_S11S22(1,ihelp)
-             c2 = k_S11S22(2,ihelp)
+             if (iz.eq.2) c1 = k_S11S22(2,ihelp)
+             if (iz.gt.2) c1 = k_S11S22(3,ihelp)
              beta_a(10) = c2*F/(ds-c1)
  C-------ToF Mask - S11 - S22
-Line 1528 
 C-------ToF Mask - S11 - S22
+Line 1713 
 C-------ToF Mask - S11 - S22
              tofmask(ch22a(tof22_i),hb22a(tof22_i)) =
       $           tofmask(ch22a(tof22_i),hb22a(tof22_i)) + 1
              tofmask(ch22b(tof22_i),hb22b(tof22_i)) =
       $           tofmask(ch22b(tof22_i),hb22b(tof22_i)) + 1
  C-------
-Line 1536 
 C-------
+Line 1721 
 C-------
           ENDIF
        ENDIF
- C     S12 - S21
+ C---------------------     S12 - S21  ------------------------
        dist = ZTOF(2) - ZTOF(3)
        dl = 0.
        DO I=2,3
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
+ C  WM workaround
+       dl = dl - 0.442*F
+       F = dl/dist
  C      IF (tof12_i.GT.none_find.AND.tof21_i.GT.none_find) THEN
         IF ((tof12_i.GT.none_find).AND.(tof21_i.GT.none_find).AND.
-Line 1552 
 C      IF (tof12_i.GT.none_find.AND.tof2
+Line 1743 
 C      IF (tof12_i.GT.none_find.AND.tof2
           t2 = tof12(2,tof12_i,itdc)
           t3 = tof21(1,tof21_i,itdc)
           t4 = tof21(2,tof21_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof12(1,tof12_i,itdc)+tof12(2,tof12_i,itdc)
              xhelp2 = tof21(1,tof21_i,itdc)+tof21(2,tof21_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof12_i-1)*2+tof21_i
-             c1 = k_S12S21(1,ihelp)
+             if (iz.le.1) c1 = k_S12S21(1,ihelp)
-             c2 = k_S12S21(2,ihelp)
+             if (iz.eq.2) c1 = k_S12S21(2,ihelp)
+             if (iz.gt.2) c1 = k_S12S21(3,ihelp)
              beta_a(11) = c2*F/(ds-c1)
  C-------ToF Mask - S12 - S21
-Line 1571 
 C-------ToF Mask - S12 - S21
+Line 1763 
 C-------ToF Mask - S12 - S21
              tofmask(ch21a(tof21_i),hb21a(tof21_i)) =
       $           tofmask(ch21a(tof21_i),hb21a(tof21_i)) + 1
              tofmask(ch21b(tof21_i),hb21b(tof21_i)) =
       $           tofmask(ch21b(tof21_i),hb21b(tof21_i)) + 1
  C-------
-Line 1579 
 C-------
+Line 1771 
 C-------
           ENDIF
        ENDIF
- C     S12 - S22
+ C---------------------     S12 - S22  ------------------------
        dist = ZTOF(2) - ZTOF(4)
        dl = 0.
        DO I=2,4
           dl = dl + TLOUT(i)
        ENDDO
        F = dl/dist
+       c2 = (2.*0.01*dist)/(3.E08*50.E-12  )
  C      IF (tof12_i.GT.none_find.AND.tof22_i.GT.none_find) THEN
         IF ((tof12_i.GT.none_find).AND.(tof22_i.GT.none_find).AND.
-Line 1595 
 C      IF (tof12_i.GT.none_find.AND.tof2
+Line 1789 
 C      IF (tof12_i.GT.none_find.AND.tof2
           t2 = tof12(2,tof12_i,itdc)
           t3 = tof22(1,tof22_i,itdc)
           t4 = tof22(2,tof22_i,itdc)
           IF ((t1.lt.4095).and.(t2.lt.4095).and.
       &        (t3.lt.4095).and.(t4.lt.4095)) THEN
              xhelp1 = tof12(1,tof12_i,itdc)+tof12(2,tof12_i,itdc)
              xhelp2 = tof22(1,tof22_i,itdc)+tof22(2,tof22_i,itdc)
              ds = xhelp1-xhelp2
              ihelp=(tof12_i-1)*2+tof22_i
-             c1 = k_S12S22(1,ihelp)
+             if (iz.le.1) c1 = k_S12S22(1,ihelp)
-             c2 = k_S12S22(2,ihelp)
+             if (iz.eq.2) c1 = k_S12S22(2,ihelp)
+             if (iz.gt.2) c1 = k_S12S22(3,ihelp)
              beta_a(12) = c2*F/(ds-c1)
  C-------ToF Mask - S12 - S22
-Line 1614 
 C-------ToF Mask - S12 - S22
+Line 1809 
 C-------ToF Mask - S12 - S22
              tofmask(ch22a(tof22_i),hb22a(tof22_i)) =
       $           tofmask(ch22a(tof22_i),hb22a(tof22_i)) + 1
              tofmask(ch22b(tof22_i),hb22b(tof22_i)) =
       $           tofmask(ch22b(tof22_i),hb22b(tof22_i)) + 1
  C-------
           ENDIF
        ENDIF
  C-------
+ C
+ C      icount=0
+ C      sw=0.
+ C      sxw=0.
+ C      beta_mean=100.
+ C
+ C      do i=1,12
+ C         if ((beta_a(i).gt.-1.5).and.(beta_a(i).lt.1.5)) then
+ C            icount= icount+1
+ C            if (i.le.4) w_i=1./(0.13**2.)
+ C            if ((i.ge.5).and.(i.le.8)) w_i=1./(0.16**2.)
+ C            if (i.ge.9) w_i=1./(0.25**2.) ! to be checked
+ C            sxw=sxw + beta_a(i)*w_i
+ C            sw =sw + w_i
+ C         endif
+ C      enddo
+ C
+ C      if (icount.gt.0) beta_mean=sxw/sw
+ C      beta_a(13) = beta_mean
+ C
+ C-------  New mean beta  calculation
+        do i=1,12
+          btemp(i) =  beta_a(i)
+        enddo
-       icount=0
+        beta_a(13)=newbeta(2,btemp,hitvec,10.,10.,20.)
-       sw=0.
-       sxw=0.
-       beta_mean=100.
-       do i=1,12
+ C-------
-          if ((beta_a(i).gt.-1.5).and.(beta_a(i).lt.1.5)) then
-             icount= icount+1
-             if (i.le.4) w_i=1./(0.13**2.)
-             if ((i.ge.5).and.(i.le.8)) w_i=1./(0.16**2.)
-             if (i.ge.9) w_i=1./(0.25**2.) ! to be checked
-             sxw=sxw + beta_a(i)*w_i
-             sw =sw + w_i
-          endif
-       enddo
-       if (icount.gt.0) beta_mean=sxw/sw
-       beta_a(13) = beta_mean
  c       IF (tof11_i.GT.none_find)
  c     &  write(*,*) '11 ',tof11(1,tof11_i,itdc),tof11(2,tof11_i,itdc)
  c       IF (tof12_i.GT.none_find)
  c     &  write(*,*) '12 ',tof12(1,tof12_i,itdc),tof12(2,tof12_i,itdc)
  c       IF (tof21_i.GT.none_find)
  c     &  write(*,*) '21 ',tof21(1,tof21_i,itdc),tof21(2,tof21_i,itdc)
  c       IF (tof22_i.GT.none_find)
  c     &  write(*,*) '22 ',tof22(1,tof22_i,itdc),tof22(2,tof22_i,itdc)
  c       IF (tof31_i.GT.none_find)
  c     &  write(*,*) '31 ',tof31(1,tof31_i,itdc),tof31(2,tof31_i,itdc)
  c       IF (tof32_i.GT.none_find)
  c     &  write(*,*) '32 ',tof32(1,tof32_i,itdc),tof32(2,tof32_i,itdc)
  c      write(*,*) xtofpos
  c      write(*,*) ytofpos
- c      write(*,*) beta_a
+ C      write(*,*)'toftrk beta', beta_a
  C      write(*,*) adcflagtof
  C     write(*,*)'TOFTRK ',ievent,beta_a(1),beta_a(2),beta_a(3),beta_a(4)
+ c      write(*,*) 'toftrk'
+ c      write(*,*) xtofpos
+ c      write(*,*) ytofpos
+ c      write(*,*) xtr_tof
+ c      write(*,*) ytr_tof
+ c       write(*,*) '---------  end toftrk ----------'
        RETURN
        END
+ C------------------------------------------------------------------

 Legend:



Removed from v.1.10
 


changed lines


 
Added in v.1.20
 Legend:



Removed from v.1.10
 


changed lines


 
Added in v.1.20
-Removed from v.1.10
+Added in v.1.20

	ViewVC Help
Powered by ViewVC 1.1.23