Fixed merge utility. Still need to fully optimize NSIZE and MAX in gbook.

This commit is contained in:
Yggdrasil committed 2026-11-12 18:29:06 +01:00
1 parent b262fe109c
commit 000f8647f6
2 files changed
+75 -69

No files matched your search

+52 -46
View File
@@ -9,9 +9,10 @@ C WRITTEN BY G. CHIURATO
C
PROGRAM MAIN
IMPLICIT NONE
INTEGER I
INTEGER NS,I
PARAMETER (NS=14)
CHARACTER*256 IPATH, OPATH, LPATH
CHARACTER*30 OBS(5)
CHARACTER*30 OBS(NS)
COMMON /CONST/OBS
C --- TODO: ADD EXTERNALLY CONFIG. PATHS
@@ -23,7 +24,7 @@ C --- TODO: ADD EXTERNALLY CONFIG. PATHS
CALL CREATEOUT(LPATH)
CALL CREATEOUT(OPATH)
CALL SCANDIR(IPATH, LPATH)
DO 10 I = 1,5
DO 10 I = 1,NS
C ------ TODO: FIXED IDS ARE NOT GREAT
CALL MERGE(OBS(I), I, OPATH, LPATH)
10 CONTINUE
@@ -31,17 +32,22 @@ C ------ TODO: FIXED IDS ARE NOT GREAT
C-----------------------------------------------------------------------
SUBROUTINE SCANDIR(IPATH, OPATH)
IMPLICIT NONE
INTEGER I
INTEGER NS,I
PARAMETER (NS=14)
INTEGER STAT
CHARACTER*30 OBS(5), ESCOBS
CHARACTER*30 OBS(NS), ESCOBS
CHARACTER*256 IPATH, OPATH
COMMON /CONST/OBS
DATA OBS/'C-PARAMETER','D-PARAMETER',
$ 'THRUST','y3(JADE,P)','EEC'/
DATA OBS/
$ 'C-PARAMETER ','D-PARAMETER ','1-THRUST ',
$ 'T-MINOR ','M2-HEAVY ','M2-LIGHT ',
$ 'B-W ','B-N ','B-T ',
$ 'FC0 ','FC1 ','FC2 ',
$ 'FC3 ','EEC '/
C CREATE FILE LIST USING SYSTEM COMMAND
DO 10 I = 1, 5
CALL BRACKETESC(OBS(I), ESCOBS)
DO 10 I = 1, NS
CALL BRACKETESC(TRIM(OBS(I)), ESCOBS)
CALL SYSTEM('ls '//TRIM(IPATH)//'gtopdraw_'//TRIM(ESCOBS)//
$ '_* > '//TRIM(OPATH)//'filelist_'//TRIM(ESCOBS)//'.txt',
$ STATUS=STAT)
@@ -75,25 +81,25 @@ C --- READ FIRST HIST AND SAVE BIN NUMBER AND TITLE
C --- TODO: IN THIS WAY THE MERGED HIST HAS THE SAME NAME AS THE LAST
C OPENED HIST. NEED TO CHANGE THIS TO SOMETHING DIFFERENT
CALL GTITLE(ID, TITLE, LENTIT)
C --- 2XX IS VALUE ACC., 3XX IS WEIGHT ACC.
CALL GBOOK1(200+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(300+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(210+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(310+ID,TITLE,NX,XMIN,XMAX,LH)
WRITE (*,'(I4)') ID
C --- 20XX IS VALUE ACC., 30XX IS WEIGHT ACC.
CALL GBOOK1(2000+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(3000+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(2100+ID,TITLE,NX,XMIN,XMAX,LH)
CALL GBOOK1(3100+ID,TITLE,NX,XMIN,XMAX,LH)
C --- ACCUMULATE WEIGHTS
CALL GOPERA(100+ID,'*',100+ID,100+ID,1D0,1D0)
CALL GOPERA(100+ID,'I', 0,100+ID,1D0,1D0)
CALL GOPERA(300+ID,'+',100+ID,300+ID,1D0,1D0)
CALL GOPERA(110+ID,'*',110+ID,110+ID,1D0,1D0)
CALL GOPERA(110+ID,'I', 0,110+ID,1D0,1D0)
CALL GOPERA(310+ID,'+',110+ID,310+ID,1D0,1D0)
CALL GOPERA( 100+ID,'*', 100+ID, 100+ID,1D0,1D0)
CALL GOPERA( 100+ID,'I', 0, 100+ID,1D0,1D0)
CALL GOPERA(3000+ID,'+', 100+ID,3000+ID,1D0,1D0)
CALL GOPERA(1100+ID,'*',1100+ID,1100+ID,1D0,1D0)
CALL GOPERA(1100+ID,'I', 0,1100+ID,1D0,1D0)
CALL GOPERA(3100+ID,'+',1100+ID,3100+ID,1D0,1D0)
C --- ACCUMULATE VALUES
CALL GOPERA( ID,'*',100+ID, ID,1D0,1D0)
CALL GOPERA(200+ID,'+', ID,200+ID,1D0,1D0)
CALL GOPERA( 10+ID,'*',110+ID, 10+ID,1D0,1D0)
CALL GOPERA(210+ID,'+', 10+ID,210+ID,1D0,1D0)
CALL GOPERA( ID,'*', 100+ID, ID,1D0,1D0)
CALL GOPERA(2000+ID,'+', ID,2000+ID,1D0,1D0)
CALL GOPERA(1000+ID,'*',1100+ID,1000+ID,1D0,1D0)
CALL GOPERA(2100+ID,'+',1000+ID,2100+ID,1D0,1D0)
10 CONTINUE
CALL GRESET(ID)
@@ -101,33 +107,33 @@ C --- ACCUMULATE VALUES
READ(20, '(A)', END=20) LINE
CALL GREAD(LINE)
C --- ACCUMULATE WEIGHTS
CALL GOPERA(100+ID,'*',100+ID,100+ID,1D0,1D0)
CALL GOPERA(100+ID,'I', 0,100+ID,1D0,1D0)
CALL GOPERA(300+ID,'+',100+ID,300+ID,1D0,1D0)
CALL GOPERA(110+ID,'*',110+ID,110+ID,1D0,1D0)
CALL GOPERA(110+ID,'I', 0,110+ID,1D0,1D0)
CALL GOPERA(310+ID,'+',110+ID,310+ID,1D0,1D0)
CALL GOPERA( 100+ID,'*', 100+ID, 100+ID,1D0,1D0)
CALL GOPERA( 100+ID,'I', 0, 100+ID,1D0,1D0)
CALL GOPERA(3000+ID,'+', 100+ID,3000+ID,1D0,1D0)
CALL GOPERA(1100+ID,'*',1100+ID,1100+ID,1D0,1D0)
CALL GOPERA(1100+ID,'I', 0,1100+ID,1D0,1D0)
CALL GOPERA(3100+ID,'+',1100+ID,3100+ID,1D0,1D0)
C --- ACCUMULATE VALUES
CALL GOPERA( ID,'*',100+ID, ID,1D0,1D0)
CALL GOPERA(200+ID,'+', ID,200+ID,1D0,1D0)
CALL GOPERA( 10+ID,'*',110+ID, 10+ID,1D0,1D0)
CALL GOPERA(210+ID,'+', 10+ID,210+ID,1D0,1D0)
CALL GOPERA( ID,'*', 100+ID, ID,1D0,1D0)
CALL GOPERA(2000+ID,'+', ID,2000+ID,1D0,1D0)
CALL GOPERA(1000+ID,'*',1100+ID,1000+ID,1D0,1D0)
CALL GOPERA(2100+ID,'+',1000+ID,2100+ID,1D0,1D0)
GOTO 10
20 CONTINUE
CALL GRESET(ID)
CALL GRESET(100+ID)
C --- COMPUTE FINAL VALUES
CALL GOPERA(200+ID,'/',300+ID,ID,1D0,1D0)
CALL GOPERA(210+ID,'/',310+ID,10+ID,1D0,1D0)
CALL GOPERA(2000+ID,'/',3000+ID, ID,1D0,1D0)
CALL GOPERA(2100+ID,'/',3100+ID,1000+ID,1D0,1D0)
C --- COMPUTE FINAL ERRORS
CALL GOPERA(300+ID,'I',0,300+ID,1D0,1D0)
CALL GOPERA(300+ID,'S',0,100+ID,1D0,0D0)
CALL GOPERA(310+ID,'I',0,310+ID,1D0,1D0)
CALL GOPERA(310+ID,'S',0,110+ID,1D0,0D0)
CALL GOPERA(3000+ID,'I',0,3000+ID,1D0,1D0)
CALL GOPERA(3000+ID,'S',0, 100+ID,1D0,0D0)
CALL GOPERA(3100+ID,'I',0,3100+ID,1D0,1D0)
CALL GOPERA(3100+ID,'S',0,1100+ID,1D0,0D0)
C --- WRITE OUT RESULTS
CALL GTOPER( ID,1,1,0,100+ID)
CALL GTOPER( 10+ID,0,0,0,110+ID)
CALL GTOPER( ID,1,1,0, 100+ID)
CALL GTOPER( 1000+ID,0,0,0,1100+ID)
CLOSE(10)
RETURN
@@ -178,7 +184,7 @@ C --- PRINT OPENING MESSAGE
$ ' please reference:'
WRITE (*,'(2A)') ' S.Catani & M.H.Seymour,',
$ ' Phys. Lett. B378 (1996) 287.'
WRITE (*,'(/A)') ' Written by Giorgio Chiurato, April 2026'
WRITE (*,'(A/)') ' Version 0.0, April 2026'
WRITE (*,'(/A)') ' Written by Giorgio Chiurato, November 2026'
WRITE (*,'(A/)') ' Version 0.1, November 2026'
END
C-----------------------------------------------------------------------
C----------------------------------------------------------------------- ;
+23 -23
View File
@@ -131,7 +131,7 @@ C
C*** COMMON BLOCK AND SPACE REQUIREMENTS ***************************
C
C A COMMONBLOCK
C PARAMETER (NSIZE=200000,NMAX=2000)
C PARAMETER (NSIZE=2000000,NMAX=20000)
C COMMON /GBOOK/ A(NSIZE)
C IS USED TO STORE HISTOGRAM INFORMATION. THE HISTOGRAM INDEX TAKES
C NMAX+2 POSITIONS. EACH BOOKED ONE- (TWO-) DIMENSIONAL HISTOGRAM TAKES
@@ -158,7 +158,7 @@ C*********************************************************************
SUBROUTINE GBOOK1(ID,TITLE,NX,XL,XU,ILOG)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
CHARACTER TITLE*(*),TITFX*60
EQUIVALENCE (REQ,IEQ)
@@ -202,7 +202,7 @@ C*********************************************************************
SUBROUTINE GBOOK2(ID,TITLE,NX,XL,XU,NY,YL,YU)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
CHARACTER TITLE*(*),TITFX*60
EQUIVALENCE (REQ,IEQ)
@@ -237,7 +237,7 @@ C*********************************************************************
SUBROUTINE GFILL1(ID,X,W)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=A(ID+2)+0.5
@@ -260,7 +260,7 @@ C*********************************************************************
SUBROUTINE GFILLSC1(ID,X,W)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=A(ID+2)+0.5
@@ -287,7 +287,7 @@ C*********************************************************************
SUBROUTINE GFILL2(ID,X,Y,W)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=A(ID+2)+0.5
@@ -310,7 +310,7 @@ C*********************************************************************
SUBROUTINE GSCALE(ID,F)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=A(ID+2)+0.5
@@ -322,7 +322,7 @@ C*********************************************************************
SUBROUTINE GOPERA(ID1,OPER,ID2,ID3,F1,F2)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
CHARACTER OPER*1
IF (ID1.GT.NMAX .OR. ID2.GT.NMAX .OR. ID3.GT.NMAX) RETURN
@@ -381,7 +381,7 @@ C*********************************************************************
SUBROUTINE GCLEAR
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
DO 100 ID=1,INT(A(1)+0.5)
@@ -397,7 +397,7 @@ C*********************************************************************
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
INTEGER GLAST
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
CHARACTER TITLE*60, CTIME*8, OUT*108, CHA(40)*1
DIMENSION IROW(100), IFRA(100), DYAC(10), EV(20)
@@ -582,7 +582,7 @@ C*********************************************************************
SUBROUTINE GRESET(ID)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=A(ID+2)+0.5
@@ -594,7 +594,7 @@ C*********************************************************************
BLOCK DATA GDATA
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
DATA (A(J), J=1,NMAX+2)/NMAX,2,NMAX*0/
END
@@ -615,7 +615,7 @@ C-----------------------------------------------------------------------
SUBROUTINE GSCAT2(ID,X,Y,N)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
ONE=1
@@ -629,7 +629,7 @@ C SCALES HISTOGRAM ID SO THAT THE AREA UNDER IT BECOMES AREA
C
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
IS=NINT(A(ID+2))
@@ -643,7 +643,7 @@ C-----------------------------------------------------------------------
SUBROUTINE GACCUM(ID)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=400)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
IF (ID.GT.NMAX) RETURN
TOTAL=0.0
@@ -677,7 +677,7 @@ C ONE THOUSANTH OF THE LOWEST OTHER BIN
C
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
LOGICAL NEW,HIST,LOG
CALL GTOPER(ID,NEW,HIST,LOG,0)
@@ -690,7 +690,7 @@ C ERROR BARS FOR 1-DIM HISTOGRAMS
C
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
LOGICAL NEW,HIST,LOG
IF (ID.GT.NMAX) RETURN
@@ -713,7 +713,7 @@ C-----------------------------------------------------------------------
SUBROUTINE GTOP1(ID,NEW,HIST,LOG,IDERR)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
LOGICAL NEW,HIST,LOG, DIV
CHARACTER*8 TYPE(4),PLOT
@@ -848,7 +848,7 @@ C-----------------------------------------------------------------------
SUBROUTINE GTOP2(ID,NEW)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
LOGICAL NEW
PARAMETER (NZ=250)
@@ -959,7 +959,7 @@ C-----------------------------------------------------------------------
C---OUTPUT ALL HISTOGRAMS TO TOPDRAWER
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
DO 100 ID=1,INT(A(1)+0.5)
IS=A(ID+2)+0.5
@@ -971,7 +971,7 @@ C-----------------------------------------------------------------------
SUBROUTINE GTITLE(ID,TITLE,LENTIT)
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
CHARACTER TITLE*60
EQUIVALENCE (REQ,IEQ)
@@ -996,7 +996,7 @@ C --- SIMPLE UTILITY TO OBTAIN HIST PROPERTIES
IMPLICIT INTEGER (I-N)
IMPLICIT DOUBLE PRECISION (A-H,O-Z)
PARAMETER (NSIZE=200000,NMAX=2000)
PARAMETER (NSIZE=2000000,NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
PARAMETER (NXMAX=1000)
@@ -1030,7 +1030,7 @@ C-----------------------------------------------------------------------
CHARACTER*100 KEYS(5)
DOUBLE PRECISION TX, TY, TE
PARAMETER (NSIZE=200000, NMAX=2000)
PARAMETER (NSIZE=2000000, NMAX=20000)
COMMON /GBOOK/ A(NSIZE)
INTEGER NX, IOS, ID, IDERR, LH