--- DarthVader/CalorimeterLevel2/src/elio.for 2006/05/19 13:15:50 1.1.1.1 +++ DarthVader/CalorimeterLevel2/src/elio.for 2014/01/16 15:29:14 1.8 @@ -31,11 +31,11 @@ C REAL LUNGH REAL RPIANO(2) - REAL BAR(2,NPLA) - REAL NQQ(2*NPLA) + REAL BAR(2,NPLAV) + REAL NQQ(2*NPLAV) REAL RIL(NCHA/2) REAL TG(2) - INTEGER IBAR(2,NPLA) + INTEGER IBAR(2,NPLAV) INTEGER NTOT(2) COMMON / ANGOLO / BAR, IBAR SAVE / ANGOLO / @@ -68,9 +68,17 @@ C DO J = 1,NPLA IF (MOD(J,2).EQ.0) THEN - SHIFT = -0.5 + IF (REVERSE.EQ.0) THEN + SHIFT = -0.5 + ELSE + SHIFT = +0.5 + ENDIF ELSE - SHIFT = 0.5 + IF (REVERSE.EQ.0) THEN + SHIFT = +0.5 + ELSE + SHIFT = -0.5 + ENDIF ENDIF C DO K = 1,NGIR @@ -90,7 +98,8 @@ IF (NN.LE.0) NN = 1 NGIR = NCL(M,J) ! number of clusters in layer J of the M View IF (NGIR.EQ.0) GOTO 5 - IPP = 0. +C IF (NGIR.NE.1) GOTO 5 + IPP = 0 DO L = 1,NGIR CALL LASTRISCIA(CLUS(M,J,L),IN) RIL(L) = FLOAT(ABS(NN - IN)) @@ -152,7 +161,8 @@ QQQQ = QQQ / FLOAT(NPIA) ! Truncated mean . ENDIF C - 400 CONTINUE +c 400 CONTINUE + CONTINUE RETURN END