--- DarthVader/CalorimeterLevel2/src/cluster2.for 2006/05/19 13:15:50 1.1 +++ DarthVader/CalorimeterLevel2/src/cluster2.for 2008/12/12 16:18:20 1.4 @@ -13,8 +13,18 @@ C- C---------------------------------------------------------------------- INCLUDE 'INTEST.TXT' - REAL QQQ(NCHA) + REAL QQQ(NCHA), ENE, BAR + INTEGER IERR1 + COMMON / SHIFT / SHIFT + SAVE / SHIFT / + DATA ENE / 0. / + DATA BAR / 0. / + DATA IERR1 / 0 / +C + ENE = 0. + BAR = 0. + IERR1 = 0 C DO J = 1,2 DO N = 1,2 @@ -63,9 +73,24 @@ 66 CONTINUE IA = MSTR + 1 C + NN = 0 + IF (MOD(J,2).EQ.NN) THEN + IF (REVERSE.EQ.0) THEN + SHIFT = -0.5 + ELSE + SHIFT = +0.5 + ENDIF + ELSE + IF (REVERSE.EQ.0) THEN + SHIFT = +0.5 + ELSE + SHIFT = -0.5 + ENDIF + ENDIF +C CALL BARIC(QQQ,IA,IB,BAR,ENE,IERR1) IGIRO = IGIRO + 1 - IGI = IGIRO + NCHA / 2 + IGI = IGIRO + NCHA / 2 CLUS2(N,J,IGIRO) = BAR CLUS2(N,J,IGI) = ENE C