--- DarthVader/ToFLevel2/src/tofl2com.for 2009/11/23 09:50:50 1.13 +++ DarthVader/ToFLevel2/src/tofl2com.for 2010/02/17 11:50:53 1.14 @@ -32,6 +32,7 @@ C oct-08 WM: Calculation of zenith angle debugged, sometimes strange values C were possible C nov-09 WM: the dEdx part ("adctof_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****************************************************************************** INTEGER FUNCTION TOFL2COM() @@ -53,6 +54,7 @@ REAL dx,dy,dr,ds REAL yhelp,yhelp1,yhelp2,xhelp,xhelp1,xhelp2 REAL c1,c2 + REAL dist C REAL sw,sxw,w_i C INTEGER icount @@ -105,7 +107,10 @@ REAL theta13 -C-- DATA ZTOF/53.74,53.04,23.94,23.44,-23.49,-24.34/ !Sergio 9.05.2006 + + DOUBLE PRECISION ZTOF(6) + 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 @@ -121,7 +126,6 @@ REAL atten,pc_adc,check_charge,newbeta INTEGER IZ - REAL k1corrA1,k1corrB1,k1corrC1 INTEGER ifst @@ -157,12 +161,6 @@ itdc = 1 iadc = 2 -C--- These are the corrections to the k1-value for Z>2 particles - k1corrA1 = 0. - k1corrB1 = -5.0 - k1corrC1= 8.0 - - ENDIF C--------------------------------------------------------------------- @@ -676,7 +674,7 @@ C---------------------------------------------------------------------- iz = int(check_charge(theta13,hitvec)) -c write(*,*) 'charge in tofl2com',iz +C write(*,*) 'charge in tofl2com',iz C-------------------------------------------------------------------- C---- if TDCleft.and.TDCright and NO ADC insert artificial ADC @@ -1074,15 +1072,18 @@ C S11 - S31 + dist = ZTOF(1) - ZTOF(5) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof11_i.GT.none_find).AND.(tof31_i.GT.none_find).AND. & (ytofpos(1).NE.101.).AND.(ytofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrA1 - c2 = k_S11S31(2,ihelp) + if (iz.le.1) c1 = k_S11S31(1,ihelp) + if (iz.eq.2) c1 = k_S11S31(2,ihelp) + if (iz.gt.2) c1 = k_S11S31(3,ihelp) betatof_a(1) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S11 - S31 @@ -1103,15 +1104,18 @@ C S11 - S32 + dist = ZTOF(1) - ZTOF(6) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof11_i.GT.none_find).AND.(tof32_i.GT.none_find).AND. & (ytofpos(1).NE.101.).AND.(xtofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrA1 - c2 = k_S11S32(2,ihelp) + if (iz.le.1) c1 = k_S11S32(1,ihelp) + if (iz.eq.2) c1 = k_S11S32(2,ihelp) + if (iz.gt.2) c1 = k_S11S32(3,ihelp) betatof_a(2) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S11 - S32 @@ -1132,15 +1136,18 @@ C S12 - S31 + dist = ZTOF(2) - ZTOF(5) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof12_i.GT.none_find).AND.(tof31_i.GT.none_find).AND. & (xtofpos(1).NE.101.).AND.(ytofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrA1 - c2 = k_S12S31(2,ihelp) + if (iz.le.1) c1 = k_S12S31(1,ihelp) + if (iz.eq.2) c1 = k_S12S31(2,ihelp) + if (iz.gt.2) c1 = k_S12S31(3,ihelp) betatof_a(3) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S12 - S31 @@ -1161,15 +1168,18 @@ C S12 - S32 + dist = ZTOF(2) - ZTOF(6) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof12_i.GT.none_find).AND.(tof32_i.GT.none_find).AND. & (xtofpos(1).NE.101.).AND.(xtofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrA1 - c2 = k_S12S32(2,ihelp) + if (iz.le.1) c1 = k_S12S32(1,ihelp) + if (iz.eq.2) c1 = k_S12S32(2,ihelp) + if (iz.gt.2) c1 = k_S12S32(3,ihelp) betatof_a(4) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S12 - S32 @@ -1190,15 +1200,18 @@ C S21 - S31 + dist = ZTOF(3) - ZTOF(5) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof21_i.GT.none_find).AND.(tof31_i.GT.none_find).AND. & (xtofpos(2).NE.101.).AND.(ytofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrB1 - c2 = k_S21S31(2,ihelp) + if (iz.le.1) c1 = k_S21S31(1,ihelp) + if (iz.eq.2) c1 = k_S21S31(2,ihelp) + if (iz.gt.2) c1 = k_S21S31(3,ihelp) betatof_a(5) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S21 - S31 @@ -1219,15 +1232,19 @@ C S21 - S32 + dist = ZTOF(3) - ZTOF(6) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + + IF ((tof21_i.GT.none_find).AND.(tof32_i.GT.none_find).AND. & (xtofpos(2).NE.101.).AND.(xtofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrB1 - c2 = k_S21S32(2,ihelp) + if (iz.le.1) c1 = k_S21S32(1,ihelp) + if (iz.eq.2) c1 = k_S21S32(2,ihelp) + if (iz.gt.2) c1 = k_S21S32(3,ihelp) betatof_a(6) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S21 - S32 @@ -1248,15 +1265,18 @@ C S22 - S31 + dist = ZTOF(4) - ZTOF(5) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof22_i.GT.none_find).AND.(tof31_i.GT.none_find).AND. & (ytofpos(2).NE.101.).AND.(ytofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrB1 - c2 = k_S22S31(2,ihelp) + if (iz.le.1) c1 = k_S22S31(1,ihelp) + if (iz.eq.2) c1 = k_S22S31(2,ihelp) + if (iz.gt.2) c1 = k_S22S31(3,ihelp) betatof_a(7) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S22 - S31 @@ -1277,15 +1297,18 @@ C S22 - S32 + dist = ZTOF(4) - ZTOF(6) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof22_i.GT.none_find).AND.(tof32_i.GT.none_find).AND. & (ytofpos(2).NE.101.).AND.(xtofpos(3).NE.101.)) 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.gt.2) c1 = c1 + k1corrB1 - c2 = k_S22S32(2,ihelp) + if (iz.le.1) c1 = k_S22S32(1,ihelp) + if (iz.eq.2) c1 = k_S22S32(2,ihelp) + if (iz.gt.2) c1 = k_S22S32(3,ihelp) betatof_a(8) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S22 - S32 @@ -1306,15 +1329,18 @@ C S11 - S21 + dist = ZTOF(1) - ZTOF(3) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof11_i.GT.none_find).AND.(tof21_i.GT.none_find).AND. & (ytofpos(1).NE.101.).AND.(xtofpos(2).NE.101.)) 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.gt.2) c1 = c1 + k1corrC1 - c2 = k_S11S21(2,ihelp) + if (iz.le.1) c1 = k_S11S21(1,ihelp) + if (iz.eq.2) c1 = k_S11S21(2,ihelp) + if (iz.gt.2) c1 = k_S11S21(3,ihelp) betatof_a(9) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S11 - S21 @@ -1335,15 +1361,18 @@ C S11 - S22 + dist = ZTOF(1) - ZTOF(4) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof11_i.GT.none_find).AND.(tof22_i.GT.none_find).AND. & (ytofpos(1).NE.101.).AND.(ytofpos(2).NE.101.)) 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.gt.2) c1 = c1 + k1corrC1 - c2 = k_S11S22(2,ihelp) + if (iz.le.1) c1 = k_S11S22(1,ihelp) + if (iz.eq.2) c1 = k_S11S22(2,ihelp) + if (iz.gt.2) c1 = k_S11S22(3,ihelp) betatof_a(10) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S11 - S22 @@ -1364,15 +1393,18 @@ C S12 - S21 + dist = ZTOF(2) - ZTOF(3) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof12_i.GT.none_find).AND.(tof21_i.GT.none_find).AND. & (xtofpos(1).NE.101.).AND.(xtofpos(2).NE.101.)) 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.gt.2) c1 = c1 + k1corrC1 - c2 = k_S12S21(2,ihelp) + if (iz.le.1) c1 = k_S12S21(1,ihelp) + if (iz.eq.2) c1 = k_S12S21(2,ihelp) + if (iz.gt.2) c1 = k_S12S21(3,ihelp) betatof_a(11) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S12 - S21 @@ -1393,15 +1425,18 @@ C S12 - S22 + dist = ZTOF(2) - ZTOF(4) + c2 = (2.*0.01*dist)/(3.E08*50.E-12 ) + IF ((tof12_i.GT.none_find).AND.(tof22_i.GT.none_find).AND. & (xtofpos(1).NE.101.).AND.(ytofpos(2).NE.101.)) 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.gt.2) c1 = c1 + k1corrC1 - c2 = k_S12S22(2,ihelp) + if (iz.le.1) c1 = k_S12S22(1,ihelp) + if (iz.eq.2) c1 = k_S12S22(2,ihelp) + if (iz.gt.2) c1 = k_S12S22(3,ihelp) betatof_a(12) = c2/(cos(theta13)*(ds-c1)) C------- ToF Mask - S12 - S22 @@ -1853,7 +1888,7 @@ if (sw.gt.0) beta_mean_tof=sxw/sw; -c write(*,*) 'beta_mean_tof ',beta_mean_tof +C write(*,*) 'beta_mean_tof ',beta_mean_tof beta_help = beta_mean_tof ! pow(beta_mean_tof,1.0) gave best results @@ -1982,7 +2017,8 @@ endif ! beta_mean_tof.eq.100. -c write(*,*) 'in function charge: ',charge +C write(*,*) 'in function charge: ',beta_mean_tof,charge + check_charge = charge