gchiurato
/
EVENT2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes.

This commit is contained in:
Yggdrasil 2026-05-08 12:46:33 +02:00
parent b5055c8f07
commit a7b5ddb6b4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
event2_03.f
View File

@ -539,8 +539,8 @@ C---CALCULATE THE C-PARAMETER
C=C-3*DOT(P,I,J)**2*OS/(E(I)*E(J))
ENDDO
ENDDO
CALL GFILLSC1(201+ORD,C,C*WEIGHT)
IF (ORD.EQ.0) CS(3)=CS(3)+WEIGHT*C
CALL GFILLSC1(201+ORD,C,WEIGHT)
IF (ORD.EQ.0) CS(3)=CS(3)+WEIGHT
C---CALCULATE THE D-PARAMETER
IF (N.EQ.4) THEN
D=27*(2*(DOT(P,1,2)*DOT(P,1,3)*DOT(P,2,4)*DOT(P,3,4)+
@ -555,8 +555,8 @@ C---CALCULATE THE D-PARAMETER
ELSE
D=0
ENDIF
CALL GFILLSC1(202+ORD,D,D*WEIGHT)
IF (ORD.EQ.0) CS(4)=CS(4)+WEIGHT*D
CALL GFILLSC1(202+ORD,D,WEIGHT)
IF (ORD.EQ.0) CS(4)=CS(4)+WEIGHT
C---CALCULATE THE THRUST
IF (N.EQ.4) THEN
T=0
@ -598,8 +598,8 @@ C---CALCULATE THE THRUST
T=MAX(E(1),E(2),E(3))*ORS*2
ENDIF
TAU = 1 - T
CALL GFILLSC1(203+ORD,TAU,TAU*WEIGHT)
IF (ORD.EQ.0) CS(5)=CS(5)+TAU*WEIGHT
CALL GFILLSC1(203+ORD,TAU,WEIGHT)
IF (ORD.EQ.0) CS(5)=CS(5)+WEIGHT
C---CALCULATE THE Y3 VALUE (USES P SCHEME FOR NO PARTICULAR REASON)
IF (N.EQ.4) THEN
Y3=1D6
@ -639,8 +639,8 @@ C---CALCULATE THE Y3 VALUE (USES P SCHEME FOR NO PARTICULAR REASON)
ELSE
Y3=1-T
ENDIF
CALL GFILLSC1(204+ORD,Y3,Y3*WEIGHT)
IF (ORD.EQ.0) CS(6)=CS(6)+Y3*WEIGHT
CALL GFILLSC1(204+ORD,Y3,WEIGHT)
IF (ORD.EQ.0) CS(6)=CS(6)+WEIGHT
C---CALCULATE THE ENERGY-ENERGY CORRELATION
DO I=2,N
DO J=1,I-1

4
gbook.f
View File

@ -759,7 +759,9 @@ C-----------------------------------------------------------------------
DIV=.FALSE.
DO 100 IX=1, NX
IF (A(IS+6).EQ.1) THEN
X(IX)=EXP(DLOG(A(IS+2))+(IX-0.5)*A(IS+4))
C --------- USE GEOMETRIC CENTERS INSTEAD FOR LOG BINNING
X(IX)=A(IS+2)*EXP((IX-0.5)*A(IS+4))
C X(IX)=A(IS+2)/2*(EXP(A(IS+4))+1)*EXP((IX-1)*A(IS+4))
ELSE
X(IX)=(IX-0.5)*A(IS+4)+A(IS+2)
ENDIF