*** ./alpgen/2.1.3d.2/i686-slcrelease-gcc34-opt/alplib/alpsho.f	2010-12-15 08:52:20.000000000 -0600
--- /home/ghesketh/bar/ghesketh/alpgen_tune/alplib/alpsho.f	2010-12-15 04:57:24.000000000 -0600
***************
*** 16,22 ****
       &              SPINUP(MAXNUP)
  C...HEPEVT COMMONBLOCK.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=10000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
--- 17,23 ----
       &              SPINUP(MAXNUP)
  C...HEPEVT COMMONBLOCK.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=4000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
***************
*** 284,292 ****
        INTEGER IUSRMAT
        PARAMETER (IUSRMAT=1)
  C     
!       WRITE(*,*) 'INPUT NAME OF FILE CONTAINING EVENTS'
!       WRITE(*,*) '(FOR "file.unw" ENTER "file")'
!       READ(*,*) FILENAME
        CALL STRCATH(FILENAME,'.unw',TMPSTR)
        call GETUNIT(NUNIT)
        OPEN(UNIT=NUNIT,FILE=TMPSTR,STATUS='OLD')
--- 285,296 ----
        INTEGER IUSRMAT
        PARAMETER (IUSRMAT=1)
  C     
!       open (unit = 2, file = "input")
!       read (2,*) FILENAME
!       close(2)
! C      WRITE(*,*) 'INPUT NAME OF FILE CONTAINING EVENTS'
! C      WRITE(*,*) '(FOR "file.unw" ENTER "file")'
! C      READ(*,*) FILENAME
        CALL STRCATH(FILENAME,'.unw',TMPSTR)
        call GETUNIT(NUNIT)
        OPEN(UNIT=NUNIT,FILE=TMPSTR,STATUS='OLD')
***************
*** 466,493 ****
  C     INPUT JET MATCHING CRITERIA
  C
        IF(ICKKW.EQ.1) THEN
!         WRITE(*,*) ' '
!         WRITE(*,*) 'INPUT 0 FOR INCLUSIVE JET SAMPLE, 1 FOR EXCLUSIVE'
!         WRITE(*,*) '(SELECT 0 FOR HIGHEST PARTON MULTIPLICITY SAMPLE)' 
!         WRITE(*,*) '(SELECT 1 OTHERWISE)'
!         READ(*,*) IEXC
!         WRITE(*,*) ' '
!         IF(NLJETS.GT.0) THEN
!           WRITE(*,*) 'INPUT ET(CLUS), R(CLUS), ETACLMAX'
            ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN)
            RCLUS=DRJMIN
            WRITE(*,*) '(SUGGESTED VALUES:',ETCLUS,RCLUS,ETAJMAX,')'
!           READ(*,*) ETCLUS,RCLUS,ETACLMAX
!         ELSEIF(NLJETS.EQ.0) THEN
            WRITE(*,*) 'INPUT ET(CLUS), R(CLUS), ETACLMAX'
            WRITE(*,*) '(MUST MATCH VALUES USED IN PROCESSING',
       +         ' OF NJET>0 EVENTS; THESE DEFAULT TO:'
            WRITE(*,*)
       +         'ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN) RCLUS=DRJMIN, ',
       +         ' ETACLMAX=ETAJMAX)'
!           READ(*,*) ETCLUS,RCLUS,ETACLMAX
          ENDIF
          WRITE(*,*) ' '
          WRITE(*,*) 'JET PARAMETERS FOR MATCHING:'
          WRITE(*,*) 'ET>',ETCLUS,' ETACLUS<',ETACLMAX,' R=',RCLUS
          WRITE(*,*) 'DR(PARTON-JET)<',1.5*RCLUS
--- 470,522 ----
  C     INPUT JET MATCHING CRITERIA
  C
        IF(ICKKW.EQ.1) THEN
!          WRITE(*,*) ' '
!          WRITE(*,*) 'NJETS = ',NLJETS
!          
! C     WRITE(*,*) 'INPUT 0 FOR INCLUSIVE JET SAMPLE, 1 FOR EXCLUSIVE'
! C     WRITE(*,*) '(SELECT 0 FOR HIGHEST PARTON MULTIPLICITY SAMPLE)' 
! C     WRITE(*,*) '(SELECT 1 OTHERWISE)'
! C     READ(*,*) IEXC
!          IF(NLJETS.LT.3) THEN
!             IEXC=1
!             WRITE(*,*) 'IEXC = ',IEXC,' = EXCLUSIVE'
!          ELSE
!             IEXC=0
!             WRITE(*,*) 'IEXC = ',IEXC,' = INCLUSIVE'
!          ENDIF
!          WRITE(*,*) ' '
!          IF(NLJETS.GT.0) THEN
!             WRITE(*,*) 'INPUT ET(CLUS), R(CLUS), ETACLMAX'
            ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN)
            RCLUS=DRJMIN
            WRITE(*,*) '(SUGGESTED VALUES:',ETCLUS,RCLUS,ETAJMAX,')'
! C          READ(*,*) ETCLUS,RCLUS,ETACLMAX
!           ETACLMAX=ETAJMAX
!           WRITE(*,*) 'Setting to recommended values:' 
!           WRITE(*,*) 'ETCLUS = ', ETCLUS
!           WRITE(*,*) 'RCLUS = ', RCLUS
!           WRITE(*,*) 'ETACLMAX = ', ETACLMAX
! 
!        ELSEIF(NLJETS.EQ.0) THEN
            WRITE(*,*) 'INPUT ET(CLUS), R(CLUS), ETACLMAX'
            WRITE(*,*) '(MUST MATCH VALUES USED IN PROCESSING',
       +         ' OF NJET>0 EVENTS; THESE DEFAULT TO:'
            WRITE(*,*)
       +         'ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN) RCLUS=DRJMIN, ',
       +         ' ETACLMAX=ETAJMAX)'
! C          READ(*,*) ETCLUS,RCLUS,ETACLMAX
!           ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN)
!           RCLUS=DRJMIN
!           ETACLMAX=ETAJMAX
!           WRITE(*,*) 'Setting to recommended values:' 
!           WRITE(*,*) 'ETCLUS = ', ETCLUS
!           WRITE(*,*) 'RCLUS = ', RCLUS
!           WRITE(*,*) 'ETACLMAX = ', ETACLMAX
          ENDIF
          WRITE(*,*) ' '
+         ETCLUS=MAX(PTJMIN+5,1.2*PTJMIN)
+         RCLUS=DRJMIN
+         ETACLMAX=ETAJMAX
          WRITE(*,*) 'JET PARAMETERS FOR MATCHING:'
          WRITE(*,*) 'ET>',ETCLUS,' ETACLUS<',ETACLMAX,' R=',RCLUS
          WRITE(*,*) 'DR(PARTON-JET)<',1.5*RCLUS
***************
*** 1188,1194 ****
  C          BINS
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=10000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
--- 1217,1223 ----
  C          BINS
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=4000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
***************
*** 1346,1352 ****
        COMMON/SHVETO/IEND,INORAD(MAXNUP)
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=10000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
--- 1375,1381 ----
        COMMON/SHVETO/IEND,INORAD(MAXNUP)
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=4000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
***************
*** 1404,1410 ****
        COMMON/SHVETO/IEND,INORAD(MAXNUP)
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=10000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
--- 1433,1439 ----
        COMMON/SHVETO/IEND,INORAD(MAXNUP)
  C...HEPEVT commonblock.
        INTEGER NMXHEP,NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP
!       PARAMETER (NMXHEP=4000)
        COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
       &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
        DOUBLE PRECISION PHEP,VHEP
