--- DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2014/01/16 15:29:50 1.45 +++ DarthVader/TrackerLevel2/src/F77/analysissubroutines.f 2014/06/04 07:57:04 1.47 @@ -1046,15 +1046,17 @@ ipy=npl(VIEW(icy)) if( (nplanes-ipx+1).ne.ip )then - print*,'xyzpam: ***WARNING*** cluster ',icx - $ ,' does not belong to plane: ',ip + print*,'xyzpam: ***WARNING*** cluster icx=',icx + $ ,' belongs to plane ',(nplanes-ipx+1) + $ ,' and not ',ip icx = -1*icx return endif if( (nplanes-ipy+1).ne.ip )then - print*,'xyzpam: ***WARNING*** cluster ',icy - $ ,' does not belong to plane: ',ip - icy = -1*icy + print*,'xyzpam: ***WARNING*** cluster icy=',icy + $ ,' belongs to plane ',(nplanes-ipy+1) + $ ,' and not ',ip + icy = -1*icy return endif @@ -1070,8 +1072,10 @@ zm(ip) = zPAM xm_A(ip) = 0.D0 ym_A(ip) = 0.D0 + zm_A(ip) = 0.D0 xm_B(ip) = 0.D0 ym_B(ip) = 0.D0 + zm_B(ip) = 0.D0 c zv(ip) = zPAM @@ -1079,8 +1083,9 @@ ipy=npl(VIEW(icy)) if( (nplanes-ipy+1).ne.ip )then - print*,'xyzpam: ***WARNING*** cluster ',icy - $ ,' does not belong to plane: ',ip + print*,'xyzpam: ***WARNING*** cluster icy=',icy + $ ,' belongs to plane ',(nplanes-ipy+1) + $ ,' and not ',ip icy = -1*icy return endif @@ -1100,8 +1105,10 @@ zm(ip) = zPAM xm_A(ip) = xPAM_A ym_A(ip) = yPAM_A + zm_A(ip) = zPAM_A xm_B(ip) = xPAM_B ym_B(ip) = yPAM_B + zm_B(ip) = zPAM_B c zv(ip) = (zPAM_A+zPAM_B)/2. @@ -1110,8 +1117,9 @@ ipx=npl(VIEW(icx)) if( (nplanes-ipx+1).ne.ip )then - print*,'xyzpam: ***WARNING*** cluster ',icx - $ ,' does not belong to plane: ',ip + print*,'xyzpam: ***WARNING*** cluster icx=',icx + $ ,' belongs to plane ',(nplanes-ipx+1) + $ ,' and not ',ip icx = -1*icx return endif @@ -1131,8 +1139,10 @@ zm(ip) = zPAM xm_A(ip) = xPAM_A ym_A(ip) = yPAM_A + zm_A(ip) = zPAM_A xm_B(ip) = xPAM_B ym_B(ip) = yPAM_B + zm_B(ip) = zPAM_B c zv(ip) = (zPAM_A+zPAM_B)/2. @@ -1153,8 +1163,10 @@ zm(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4 xm_A(ip) = 0. ym_A(ip) = 0. + zm_A(ip) = 0. xm_B(ip) = 0. ym_B(ip) = 0. + zm_B(ip) = 0. c zv(ip) = z_mech_sensor(nplanes-ip+1,il,is)*1000./1.d4 @@ -2042,7 +2054,7 @@ * tg(th_yz) alfayz2(ndblt)=(ym1-ym2)/(zm1-zm2) * y0 (cm) - alfayz1(ndblt)=alfayz2(ndblt)*(REAL(zini)-zm1)+ym1 ! EM GCC4.7 zm1, ym1 and alfayz1/2 are REAL + alfayz1(ndblt)=alfayz2(ndblt)*(REAL(zini)-zm1)+ym1! EM GCC4.7 zm1, ym1 and alfayz1/2 are REAL **** -----------------------------------------------**** **** reject non phisical couples **** @@ -3399,7 +3411,7 @@ dedxmmx = sgnl(icx)/mip(VIEW(icx),LADDER(icx)) !(1)(2) dedxmmy = sgnl(icy)/mip(VIEW(icy),LADDER(icy)) !(1)(2) clincnewc=10.*dsqrt(rymm**2+rxmm**2 - $ +DBLE(RCHI2_STORE(ibest)*k(ip)*(cov(1,1)+cov(2,2)))) ! EM GCC4.7 + $ +DBLE(RCHI2_STORE(ibest)*k(ip)*(cov(1,1)+cov(2,2))))! EM GCC4.7 endif 1188 continue enddo !end loop on couples on plane icp