--- DarthVader/CalorimeterLevel2/src/cluster.for	2006/05/19 13:15:50	1.1.1.1
+++ DarthVader/CalorimeterLevel2/src/cluster.for	2014/01/16 15:29:12	1.5
@@ -30,7 +30,7 @@
       SAVE / SHIFT /
 C
       I = 0
-      DO J = 1,NPLA
+      DO J = 1,NPLAV
         DO N = 1,2
           DO M = 1,NCHA
             CLUS(N,J,M) = 0.
@@ -45,10 +45,11 @@
             QQQ(M) = 0.
             IF (DEXY(N,J,M).GT.EMIN) THEN
               QQQ(M) = DEXY(N,J,M)
+c              print *,' N ',N,' J ',J,' M ',M,' QQQ ',QQQ(M)
             ENDIF
           ENDDO
 C
-          IGIRO = 0.
+          IGIRO = 0
 C
    50     CONTINUE
 C
@@ -74,15 +75,25 @@
           IA = MSTR + 1
 C
           NN = 0
-          IF (M.EQ.2) NN = 1
-          IF (MOD(I,2).EQ.NN) THEN
-             SHIFT = +0.5
+c          IF (N.EQ.2) NN = 1
+          IF (MOD(J,2).EQ.NN) THEN
+             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
           CALL BARIC(QQQ,IA,IB,BAR,ENE,IERR1)
           IGIRO = IGIRO + 1
           IGI = IGIRO + NCHA / 2
+c          print *,'IGIRO ',IGIRO,' IGI ',IGI,' NCHA ',NCHA
+c          PRINT *,' ENE ',ENE,' BAR ',BAR
           CLUS(N,J,IGIRO) = BAR
           CLUS(N,J,IGI) = ENE
 C