--- DarthVader/CalorimeterLevel2/src/calol2tr.for 2006/05/31 09:37:01 1.4 +++ DarthVader/CalorimeterLevel2/src/calol2tr.for 2007/03/26 14:02:08 1.14 @@ -55,7 +55,7 @@ COMMON / CH / CHECK SAVE / CH / C - COMMON / CALOFIT / VARFIT, NPFIT + COMMON / CALOFIT / VARFIT, NPFIT, IWPL,CHTRACK SAVE / CALOFIT / C COMMON / pawcd / hmemor @@ -89,18 +89,7 @@ NLAST = 0. PLANETOT = 0. QMEAN = 0. - SELFTRIGGER = 0 - CALL VZERO(VARCFIT,2) - CALL VZERO(NPCFIT,2) - CALL VZERO(TBAR,2*NPLA) - CALL VZERO(TIBAR,2*NPLA) - CALL VZERO(BAR,2*NPLA) - CALL VZERO(IBAR,2*NPLA) - CALL VZERO(IBAR,2*NPLA) - CALL VZERO(Y,NPLA) - CALL VZERO(YY,NPLA) - CALL VZERO(XOUT,NPLA) - CALL VZERO(YOUT,NPLA) +C SELFTRIGGER = 0 C C BEGIN WITH THE FISRT TRACK IF WE HAVE A TRACK FROM TRACKER C @@ -117,6 +106,10 @@ CALL VZERO(IBAR,2*NPLA) CALL VZERO(TBAR,2*NPLA) CALL VZERO(TIBAR,2*NPLA) + CALL VZERO(Y,NPLA) + CALL VZERO(YY,NPLA) + CALL VZERO(XOUT,NPLA) + CALL VZERO(YOUT,NPLA) do m = 1, 5 al_p(m) = al_pp(t,m) enddo @@ -166,7 +159,7 @@ ENDIF C CX = XOUT(I)*10. + XALIG - CY = -YOUT(I)*10. + YALIG + CY = YOUT(I)*10. + YALIG C IF (I.EQ.1) THEN TIMPX = CX @@ -180,7 +173,7 @@ ELSE YY(I) = CY BAR(M,I) = YY(I) - TBAR(M,I) = (YALIG - YY(I))/10. + TBAR(M,I) = (-YALIG + YY(I))/10. IF (I.EQ.22) MY=ABS(Y(1)-Y(22))/ABS(ZIN(1)-ZIN(22)) ENDIF CALL LASTRISCIA(BAR(M,I),IBAR(M,I)) @@ -235,10 +228,22 @@ C C WE MUST PROCESS A SELFTRIGGER EVENT C - IF (TRIGTY.GE.2) THEN + IF (TRIGTY.GE.2.AND.HZN.EQ.0) THEN C C CALL SELFTRIGGER SUBROUTINE C + CALL VZERO(IWPL,2) + CALL VZERO(VARCFIT,2) + CALL VZERO(NPCFIT,2) + CALL VZERO(TBAR,2*NPLA) + CALL VZERO(TIBAR,2*NPLA) + CALL VZERO(BAR,2*NPLA) + CALL VZERO(IBAR,2*NPLA) + CALL VZERO(Y,NPLA) + CALL VZERO(YY,NPLA) + CALL VZERO(XOUT,NPLA) + CALL VZERO(YOUT,NPLA) +C CALL SELFTRIG() ELEN = PARZEN3 SELEN = ABS(ELEN) * (11.98*1E-2 + 7.6 * EXP(-5736/ABS(ELEN))) @@ -248,14 +253,16 @@ C DO M = 1,2 C +c print *,' ax ',ax,' ay ',ay +c print *,' bx ',bx,' by ',by IF (NPCFIT(M).GE.2) THEN IF (M.EQ.1) THEN VARCFIT(1) = CHI2X - IMPX = 10. * ( AX + 12.1 ) + IMPX = AX ! PAMELA REF TANX = BX ELSE VARCFIT(2) = CHI2Y - IMPY = 10. * ( AY + 12.2 ) + IMPY = AY ! PAMELA REF TANY = BY ENDIF C @@ -270,32 +277,45 @@ C IF (M.EQ.1) THEN DISTX = PIANO(I) - 5.81 - Y(I) = DISTX * TANX + CX + Y(I) = (DISTX * TANX) + AX - XALIG +c CBAR(M,I) = Y(I) BAR(M,I) = Y(I) - CBAR(M,I) = Y(I) + CBAR(M,I) = (Y(I) + XALIG)/10. IF (I.EQ.22) MX=ABS(Y(1)-Y(22))/ABS(ZIN(1)-ZIN(22)) C ELSE DISTY = PIANO(I) - YY(I) = DISTY * TANY + CY + YY(I) = (DISTY * TANY) + AY - YALIG +c CBAR(M,I) = YY(I) BAR(M,I) = YY(I) - CBAR(M,I) = YY(I) + CBAR(M,I) = (YY(I) + YALIG)/10. IF (I.EQ.22) MY=ABS(Y(1)-Y(22))/ABS(ZIN(1)-ZIN(22)) C ENDIF CALL LASTRISCIA(BAR(M,I),IBAR(M,I)) cibar(M,I) = ibar(m,i) + IF (ibar(m,i).EQ.-1) THEN + CHTRACK = CHTRACK + 1 + ELSE + IWPL(M) = IWPL(M) + 1 + ENDIF ENDDO ENDIF C ENDDO C - ELSE - IF (GOOD2.EQ.0) THEN + ENDIF +C + IF (TRIGTY.GE.2.AND.HZN.NE.0) THEN + IF (GOOD2.EQ.1) THEN PRINT *,' CALORIMETER - WARNING F77: unknown request' GOOD2 = 1 GOTO 50 ENDIF + IF ( NPCFIT(1).EQ.0.OR.NPCFIT(2).EQ.0 ) THEN + GOOD2 = 1 + GOTO 50 + ENDIF ENDIF C 6996 CONTINUE @@ -304,7 +324,7 @@ C C IF THE TRACK IS OUTSIDE THE CALORIMETER GO OUT, IF NOT CALCULATE DX0L C - IF (CHTRACK.EQ.44) THEN + IF (CHTRACK.EQ.44) THEN ! CHTRACK is the number of planes not touched by the track GOOD2 = 0 c PRINT *,' CALORIMETER - WARNING F77: track outside calorimeter' GOTO 50 @@ -319,8 +339,6 @@ & + (BAR(1,1)-(2.66*MX+BAR(1,1)))**2 + 2.66**2) / & 3.6 C -C DX0L = X01PL * SQRT( (IWPL(1) * SQRT(1 + MX*MX))**2 + -C & (IWPL(2) * SQRT(1 + MY*MY))**2 )/2. ENDIF C C @@ -338,15 +356,19 @@ GOTO 50 ENDIF ENDIF - IF (TRIGTY.GE.2.AND.GOOD2.EQ.0) THEN + IF (TRIGTY.GE.2.AND.HZN.EQ.0.AND.GOOD2.EQ.0) THEN RIG = ELEN ! SELFTRIGGER RIGIDITY IF ( RIG.EQ.0. ) THEN - GOOD2 = 0 + GOOD2 = 1 PRINT *,' CALORIMETER - WARNING F77: ST track with R = 0' GOTO 50 ENDIF ENDIF C + IF (GOOD2.EQ.0.AND.(TRIGTY.LT.2.OR.HZN.EQ.1)) THEN + RIG = RIGINPUT + ENDIF +C RNSS = 0. QTOTT = 0. C @@ -594,8 +616,6 @@ ENDIF ENDDO C - EINF = EMIN - ESUP = 50. C C CALCULATE PLANETOT AND QMEAN C @@ -606,8 +626,18 @@ NPIANI = 5 QMEAN = 0. INDEX = 0 - CALL ELIO(RPIANO,NPIANI,QMEAN,NTOT,INDEX) - PLANETOT = RPIANO(1) + RPIANO(2) +C + IF (TRIGTY.GE.2.AND.HZN.NE.0) THEN + EINF = 50. + ESUP = 15000. + CALL NUCLEI(RPIANO,NPIANI,QMEAN,NTOT,INDEX) + PLANETOT = RPIANO(1) + RPIANO(2) + ELSE + EINF = EMIN + ESUP = 15000. + CALL ELIO(RPIANO,NPIANI,QMEAN,NTOT,INDEX) + PLANETOT = RPIANO(1) + RPIANO(2) + ENDIF C 50 CONTINUE C