Small fixes. Need to run tests before merging.
This commit is contained in:
1 parent
9431e08853
commit
b262fe109c
2 files changed
+12
-12
No files matched your search
+5
-5
@@ -435,7 +435,7 @@ C-----------------------------------------------------------------------
|
||||
$ ' M2-HEAVY',' M2-LIGHT',' B-W',
|
||||
$ ' B-N',' B-T',' FC0',
|
||||
$ ' FC1',' FC2',' FC3',
|
||||
$ 'EEC(total)','EEC(90deg)'/
|
||||
$ 'EEC(90deg)','EEC(total)'/
|
||||
SF=CSUM(1)
|
||||
IF (SF.NE.0) THEN
|
||||
DO I=1,NS
|
||||
@@ -465,7 +465,7 @@ C-----------------------------------------------------------------------
|
||||
CALL GTOPER( I,1,1,0,100+I)
|
||||
CALL GTOPER(1000+I,0,0,0,1100+I)
|
||||
ENDDO
|
||||
WRITE (*,'(8(1X,2(A,F15.5)/))')
|
||||
WRITE (*,'(1X,A,F15.5,A,F15.5)')
|
||||
$ (NAME(I),CSUM(I),' +-',
|
||||
$ SQR(CSQR(I)-CSUM(I)**2/NEV),I=1,NS+3)
|
||||
WRITE (*,'(2(/A))') ' Moments of EEC function:',' m n'
|
||||
@@ -558,7 +558,7 @@ C---EERAD3 NEEDS NORMALIZED MOMENTA
|
||||
SH(13)=FC(4)
|
||||
DO I=1,NS-1
|
||||
CALL GFILLSC1(200+ORD+I,SH(I),WEIGHT)
|
||||
IF (ORD.EQ.0) CS(I+2)=CS(I+2)+WEIGHT
|
||||
IF (ORD.EQ.0) CS(I+2)=CS(I+2)+WEIGHT*SH(I)
|
||||
ENDDO
|
||||
C---EEC NEEDS A SEPARATE TREATMENT
|
||||
CALL GETEEC(XCOS,XEEC,NPR,BSEV,EECW,EECT,PN,N)
|
||||
@@ -566,8 +566,8 @@ C---EEC NEEDS A SEPARATE TREATMENT
|
||||
CALL GFILLSC1(200+ORD+NS,XCOS(I),XEEC(I)*WEIGHT)
|
||||
ENDDO
|
||||
IF (ORD.EQ.0) THEN
|
||||
CS(NS+2)=CS(NS+2)+EECT*WEIGHT
|
||||
CS(NS+3)=CS(NS+3)+EECW*WEIGHT
|
||||
CS(NS+2)=CS(NS+2)+EECW*WEIGHT
|
||||
CS(NS+3)=CS(NS+3)+EECT*WEIGHT
|
||||
DO K=1,2
|
||||
DO L=1,6
|
||||
BS(K,L)=BS(K,L)+BSEV(K,L)*WEIGHT
|
||||
|
||||
@@ -547,8 +547,8 @@ C*********************************************************************
|
||||
&(A(IS+J), J=10,12), XYCOR
|
||||
ENDIF
|
||||
RETURN
|
||||
400 FORMAT(/5X,'HISTOGRAM NO',I4,' : NO ENTRIES')
|
||||
410 FORMAT('1'/5X,'HISTOGRAM NO',I4,4X,A60,'19',I2,'-',I2,'-',I2,
|
||||
400 FORMAT(/5X,'HISTOGRAM NO',I6,' : NO ENTRIES')
|
||||
410 FORMAT('1'/5X,'HISTOGRAM NO',I6,4X,A60,'19',I2,'-',I2,'-',I2,
|
||||
&1X,A5/)
|
||||
420 FORMAT(3X,F7.2,'*10**',I2,4X,A)
|
||||
430 FORMAT(/9X,'CONTENTS',4X,A)
|
||||
@@ -706,8 +706,8 @@ C
|
||||
CALL GTOP2(ID,NEW)
|
||||
ENDIF
|
||||
ENDIF
|
||||
1000 FORMAT (/5X,'HISTOGRAM NO',I4,' : NO ENTRIES FOUND')
|
||||
1010 FORMAT (/5X,'HISTOGRAM NO',I4,' : OUTPUTTING TO TOPDRAWER FILE')
|
||||
1000 FORMAT (/5X,'HISTOGRAM NO',I6,' : NO ENTRIES FOUND')
|
||||
1010 FORMAT (/5X,'HISTOGRAM NO',I6,' : OUTPUTTING TO TOPDRAWER FILE')
|
||||
END
|
||||
C-----------------------------------------------------------------------
|
||||
SUBROUTINE GTOP1(ID,NEW,HIST,LOG,IDERR)
|
||||
@@ -832,9 +832,9 @@ C PLOT...
|
||||
ELSE
|
||||
WRITE (6,1150) VARIAN
|
||||
ENDIF
|
||||
1000 FORMAT (5X,'HISTOGRAM NO',I4,' : SHOULD BE 1-DIM BUT ISN''T')
|
||||
1010 FORMAT (5X,'HISTOGRAM NO',I4,' : SHOULD BE SAME SIZE BUT ISN''T')
|
||||
1020 FORMAT (5X,'HISTOGRAM NO',I4,' : BEING USED FOR ERROR BARS')
|
||||
1000 FORMAT (5X,'HISTOGRAM NO',I6,' : SHOULD BE 1-DIM BUT ISN''T')
|
||||
1010 FORMAT (5X,'HISTOGRAM NO',I6,' : SHOULD BE SAME SIZE BUT ISN''T')
|
||||
1020 FORMAT (5X,'HISTOGRAM NO',I6,' : BEING USED FOR ERROR BARS')
|
||||
1100 FORMAT (5X,'Total underflow=',G10.3)
|
||||
1110 FORMAT (5X,'Total entry =',G10.3)
|
||||
1120 FORMAT (5X,'Total overflow =',G10.3)
|
||||
|
||||
Reference in new issue
Block a user