From rhatcher Thu May 12 15:47:09 2005
To: rhatcher@fnal.gov
Subject: LABYRINTH diffs minos11.fnal.gov

rhatcher on minos11.fnal.gov (minos11.fnal.gov)
Linux minos11.fnal.gov 2.4.21-27.0.2.ELsmp #1 SMP Tue Jan 18 19:25:35 CST 2005 i686 i686 i386 GNU/Linux
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in GMINOSPATH
? Makefile.save
? current.status
? cvs.log.050510
? diff-since.1207
? doit.log
? fnal.diff
? recent.diffs
? test
? test.ffr
? test.fz_gaf
? test.hr
? testme.log
? who_changed.txt
? xyzzzy.log
? digi/junk.me
? finish/junk.me
? geometry/junk.me
? geometry/nominal_sup_geom.F_older
? inc/hepevt.inc
? inc/heplun.inc
? init/CREOBJ.F
? init/INITAP.F
? init/current.status
? init/foo.out
? io/single2neukin.F_older
? osc/build_irix64.log
? trak/gcalor_unix.F_returnnewline
? trak/guhadr.F_1
? trak/guphad.F_1
? trak/junk.me.F
Index: Make.architecture
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/Make.architecture,v
retrieving revision 1.19
diff -r1.19 Make.architecture
145a146
> CFLAGS     := $(CFLAGS) -n32 
Index: usr_event.F
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/usr_event.F,v
retrieving revision 1.4
diff -r1.4 usr_event.F
61c61,62
<       call SETFOR(spatab_id,'Body','I7')
---
>       call SETFOR(spatab_id,'Body','I9')
>       call SETFOR(spatab_id,'RIDBS','I7')
79a81,82
>       call SETFOR(listab_id,'LaSeNu','I7')
>       call SETFOR(listab_id,'LasAct','I7')
Index: usr_kine.F
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/usr_kine.F,v
retrieving revision 1.4
diff -r1.4 usr_kine.F
43a44
> #include "rectypes.inc"
44a46,48
> 
> #include "GAFKey.inc"
> 
45a50
> #include "SuperModule.inc"
49,51c54,76
<       integer i
<       real random(5), amass_mu, ptot2
<       parameter (amass_mu = 0.105658)
---
> #include "minos_geom.inc"
> 
>       character*255 filename, alt_filename
>       logical       file_exists
>       integer       len_name, len_alt, lenocc
> 
>       integer ichn, ierr
>       save    ichn
> 
>       integer mx_nevt_tot, mx_nevt_file
>       integer nevt_tot, nevt_file
>       integer irunlo, irunhi, ievtlo, ievthi, irec_in_file
>       logical l_notevt
> 
>       save mx_nevt_tot, mx_nevt_file
>       save nevt_tot, nevt_file
>       save irunlo,irunhi,ievtlo,ievthi, irec_in_file
> 
> c      integer mxsup, isup
> c      parameter (mxsup=15)
>       integer isup
>       real saved_coil_current(mxsup)
>       real saved_coil_katurn(mxsup)
54a80,84
> 
>       logical first
>       save    first
> 
>       data   nevt_tot / 0 / nevt_file / 0 /
55a86,148
>       data    first /.true./
> 
> c
> c clear out last event
> c
>       call clear_event
>       call clear_reco
>       lok       = .true.
> 
> c
> c save a copy of the coil currents
> c
>       do isup = 1, COUTAB(SuperModule)
>          call FETTAB(SuperModule,ID,isup)
>          saved_coil_current(isup) = SuperModule_CoilI
>          if (SuperModule_KATurn.ne.RNULL) then
>             saved_coil_katurn(isup) = SuperModule_KATurn
>          else
>             saved_coil_katurn(isup) = katurn(isup)
>          endif
>       enddo
> 
>       if (first) then
>          first = .false.
>          filename = 'reco_minos.gaf'
> 
>          alt_filename = ' '
>          call getenv('GMINOS_INPUT_GAF',alt_filename)
>          len_alt = lenocc(alt_filename)
>          if (len_alt.ne.0) then
>             inquire(file=alt_filename(1:len_alt),exist=file_exists)
>             if (file_exists) then
>                filename = ' '
>                filename = alt_filename(1:len_alt)
>             endif
>          endif
> 
>          len_name = lenocc(filename)
>          print *,'USR_KINE: using file ',filename(1:len_name)
> 
>          call reco_default_limits(mx_nevt_tot,mx_nevt_file,
>      &                            irunlo,irunhi,ievtlo,ievthi)
> c
> c currently valid possibilities are: 'GEVT' = geant event
> c
>          type_evt(1) = 'GEVT'
>          nlist_evt   = 1
> c
> c currently valid 'not event' records are: 'GEOM' = geometry information
> c users will want to read these in for the plane/cell position information
> c
>          type_notevt(1) = 'GEOM'
>          nlist_notevt   = 1
> 
>          ichn = 10
>          ierr = 0
>          call open_minos_gaf_chn(ichn,0,0,filename,ierr)
>          
>          if (ierr.ne.0) then
>             ieorun = 1
>             lok    = .false.
>             goto 999
>          endif
57,60d149
<       if (nmsg.gt.0) then
<          nmsg = nmsg - 1
<          print *,' CALL USR_KINE ',idevt
<          if (nmsg.eq.0) print *,'   ... last USR_KINE message'
63c152
<       call grndm(random,5)
---
>  500  continue
65c154
< c clear the /HEPEVT/ event
---
> c read the next record off the GAF
67,68c156,158
<       nevhep = idevt
<       nhep   = 0
---
>       call read_minos_gaf(ichn,irunlo,irunhi,ievtlo,ievthi,
>      &     irec_in_file,l_notevt,ierr)
> 
70c160
< c insert particles ...
---
> c if we go a notevt record, read again
72,77c162,190
<       nhep = nhep + 1
<       isthep(nhep) = 1  ! 1=final state --> GEANT tracked particle
<       idhep(nhep)  = 13 ! a mu-
<       do i = 1, 2
<          jmohep(i,nhep) = 0
<          jdahep(i,nhep) = 0
---
>       if (l_notevt) then
>          call fix_notevt
>          goto 500
>       endif
> c
> c put GAFKey info into GCFLAG common where some routines expect it
> c
>       ievent = nevt_tot
>       nevent = mx_nevt_tot
>       idrun  = GAFKey_RunNo
>       idevt  = GAFKey_EventNo
> 
>       if (ierr.ne.0) then
>          ieorun = 1
>          lok    = .false.
>          print *,'USR_KINE: saw ERR/EOF on input GAF ',ierr
>          goto 999
>       endif
> 
> c
> c restore the coil currents (in case we hit a NOTEVT)
> c
> c open the table for modification
>       call OPETAB(SuperModule)
>       do isup = 1, COUTAB(SuperModule)
>          call FETTAB(SuperModule,ID,isup)
>          SuperModule_CoilI  = saved_coil_current(isup)
>          SuperModule_KATurn = saved_coil_katurn(isup)
>          call REPTAB(SuperModule)
79,94c192,210
<       call vzero(vhep,4) ! no offset from NeuVtx
<       phep(1,nhep) = 2.0*(random(1)-0.5) * 2.0
<       phep(2,nhep) = 2.0*(random(2)-0.5) * 2.0
<       phep(3,nhep) = random(3) * 40.
<       phep(5,nhep) = amass_mu
<       ptot2 = phep(1,nhep)**2 + phep(2,nhep)**2 + phep(3,nhep)**2
<       phep(4,nhep) = sqrt(ptot2 + phep(5,nhep)**2)
< c
< c set a vertex
< c
<       call CLETAB(NeuVtx)
<       NeuVtx_ID = NEXT
<       NeuVtx_X  = 2.0*(random(4)-0.5) * 100.
<       NeuVtx_Y  = 2.0*(random(5)-0.5) * 100.
<       NeuVtx_Z  = 0.0
<       call INSTAB(NeuVtx)
---
> c re-close the table to prevent modification
>       call CLOTAB(SuperModule)
> c
> c unpack the StdHep ESet to /HEPEVT/
> c
>       call filcom_stdhep
> c
> c clear out any read-in hits or digits
> c
>       call clear_event_keep_stdhep
> c
> c
> c
>       if (nmsg.gt.0) then
>          nmsg = nmsg - 1
>          print *,' CALL USR_KINE ',idevt
>          if (nmsg.eq.0) print *,'   ... last USR_KINE message'
>       endif
> 
96d211
<       lok       = .true.
98c213
<       call hepevt2neukin
---
> CCCCCCC      call hepevt2neukin
105a221,346
>  999  continue
>       return
>       end
>       subroutine clear_event_keep_stdhep
> C----------------------------------------------------------------------
> C-
> C-   Purpose and Methods : Clear the ADAMO tables for a new event
> C-
> C-
> C-   Returned value  : none
> C-   Inputs  : none
> C-             
> C-   Outputs : none
> C-             
> C-   Created  :  1996.04.07   Robert Hatcher
> C-   Modified :  1998.07.02   Robert Hatcher - reco info now part of dataflow
> C-                              make sure it's cleared before an event starts
> C-
> C----------------------------------------------------------------------
>       implicit none
> 
> #include "EventHistory.inc"
> 
> #include "StdHepHead.inc"
> #include "StdHep.inc"
> 
> #include "NeuVtx.inc"
> #include "NeuKin.inc"
> 
> #include "HitPln.inc"
> #include "DigitPln.inc"
> 
> #include "FLSHit.inc"
> #include "FLSDigit.inc"
> #include "PEArrival.inc"
> 
> #include "LSTHit.inc"
> #include "LSTProto.inc"
> #include "LSTWire.inc"
> #include "LSTStrip.inc"
> 
> #include "RPCHit.inc"
> c include "RPCDigit.inc"
> 
> #include "EmuHit.inc"
> #include "TstHit.inc"
> 
> #include "RecoVtx.inc"
> #include "RecoShwEnergy.inc"
> #include "RecoShwDir.inc"
> #include "MuonTrkHeader.inc"
> #include "MuonTrkPoint.inc"
> #include "RecoMuon.inc"
> 
> #include "FLSDigiCell.inc"
> #include "FLSDigiPln.inc"
> #include "FLSDigiView.inc"
> 
> c      call CLETAB(EventHistory)
> c      call NULWIN(EventHistory)
> c
> c      call CLETAB(StdHepHead)
> c      call CLETAB(StdHep)
> c      call NULWIN(StdHepHead)
> c      call NULWIN(StdHep)
> c
> c      call CLETAB(NeuVtx)
> c      call CLETAB(NeuKin)
> c      call NULWIN(NeuVtx)
> c      call NULWIN(NeuKin)
> 
>       call CLETAB(HitPln)
>       call CLETAB(DigitPln)
>       call NULWIN(HitPln)
>       call NULWIN(DigitPln)
> 
>       call CLETAB(FLSHit)
>       call CLETAB(FLSDigit)
>       call CLETAB(PEArrival)
>       call NULWIN(FLSHit)
>       call NULWIN(FLSDigit)
>       call NULWIN(PEArrival)
> 
>       call CLETAB(LSTHit)
>       call CLETAB(LSTProto)
>       call CLETAB(LSTWire)
>       call CLETAB(LSTStrip)
>       call NULWIN(LSTHit)
>       call NULWIN(LSTProto)
>       call NULWIN(LSTWire)
>       call NULWIN(LSTStrip)
> 
>       call CLETAB(RPCHit)
>       call CLETAB(EmuHit)
>       call CLETAB(TstHit)
>       call NULWIN(RPCHit)
>       call NULWIN(EmuHit)
>       call NULWIN(TstHit)
> 
>       call CLETAB(RecoVtx)
>       call NULWIN(RecoVtx)
> 
>       call CLETAB(RecoShwEnergy)
>       call NULWIN(RecoShwEnergy)
> 
>       call CLETAB(RecoShwDir)
>       call NULWIN(RecoShwDir)
> 
>       call CLETAB(MuonTrkHeader)
>       call NULWIN(MuonTrkHeader)
> 
>       call CLETAB(MuonTrkPoint)
>       call NULWIN(MuonTrkPoint)
> 
>       call CLETAB(RecoMuon)
>       call NULWIN(RecoMuon)
> 
>       call CLETAB(FLSDigiCell)
>       call NULWIN(FLSDigiCell)
> 
>       call CLETAB(FLSDigiPln)
>       call NULWIN(FLSDigiPln)
> 
>       call CLETAB(FLSDigiView)
>       call NULWIN(FLSDigiView)
> 
Index: inc/minos_geom.inc
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/inc/minos_geom.inc,v
retrieving revision 1.6
diff -r1.6 minos_geom.inc
26c26
< c starts out "????" which means using `nominal' value if not specified
---
> c starts out "????" which means using 'nominal' value if not specified
Index: inc/partap.inc
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/inc/partap.inc,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 partap.inc
43c43
< c R. Hatcher's attempt at getting rid of 
---
> c R. Hatcher: attempt at getting rid of 
Index: init/lbl_ffcards.F
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/gminos/init/lbl_ffcards.F,v
retrieving revision 1.52
diff -r1.52 lbl_ffcards.F
452,454c452,454
< C
<       hittrim_nhits_trigger       = 0.50 * 1054719
<       hittrim_nhits_target_max    = 0.45 * 1054719
---
> C                                                     okay   fail
>       hittrim_nhits_trigger       = 0.50 * 1054719  ! 0.50 ! 0.80
>       hittrim_nhits_target_max    = 0.45 * 1054719  ! 0.45 ! 0.75
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in RECOPATH
? current.status
? dist_xyz_coil.F
? dist_xyz_edge.F
? maw
? paw.metafile
? recent.diffs
? reco_minos
? reco_minos.hr
? strip_hits
? fls/fls_smear_response.F_dump
? mawlib/csext.F_cern
? mawlib/mawdef.c
? mhpd/junk.me
? mhpd/mhpd_faceon_hits.F_old
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in UTILPATH
? current.status
? dump_hepevt
? gen_1part_evt
? recent.diffs
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in NEUGENPATH
? current.status
? hepevt.dat
? last.kumac
? last.kumacold
? mc_main
? mc_main.hr
? new_irix64.od
? old_irix64.od
? plot_all.kumac
? recent.diffs
? stThbwOp
? testrsq
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in NEUGEN3PATH
? gmake.040322.log
? gmake.050121
? gmake.log.050119
? gmake.log.050127
? lib
? make_table
? make_table.050119
? make_table.log
? neugen_example
? nulook
? recent.diffs050222
? recent.diffs_050119
? test_xsec.dat
Index: Make.include
===================================================================
RCS file: /cvs/minoscvs/rep1/neugen3/Make.include,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.2
diff -r1.1.2.3 -r1.1.2.2
16,21c16
< ifeq ($(shell ls $(CERNLIB)/libpdflib804.a 2>/dev/null ),)
<   LPDFLIB = pdflib 
< else
<   LPDFLIB = pdflib804
< endif
< CERNLIBS = -L$(CERNLIB) -l$(LPDFLIB) -lgraflib -lkernlib -lmathlib -lpacklib -lpawlib \
---
> CERNLIBS = -L$(CERNLIB) -lpdflib -lgraflib -lkernlib -lmathlib -lpacklib -lpawlib \
55,57c50
< 
< 
< 
---
> 	$(RM) $*.o
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in MIXPATH
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in THESEUS
? current.status
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in BMAPPATH
? 203_endplanes
? bfields.ps
? bfld_200.dat_original
? bmap_display
? current.status
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in GMINOSAUX
? bmpt-wght.hbk.save
? bmpt-wght.root
? draw_bmpt.C
? last.kumac
? random.ntup
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in NEUGENAUX
? mc_main.hr
? old_cteq
? rsq_xsects_irix.dat
? rsq_xsects_irix64.dat
? rsq_xsects_linux.dat
? rsq_xsects_osf1.dat
? rsq_xsects_sunos.dat
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in FLUXPATH
? evt_rate.hr.gz
? evt_rate.kumac
? last.kumac
? last.kumacold
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in ADAMO_MINOS
? 1
? outbox
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%  The following may include site customization  %%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diffs in LABYRINTH
? bin
? current.status
? cvsmanip
? ephemera
? fix_cvs.csh
? inc
? labyrinth_iu2fnal.csh
? last.kumacold
? lib
? linux_adamo.tar.gz
? make_linux_tarball.csh
? me.now
? paw.metafile
? src
? tiptemp.comis.INQ
? adamo/adamo3x3.car
? adamo/adamo3x3.car.bad_fibi01
? adamo/adamo3x3.pam
? adamo/install_adamo
? adamo/install_adamo_from_file
? adamo/last.kumac
? adamo/minos/1
? adamo/minos/outbox
? mgr/02
? mgr/03
? mgr/04
? mgr/05
? mgr/diffs.2005-05-12
? mgr/f77_irix64.txt
? mgr/junk.csh
? mgr/junk.me
? mgr/last.kumac
? mgr/last.kumacold
? mgr/make_adamo_fbatch.csh
? mgr/make_minos.sh_munged
? mgr/make_trim_src.sh
? mgr/make_via_fbatch.csh
? mgr/make_via_fbatch.sh
? mgr/reco_minos.hr
? mgr/tag_src.sh
? mgr/tiptemp.comis.INQ
? mgr/zzz_junk.me
? setup/setup_pkgs_FNALU_hack.csh
? theseus/current.status
Index: labyrinth.setup
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/labyrinth.setup,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 labyrinth.setup
6c6
< setenv LABYRINTH unknown ### modify this line using gmake new
---
> setenv LABYRINTH /afs/fnal.gov/files/code/e875/sim/labyrinth ### modify this line using gmake new
16d15
< #
\ No newline at end of file
Index: setup_labyrinth.csh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup_labyrinth.csh,v
retrieving revision 1.2
diff -r1.2 setup_labyrinth.csh
15c15
< setenv LABYRINTH unknown ### modify this line using gmake new
---
> setenv LABYRINTH /afs/fnal.gov/files/code/e875/sim/labyrinth ### modify this line using gmake new
Index: setup_labyrinth.sh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup_labyrinth.sh,v
retrieving revision 1.3
diff -r1.3 setup_labyrinth.sh
15c15
< export LABYRINTH=unknown ### modify this line using gmake new
---
> LABYRINTH=/afs/fnal.gov/files/code/e875/sim/labyrinth ; export LABYRINTH ### modify this line using gmake new
Index: adamo/adamo_var_setup
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/adamo/adamo_var_setup,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 adamo_var_setup
5,6d4
< #  For IBM RS6000
< #
14a13
> 
18,21c17,21
< setenv COMPILER_NAME     xlf
< # AA 26.31996 replaced setenv COMPILER_OPTIONS "-g -w -qextname -qcharlen=30000 -NQ30000 -NT120000 -NP1000 -ND20000 -NN100000"
< 
< setenv COMPILER_OPTIONS "-O2 -g -qextname -qcharlen=30000"
---
> setenv COMPILER_NAME     f77
> setenv COMPILER_OPTIONS "-g -static -n32 "
> #-mips3 -align8 -i4 -r4"
> setenv CCOPTIONS "-g -n32"
> # -mips3 -align8 -i4 -r4"
25c25,26
< setenv LOAD_OPTIONS     ""
---
> setenv LOAD_OPTIONS     "-n32"
> # -mips3 -align8"
31,32c32
< # If your compiler needs the '\' to be doubled (MIPS machines), use the following
< # command. If not, remove it.
---
> # The compiler needs the '\' to be doubled so:
43c43
< setenv GLIB "-lgrafX11 -lX11 -lm"
---
> setenv GLIB "-lgrafX11 -lXm -lXt -lX11 -lPW"
45,47d44
< # No command is needed to randomise a library ( setenv RLIB ... 
< #
< 
63d59
< 
Index: adamo/adamo_var_setup.linux
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/adamo/adamo_var_setup.linux,v
retrieving revision 1.4
retrieving revision 1.1
diff -r1.4 -r1.1
25d24
< setenv CCOPTIONS "-g"
36c35
< # Does the compiler needs the '\' to be doubled:
---
> # The compiler needs the '\' to be doubled so:
38,42c37
< if ( ${?LINUX_USE_F77} ) then
<   setenv DOUBLEBACKSLASH
< else
<   setenv DOUBLEBACKSLASH
< endif
---
> setenv DOUBLEBACKSLASH
51,62c46
< # may need -lXm before -lXt
< setenv GLIB "-L/usr/X11R6/lib -lgrafX11 -lXt -lX11 -ldl -lcrypt -lnsl"
< 
< echo GLIB = ${GLIB}
< if ( -r ${CRNLIB}/liblapack3.a ) then
<   setenv GLIB "-L ${CRNLIB} -llapack3 -lblas ${GLIB}"
<   echo GLIB = ${GLIB}
< endif
< 
< # Define command to randomize the library
< #
< setenv RLIB ranlib
---
> setenv GLIB "-L/usr/X11R6/lib -lgrafX11 -lXm -lXt -lX11 -ldl -lcrypt"
67a52
>  
71c56,57
< setenv ORACLE "n" 
---
> #setenv ORACLE "n"
>  
77,82d62
< #
< # Generate c code for libraries and f2c options
< #
< setenv F2C_NAME ""
< setenv F2C_OPTIONS ""
< #
Index: setup/minos_host.csh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup/minos_host.csh,v
retrieving revision 1.27
retrieving revision 1.26
diff -r1.27 -r1.26
71c71,75
<     case pplx*:
---
>     case al1*:
>           setenv MINOS_HOST OX-DU
>           breaksw
>     case pplx2:
>     case pplxgen:
Index: setup/setup_pkgs_FNALU.csh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup/setup_pkgs_FNALU.csh,v
retrieving revision 1.7
diff -r1.7 setup_pkgs_FNALU.csh
21c21
< setup cern,cvs,gtools
---
> setup cern,cvs
22a23,24
> # setup -j option says don't pull in dependencies
> # in this case we don't want geant overriding GCC version
26c28
<   set geant_qual = "-q GCC3_3_1"
---
>   set geant_qual = "-j -q GCC3_3_1"
30c32
<   set geant_qual = "-o"
---
>   set geant_qual = "-j -o"
32d33
< 
33a35,36
> # geant sets up a particular version of "gdb" we don't want
> unsetup gdb
79a83,85
> if ( ! $?CRNLIB ) then
>   setenv CRNLIB $CERN_DIR/lib
> endif
80a87,97
> # UPS stdhep drags along a number of packages that we don't need
> # but take up environment variable space ... do unsetup
> unsetup isajet,herwig,qq,histo
> #,gnuplot
> if ( $MINOS_ARCH == "irix64" ) then
> # gtools (ie. gmake) is somehow tied to herwig, when one does a unsetup
> # on herwig it removes gtools as well ...<sigh> set it up again
>   echo no current chain for gtools, explicitly setup v2_4c version.
>   setup gtools v2_4c
> endif
> #
82,83d98
< 
< #setup gcc v3_1
Index: setup/setup_pkgs_FNALU.sh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup/setup_pkgs_FNALU.sh,v
retrieving revision 1.5
diff -r1.5 setup_pkgs_FNALU.sh
21c21
< setup cern,cvs,gtools
---
> setup cern,cvs
22a23,24
> # setup -j option says don't pull in dependencies
> # in this case we don't want geant overriding GCC version
26c28
<   geant_qual="-q GCC3_3_1"
---
>   geant_qual="-j -q GCC3_3_1"
30c32
<   geant_qual="-o"
---
>   geant_qual="-j -o"
32a35,36
> # geant sets up a particular version of "gdb" we don't want
> unsetup gdb
87a92,101
> # UPS stdhep drags along a number of packages that we don't need
> # but take up environment variable space ... do unsetup
> unsetup isajet,herwig,qq,histo
> #,gnuplot
> if [ "$MINOS_ARCH" = "irix64" ]; then
> # gtools (ie. gmake) is somehow tied to herwig, when one does a unsetup
> # on herwig it removes gtools as well ...<sigh> set it up again
>   setup gtools v2_4c
> fi
> #
89d102
< #setup gcc v3_1
Index: setup/setup_pkgs_OX-LINUX.csh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup/setup_pkgs_OX-LINUX.csh,v
retrieving revision 1.4
retrieving revision 1.2
diff -r1.4 -r1.2
17,18d16
< setenv CERN_ROOT $CERN_DIR  # For Fluka access to flukaaf.dat.
< 
23c21
< setenv MISCPATH /datadisk/minos/software/misc
---
> setenv MISCPATH /minos/software/misc
94c92
< setenv NEUGEN3PATH /datadisk/minos/software/labyrinth/src/generator/neugen3
---
> setenv NEUGEN3PATH /minos/software/labyrinth/src/generator/neugen3
Index: setup/setup_pkgs_OX-LINUX.sh
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/setup/setup_pkgs_OX-LINUX.sh,v
retrieving revision 1.3
retrieving revision 1.1
diff -r1.3 -r1.1
17,18d16
< export CERN_ROOT=$CERN_DIR  # For Fluka access to flukaaf.dat.
< 
23c21
< export MISCPATH=/datadisk/minos/software/misc
---
> export MISCPATH=/minos/software/misc
107c105
< export NEUGEN3PATH=/datadisk/minos/software/labyrinth/src/generator/neugen3
---
> export NEUGEN3PATH=/minos/software/labyrinth/src/generator/neugen3
Index: test/test_hepevt.F
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/test/test_hepevt.F,v
retrieving revision 1.2
retrieving revision 1.1
diff -r1.2 -r1.1
4c4
< #include "stdhep.inc"
---
> #include "hepevt.inc"
Index: test/test_heplun.F
===================================================================
RCS file: /cvs/minoscvs/rep1/labyrinth/labyrinth/test/test_heplun.F,v
retrieving revision 1.2
retrieving revision 1.1
diff -r1.2 -r1.1
4c4
< #include "stdlun.inc"
---
> #include "heplun.inc"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%