--- gpamela/Makefile 2005/07/25 11:53:19 3.8 +++ gpamela/Makefile 2006/06/05 13:56:16 3.19 @@ -22,30 +22,38 @@ gpamela/guphad.F gpamela/gustep.F \ gpamela/gutrak.F gpamela/gutrev.F \ gpamela/gviewyz.F gpamela/n2g.F \ - gpamela/uginit.F gpamela/uglast.F + gpamela/uginit.F gpamela/uglast.F \ + gpamela/gprnhran.F GPCALSRCS = gpcal/gpcalv.F gpcal/gpce.F gpcal/gpdcal.F \ gpcal/gpg10c.F gpcal/gpg10.F gpcal/gpsica.F \ gpcal/gpucal.F gpcal/gpw2.F gpcal/gpw.F GPCASSRCS = gpcas/gpcasv.F gpcas/gpdcas.F gpcas/gpucas.F GPCATSRCS = gpcat/gpcatv.F gpcat/gpdcat.F gpcat/gpucat.F -GPFIELDSRCS = gpfield/flin3.F gpfield/gufld.F +GPCARDSRCS = gpcard/gpcardv.F gpcard/gpdcard.F gpcard/gpucard.F +GPFIELDSRCS = gpfield/flin3.F gpfield/gufld.F gpfield/gprbi.F \ + gpfield/inter_B.F gpfield/inter_B_inner.F gpfield/inter_B_outer.F GPGARSRCS = gpgar/gpgacl.F gpgar/gpgapart.F gpgar/gpgarin.F \ gpgar/gpgarsel.F gpgar/gptogar.F gpgar/grinit.F GPHYSSRCSRCS = gphys/gfluct.F GPMAINSRCS = gpmain/gpmain.F GPSPESRCS = gpspe/gpcp.F gpspe/gpdspe.F gpspe/gpfe.F \ gpspe/gpkap.F gpspe/gpmaspe.F gpspe/gproa.F \ - gpspe/gpsitr.F gpspe/gpspema.F gpspe/gpspev.F gpspe/gpuspe.F + gpspe/gpsitr.F gpspe/gpspema.F gpspe/gpspev.F gpspe/gpuspe.F \ + gpspe/gprspe.F gpspe/gpudiffusion.F gpspe/gpucollection.F GPTOFSRCS = gptof/gpdtof.F gptof/gpscin.F gptof/gpscint.F \ - gptof/gptofv.F gptof/gputof.F + gptof/gptofv.F gptof/gputof.F gptof/gpmyl.F gptof/gppol.F GPTRDSRCS = gptrd/gpdtrd.F gptrd/gptrad.F gptrd/gptrdv.F \ gptrd/gputrd.F gptrd/gpxe.F gptrd/gpxtr.F \ gptrd/npoiss.F gptrd/xescape.F gptrd/xtrinteg.F \ gptrd/xtrinter.F gptrd/xtryield.F GPXINTSRCS = gpxint/gxint.F gpxint/qnext.F +GPNDSRCS = gpnd/gpndv.F gpnd/gpgigp.F gpnd/gpund.F gpnd/gpdnd.F gpnd/gpgig.F \ + gpnd/gpgrsigma.F gpnd/gpgres.F +GPCALORSRC = gpcalor/gpcalor.F # -GPSRCS = $(GPAMELASRCS) $(GPCALSRCS) $(GPCASSRCS) $(GPCATSRCS) $(GPFIELDSRCS) $(GPGARSRCS) $(GPHYSSRCS) \ - $(GPSPESRCS) $(GPTOFSRCS) $(GPTRDSRCS) +GPSRCS = $(GPAMELASRCS) $(GPCALSRCS) $(GPCASSRCS) $(GPCATSRCS) $(GPCARDSRCS) \ + $(GPFIELDSRCS) $(GPGARSRCS) $(GPHYSSRCS) \ + $(GPSPESRCS) $(GPTOFSRCS) $(GPNDSRCS) $(GPTRDSRCS) $(GPCALORSRC) GPOBJS =$(addsuffix .o,$(basename ${GPSRCS}) ) GPDEPENDS =$(GPOBJS:.o=.d) GPMAINOBJS =$(addsuffix .o,$(basename ${GPMAINSRCS}) ) @@ -55,49 +63,63 @@ # GEANTINC = gcdes GPINC = gpcdes +GPCALORINC = gpcalordes CERNLIB = `cernlib geant,genlib,pawlib,graflib/X11,packlib,mathlib` GPLIBDIR = ./lib -GPLIB = ${GPLIBDIR}/libgarfield-7.a +GPLIB = ${GPLIBDIR}/libgarfield-7.a # BIN = ./bin AUX = ./aux -AUXFILES = ${AUX}/gpfield.rz ${AUX}/GPAMELA.FFR ${AUX}/TRD_ATT.DAT ${AUX}/GARFIELD.GAR \ -$(AUX)/xe_80_co2_20.gas +AUXFILES = ${AUX}/gpfield.rz ${AUX}/GPAMELA.FFR ${AUX}/TRD_ATT.DAT \ + ${AUX}/GARFIELD.GAR ${AUX}/xe_80_co2_20.gas \ + ${AUX}/measure_n3_290302.rz ${AUX}/measure_n4_110402_corrected.rz \ + ${AUX}/resxy_new.rz ${AUX}/INPUTSEED.DAT ${AUX}/readseeds.f \ + ${AUX}/writeseeds.f ${AUX}/chetc.dat.gz ${AUX}/xsneut.dat.gz \ + ${AUX}/external_top_map_n4_150402.rz \ + ${AUX}/Neut1.dat ${AUX}/Neut2.dat ${AUX}/Neut3.dat + GARFIELDSRC = ./garfield/src # -INTERFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_X11 -DGPAMELA_INTER -DGPAMELA_HIGZ \ - -DGPAMELA_GARFIELD -DGPAMELA_MANYWIRE -DGPAMELA_LONGLIST -DGPAMELA_BIGMAP -BATCHFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_GARFIELD -DGPAMELA_MANYWIRE -DGPAMELA_LONGLIST -DGPAMELA_BIGMAP +INTERFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_X11 -DGPAMELA_INTER \ + -DGPAMELA_HIGZ \ + -DGPAMELA_GARFIELD -DGPAMELA_MANYWIRE -DGPAMELA_LONGLIST \ + -DGPAMELA_BIGMAP +BATCHFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_GARFIELD \ + -DGPAMELA_MANYWIRE -DGPAMELA_LONGLIST -DGPAMELA_BIGMAP # CC = gcc -FC = g77 +#FC = g77 -ffortran-bounds-check +FC = g77 DEBFLAGS = -g -fdebug-kludge -FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GEANTINC} ${BATCHFLAGS} -LDFLAGS= ${GPLIB} ${CERNLIB} +FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I$(GPCALORINC) \ + -I${GEANTINC} ${BATCHFLAGS} +LDFLAGS= ${GPLIB} ${CERNLIB} -Xlinker -Map -Xlinker $@.map -gpamelax11.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GEANTINC} ${INTERFLAGS} +gpamelax11.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GPCALORINC} -I${GEANTINC} ${INTERFLAGS} gpamelax11.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS} ${GPXINTSRCS} ${GPXINTOBJS} ${GPXINTDEPENDS} @echo Creating $@ ..... $(FC) -o ${BIN}/$@ ${GPOBJS} ${GPXINTOBJS} ${LDFLAGS} @echo Removing object files ..... @rm -f ${GPOBJS} ${GPXINTOBJS} -gpamela.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GEANTINC} ${BATCHFLAGS} +gpamela.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GPCALORINC} -I${GEANTINC} ${BATCHFLAGS} gpamela.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS} ${GPMAINSRCS} ${GPMAINOBJS} ${GPMAINDEPENDS} @echo Creating $@ ..... $(FC) -o ${BIN}/$@ ${GPOBJS} ${GPMAINOBJS} ${LDFLAGS} @echo Removing object files ..... @rm -f ${GPOBJS} ${GPMAINOBJS} -gpamelax11_deb.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals ${DEBFLAGS} -I${GPINC} -I${GEANTINC} ${INTERFLAGS} +gpamelax11_deb.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals ${DEBFLAGS} -I${GPINC} -I${GPCALORINC} -I${GEANTINC} ${INTERFLAGS} +gpamelax11_deb.exe: LDFLAGS= ${GPLIB} ${CERNLIB} ${DEBFLAGS} gpamelax11_deb.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS} ${GPXINTSRCS} ${GPXINTOBJS} ${GPXINTDEPENDS} @echo Creating $@ ..... $(FC) -o ${BIN}/$@ ${GPOBJS} ${GPXINTOBJS} ${LDFLAGS} @echo Removing object files ..... @rm -f ${GPOBJS) ${GPXINTOBJS} -gpamela_deb.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals ${DEBFLAGS} -I${GPINC} -I${GEANTINC} ${BATCHFLAGS} +gpamela_deb.exe: FFLAGS = -fvxt -fno-automatic -Wno-globals ${DEBFLAGS} -I${GPINC} -I${GPCALORINC} -I${GEANTINC} ${BATCHFLAGS} +gpamelax_deb.exe: LDFLAGS= ${GPLIB} ${CERNLIB} ${DEBFLAGS} gpamela_deb.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS} ${GPMAINSRCS} ${GPMAINOBJS} ${GPMAINDEPENDS} @echo Creating $@ ..... $(FC) -o ${BIN}/$@ ${GPOBJS} ${GPMAINOBJS} ${LDFLAGS} @@ -117,7 +139,9 @@ install : @test -d "$(GPAMELA_BIN)" && \ (echo "Now moving executable and auxiliary files to $(GPAMELA_BIN)"; \ - mv -f $(BIN)/*.exe $(GPAMELA_BIN)/. ; cp -f ${AUXFILES} $(GPAMELA_BIN)/. ) + mv -f $(BIN)/*.exe $(GPAMELA_BIN)/. ; cp ${AUXFILES} $(GPAMELA_BIN)/.;\ + echo "Now unzipping the GCALOR cross section data files"; \ + gzip -dv $(GPAMELA_BIN)/xsneut.dat.gz $(GPAMELA_BIN)/chetc.dat.gz) ${GPLIBDIR}/libgarfield-7.a: @echo Creating libgarfield-7.a it will take few minutes .....