--- DarthVader/CalorimeterLevel2/src/calol2cm.for 2007/07/20 08:24:53 1.8 +++ DarthVader/CalorimeterLevel2/src/calol2cm.for 2009/08/04 14:01:18 1.13 @@ -197,31 +197,33 @@ ENDIF C DO I = 1,NPLA - NN = 1 -C NN = 0 +C NN = 1 + NN = 0 C IF (M.EQ.2) NN = 1 IF (MOD(I,2).EQ.NN) THEN IF (REVERSE.EQ.0) THEN - SHIFT = +0.5 - ELSE SHIFT = -0.5 + ELSE + SHIFT = +0.5 ENDIF ELSE IF (REVERSE.EQ.0) THEN - SHIFT = -0.5 - ELSE SHIFT = +0.5 + ELSE + SHIFT = -0.5 ENDIF ENDIF C IF (M.EQ.1) THEN DISTX = PIANO(I) - 5.81 +c print *,'C X PLANE I= ',I,' Z = ',DISTX+ZALIG Y(I) = DISTX * TG(1) + CX BAR(M,I) = Y(I) CBAR(M,I) = (Y(I) - XALIG)/10. C ELSE DISTY = PIANO(I) +c print *,'C Y PLANE I= ',I,' Z = ',DISTY+ZALIG YY(I) = DISTY * TG(2) + CY BAR(M,I) = YY(I) CBAR(M,I) = (-YALIG + YY(I))/10. @@ -244,7 +246,9 @@ C C CALCULATE ELEN AND SELEN C - ELEN = 40.82 * QTOT * 1.06 * 1E-4 +c ELEN = 40.82 * QTOT * 1.06 * 1E-4 +C ELEN = 260. * QTOT + ELEN = QTOT / 260. IF (ELEN.GT.0.) THEN SELEN = ELEN * (0.01183 + 0.121 / SQRT(ELEN)) ELSE @@ -253,9 +257,9 @@ C 9696 CONTINUE C - 45 continue +c 45 continue - 50 continue +c 50 continue return END