--- gpamela/Makefile	2006/05/02 12:35:25	3.17
+++ gpamela/Makefile	2006/06/05 13:56:16	3.19
@@ -41,13 +41,14 @@
 	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/gpmyl.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
+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) $(GPCARDSRCS) \
@@ -69,21 +70,29 @@
 #
 BIN = ./bin
 AUX = ./aux
-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
+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 -ffortran-bounds-check
 FC = g77 
 DEBFLAGS =  -g -fdebug-kludge
-FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I$(GPCALORINC) -I${GEANTINC} ${BATCHFLAGS}
+FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I$(GPCALORINC) \
+	-I${GEANTINC} ${BATCHFLAGS}
 LDFLAGS= ${GPLIB} ${CERNLIB} -Xlinker -Map -Xlinker $@.map