Index: Makefile =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/Makefile,v retrieving revision 1.7 diff -c -r1.7 Makefile *** Makefile 1998/12/24 02:05:25 1.7 --- Makefile 2001/05/01 13:04:23 *************** *** 1,15 **** all: install ! install: ! ./bin/make.libdir ! (cd gen ; make install) ! (cd simjlc ; make install) ! (cd util ; make install) clean: ! (cd gen ; make clean) ! (cd simjlc ; make clean) ! (cd util ; make clean) rm -f *~ cleanall: clean --- 1,17 ---- all: install ! dir: ! @./bin/make.libdir + install: dir + (cd gen; make install) + (cd simjlc; make install) + (cd util ; make install) + clean: ! (cd gen; make clean) ! (cd simjlc; make clean) ! (cd util ; make clean) rm -f *~ cleanall: clean Index: config/lclib.tmpl =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/config/lclib.tmpl,v retrieving revision 1.18 diff -c -r1.18 lclib.tmpl *** config/lclib.tmpl 2001/02/08 05:17:48 1.18 --- config/lclib.tmpl 2001/05/01 13:04:23 *************** *** 100,106 **** RANLIB = ranlib #endif - XCOMM **************************************************************** XCOMM PPCArchitecture XCOMM **************************************************************** --- 100,105 ---- *************** *** 138,143 **** --- 137,185 ---- -DUNIX -DKEK -DJLC -DMACHTEN_PPC -DG77_521_OR_GREATER \ $(EXTRADEFINES) $(INCPATH) CC = gcc + FF = g77 + RANLIB = ranlib + #endif + + + + + XCOMM **************************************************************** + XCOMM MacOSXArchitecture + XCOMM **************************************************************** + #if defined(MacOSXArchitecture) || defined(DarwinArchitecture) + #ifndef PowerPCArchitecture + #define PowerPCArchitecture + #endif + #ifndef PPCArchitecture + #define PPCArchitecture + #endif + + #if defined(PPCArchitecture) + #ifdef DOSHRLIB + #undef DOSHRLIB + #endif + #endif + + #ifdef DOSHRLIB + REQUIREDLIBS = -lg2c -lm -lc + #endif + + SHRLIBFLAGS = -fPIC + CDEBUGFLAGS = -O + CFLAGS = $(CDEBUGFLAGS) \ + -fno-strength-reduce -fomit-frame-pointer $(SHRLIBFLAGS) \ + -DUNIX -DKEK -DJLC -DMACHTEN_PPC -D__DARWIN__ \ + -Dlinux -DPPC -D__powerpc__ \ + -DX_LOCALE $(EXTRADEFINES) $(INCPATH) + FDEBUGFLAGS = -O + FFLAGS = $(FDEBUGFLAGS) -fPIC \ + -fdollar-ok -fno-backslash -fno-automatic -fno-f90 -fugly-complex \ + -fno-globals -fugly-init -Wno-globals \ + -fno-second-underscore \ + -DUNIX -DKEK -DJLC -DMACHTEN_PPC -D__DARWIN__ -DG77_521_OR_GREATER \ + $(EXTRADEFINES) $(INCPATH) + CC = cc FF = g77 RANLIB = ranlib #endif Index: gen/Makefile =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/gen/Makefile,v retrieving revision 1.3 diff -c -r1.3 Makefile *** gen/Makefile 1998/12/24 02:37:18 1.3 --- gen/Makefile 2001/05/01 13:04:23 *************** *** 1,4 **** ! SHELL = /bin/sh MFLAGS = CURRDIR = . SUBDIRS = basesv5.1 helasv204 luhadr tauola --- 1,4 ---- ! SHELL = /bin/bash MFLAGS = CURRDIR = . SUBDIRS = basesv5.1 helasv204 luhadr tauola Index: gen/luhadr/luhadr.F =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/gen/luhadr/luhadr.F,v retrieving revision 1.2 diff -c -r1.2 luhadr.F *** gen/luhadr/luhadr.F 1999/05/17 09:03:19 1.2 --- gen/luhadr/luhadr.F 2001/05/01 13:04:23 *************** *** 112,123 **** --- 112,139 ---- CALL UVZERO(600,ISGRP) CALL UVZERO( 30,NDKPTN) C-- + C>>> + #ifdef DBGLU + PRINT *, ' Entered LUHADR............' + print *, ' npart = ', npart + #endif + C>>> DO 200 IP = 1, NPART NDAU = RBUF(12,IP) IFSHW = RBUF(19,IP) ISLV = IFSHW/100 IPSHW = MOD(IFSHW,100) NSLVL = MAX(NSLVL,ISLV) + C>>> + #ifdef DBGLU + print *, ' ip = ', ip + print *, ' ndau = ', ndau + print *, ' ifshw = ', ifshw + print *, ' islv = ', islv + print *, ' ipshw = ', ipshw + print *, ' nslvl = ', nslvl + #endif + C>>> IF ( ISLV.LE.0 ) THEN IF ( NDAU.LE.0 ) THEN NNOSHW = NNOSHW + 1 *************** *** 172,181 **** --- 188,203 ---- C>>> #ifdef DBGLU PRINT *, ' LUHADR starts Hadronization.' + print *, ' nslvl = ', nslvl #endif C>>> INELM = 0 DO 7000 ISLV = 1, NSLVL + C>>> + #ifdef DBGLU + print *, 'nptlv(', islv, ') = ', nptlv(islv) + #endif + C>>> IF ( NPTLV(ISLV).LE.0 ) GO TO 7000 NIN = 0 CALL UVZERO(30,IDIDIT) *************** *** 210,216 **** --- 232,253 ---- C current showering level (IIN=1,..,NIN) C-- DO 300 IQ = 1, NPTLV(ISLV) + C>>> + #ifdef DBGLU + print *, 'iq = ', iq + print *, 'ididit(', iq, ') = ', ididit(iq) + print *, 'iptlv(', iq, ',',islv,') = ', iptlv(iq,islv) + #endif + C>>> IF ( IDIDIT(IQ).GT.0 ) GO TO 300 + C>>> + #ifdef DBGLU + print *, 'iptlv(', iq, ',',islv,') = ', iptlv(iq,islv) + print *, 'id = ', rbuf( 2,ip) + print *, 'ndau = ', rbuf(12,ip) + print *, 'icf = ', rbuf(18,ip) + #endif + C>>> IP = IPTLV(IQ,ISLV) ID = RBUF(2,IP) IDA = IABS(ID) Index: util/Makefile =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/util/Makefile,v retrieving revision 1.2 diff -c -r1.2 Makefile *** util/Makefile 1997/11/14 09:50:21 1.2 --- util/Makefile 2001/05/01 13:04:23 *************** *** 1,4 **** ! SHELL = /bin/sh MFLAGS = CURRDIR = . --- 1,4 ---- ! SHELL = /bin/bash MFLAGS = CURRDIR = . Index: util/lcfull/src/prblk1.F =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/util/lcfull/src/prblk1.F,v retrieving revision 1.2 diff -c -r1.2 prblk1.F *** util/lcfull/src/prblk1.F 1998/11/19 09:08:57 1.2 --- util/lcfull/src/prblk1.F 2001/05/01 13:04:23 *************** *** 80,84 **** --- 80,93 ---- DATA BFIELD/10.1085E0/ DATA PTOR /329.9837713/ DATA ROPT /3.03045206E-3/ + + #include "presta.inc" + DATA NCTBGN /0/ + DATA NCTEND /0/ + DATA NSTEVT /320*0/ + #include "prrsta.inc" + DATA NRDREC /0/ + DATA NWTREC /0/ + DATA NSTREC /60*0/ C END Index: util/tbs/src/lun_to_fileno_ppc.c =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/util/tbs/src/lun_to_fileno_ppc.c,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 lun_to_fileno_ppc.c *** util/tbs/src/lun_to_fileno_ppc.c 1997/11/12 09:16:40 1.1.1.1 --- util/tbs/src/lun_to_fileno_ppc.c 2001/05/01 13:04:23 *************** *** 1,5 **** --- 1,9 ---- #include + #if defined(__APPLE__) + #include + #else #include + #endif #include "fio.h" void lun_to_fileno_ (int *lun, int *fn) { Index: util/tbschk/termlib.c =================================================================== RCS file: /proj/soft/CVSMASTER/lclib/util/tbschk/termlib.c,v retrieving revision 1.1.1.1 diff -c -r1.1.1.1 termlib.c *** util/tbschk/termlib.c 1997/11/12 09:17:40 1.1.1.1 --- util/tbschk/termlib.c 2001/05/01 13:04:23 *************** *** 1,7 **** --- 1,11 ---- /* #include */ + #ifdef __DARWIN__ + #include "ncurses/curses.h" + #else #include "curses.h" + #endif #define CTRL(c) ('c'&037) void tinit_() *************** *** 131,134 **** void tclear_() { clear(); ! } \ No newline at end of file --- 135,138 ---- void tclear_() { clear(); ! }