--- DarthVader/CalorimeterLevel2/src/direction.for 2007/01/23 11:52:26 1.4 +++ DarthVader/CalorimeterLevel2/src/direction.for 2007/11/22 13:53:28 1.7 @@ -24,21 +24,22 @@ PARAMETER (NVAR=1,NPAR=2) c PARAMETER (FLIMIT=10000) c PARAMETER (FLIMIT2=2000) - PARAMETER (FLIMIT=500) +c PARAMETER (FLIMIT=500) + PARAMETER (FLIMIT=2000) PARAMETER (FLIMIT2=500) - REAL X(NPLA),Y(NPLA),W(NPLA) + REAL X(NPLAV),Y(NPLAV),W(NPLAV) REAL DEVIA(2),TG(2) - REAL BAR(2,NPLA) + REAL BAR(2,NPLAV) REAL A, B, VAR REAL SA, SB, SVAR REAL SSA, SSB, SSVAR - REAL PIANO(22) + REAL PIANO(NPLAV) REAL VARFIT(2) INTEGER ICONT, M, I, SNPFIT,SSNPFIT INTEGER NPFIT(2), CHTRACK,IWPL(2) - INTEGER IBAR(2,NPLA) + INTEGER IBAR(2,NPLAV) COMMON/ANGOLO/BAR,IBAR SAVE /ANGOLO/ @@ -71,15 +72,17 @@ FMODE(M) = 0 10 CONTINUE ICONT = 0 - CALL VZERO(X,NPLA) - CALL VZERO(Y,NPLA) - CALL VZERO(W,NPLA) + CALL VZERO(X,NPLAV) + CALL VZERO(Y,NPLAV) + CALL VZERO(W,NPLAV) DO I = 1,NPLA C IF (MOD(M,2).EQ.0) THEN - X(I) = PIANO(I) - 5.81 + X(I) = PIANO(I) +C X(I) = PIANO(I) - 5.81 ELSE - X(I) = PIANO(I) + X(I) = PIANO(I) - 5.81 +C X(I) = PIANO(I) ENDIF Y(I) = 0. C @@ -104,8 +107,8 @@ IF (NCL(M,I).GE.1.AND.NCL(M,I).LE.2) THEN ICONT = ICONT + 1 Y(I) = CLUS(M,I,1) -c W(I) = ((CLUS(M,I,1+NCHA/2)**0.29))**2. - W(I) = 1. + W(I) = ((CLUS(M,I,1+NCHA/2)**0.29))**2. +c W(I) = 1. ENDIF c IF (W(I).GT.2000.) THEN cx W(I) = 2000. @@ -120,8 +123,8 @@ IF (NCL(M,I).EQ.1) THEN ICONT = ICONT + 1 Y(I) = CLUS(M,I,1) -c W(I) = ((CLUS(M,I,1+NCHA/2)**0.79))**2. - W(I) = 1. + W(I) = ((CLUS(M,I,1+NCHA/2)**0.79))**2. +c W(I) = 1. ENDIF ENDIF c if (Y(I).eq.0.or.W(I).eq.2000.) NPFIT(M) = NPFIT(M) - 1