Removal of obsolete PHOS code

diff --git a/ALIROOT/loadmod.F b/ALIROOT/loadmod.F
index 61ea230ed1b07b3343255fd5981af076ca4c6166..543f6415c5e454fdb0a7290578629d5c17116ab6 100644 (file)
--- a/ALIROOT/loadmod.F
+++ b/ALIROOT/loadmod.F
@@ -21,5 +21,4 @@
       call gupara
       call gudtim
       call guplsh
-      call phos_data
       end

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index 1511354f555ef10cd55c626c8763e2c023ac3fd8..8ba14011401b8a13150adc9a29790ea4ba9e19e2 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.9  1999/11/08 07:12:31  fca
+Minor corrections thanks to I.Hrivnacova
+
 Revision 1.8  1999/09/29 09:24:23  fca
 Introduction of the Copyright and cvs Log
 
@@ -888,7 +891,7 @@ Float_t AliPHOSCradle::GetDistortedValue(const TH2F *h, UInt_t n)
   #define common_for_event_storing common_for_event_storing_
 #endif
 
-extern "C" struct
+/* extern "C" */ struct
 {
   enum { crystals_matrix_amount_max=4, crystals_in_matrix_amount_max=40000 };
 
@@ -980,7 +983,7 @@ extern "C" struct
 #define rcgamma rcgamma_
 #endif
 
-extern "C" struct
+/* extern "C" */ struct
 {
   enum {NGP=1000, nsps=10, nvertmax=1000};
   int   recons_gammas_amount, mw[NGP],ID[NGP],JD[NGP];

diff --git a/PHOS/AliPHOScommon.F b/PHOS/AliPHOScommon.F
deleted file mode 100644 (file)
index 8e3e5cf..0000000
--- a/PHOS/AliPHOScommon.F
+++ /dev/null
@@ -1,86 +0,0 @@
-*CMZ :  2.03/01 18/09/98  11.43.30  by  Federico Carminati
-*-- Author :
-      SUBROUTINE PHOS_DATA
-*KEEP,SCXXCOM.
-       parameter (NGp=1000,nsps=10,nvertmax=1000)
-        COMMON /RCGAMMA/KG,MW(ngp),ID(ngp),JD(ngp),E(ngp),E4(ngp),
-     ,  XW(ngp),YW(ngp),ES(nsps,ngp),ET(nsps,ngp),ISsd(ngp),
-     ,  IGDEV(ngp),ZGDEV(ngp),sigexy(3,ngp),Emimx(2,nsps,ngp),
-     ,  kgfix,igfix(ngp),cgfix(3,ngp),sgfix(3,ngp),hiw(ngp),
-     ,  wsw(nsps,ngp),h1w(ngp),h0w(ngp),raxay(5,ngp),
-     ,  sigmaes0(nsps,ngp),dispeces(nsps,ngp),
-     ,  igamvert(ngp)
-
-
-      integer*4 crystals_amount_max,crystals_in_matrix_amount_max,
-     +          crystals_matrix_amount_max
-      parameter (crystals_matrix_amount_max=4)
-      parameter (crystals_in_matrix_amount_max=40000)
-      parameter (crystals_amount_max =crystals_matrix_amount_max*
-     +                                crystals_in_matrix_amount_max)
-
-* All units are in GeV, cm, radian
-      real       crystal_amplitudes_unit, radius_unit,
-     +           crystal_size_unit, crystal_length_unit,
-     +           matrix_coordinate_Z_unit, matrix_coordinate_PHI_unit
-      integer    crystal_amplitudes_in_units_min
-      parameter (crystal_amplitudes_in_units_min        = 1)
-      parameter (crystal_amplitudes_unit                = 0.001 ) ! 1.0  MeV
-      parameter (radius_unit                            = 0.1   ) ! 0.1  cm
-      parameter (crystal_size_unit                      = 0.01  ) ! 0.01 cm
-      parameter (crystal_length_unit                    = 0.01  ) ! 0.01 cm
-      parameter (matrix_coordinate_Z_unit               = 0.1   ) ! 0.1  cm
-      parameter (matrix_coordinate_PHI_unit             = 1e-4  ) ! 1e-4 radian
-
-      integer*2 crystals_matrix_amount_PHOS, crystal_matrix_type,
-     +          amount_of_crystals_on_Z, amount_of_crystals_on_PHI,
-     +          crystals_amount_with_amplitudes, crystals_amplitudes_Iad
-      integer*4 event_number
-
-      real      radius, crystal_size, crystal_length,
-     +          matrix_coordinate_Z, matrix_coordinate_PHI
-
-      real      crystals_amplitudes, crystals_energy_total
-      integer   event_file_unit_number
-
-      common /common_for_event_storing/
-     + ! Event-independent information
-     +        crystals_matrix_amount_PHOS,
-     +        crystal_matrix_type,
-     +        amount_of_crystals_on_Z,
-     +        amount_of_crystals_on_PHI,
-     +        radius,
-     +        crystal_size,
-     +        crystal_length,
-     +        matrix_coordinate_Z     (crystals_matrix_amount_max),
-     +        matrix_coordinate_PHI   (crystals_matrix_amount_max),
-     +
-     + ! Event-dependent information
-     +        event_number,
-     +        crystals_amount_with_amplitudes
-     +                                (crystals_matrix_amount_max),
-     +        crystals_amplitudes_Iad (2,crystals_in_matrix_amount_max,
-     +                                 crystals_matrix_amount_max),
-     +
-     + ! These information don't store in data file
-     +        crystals_amplitudes     (crystals_amount_max),
-     +        crystals_energy_total,
-     +        event_file_unit_number
-
-
-
-        INTEGER MAXCRAD
-        PARAMETER (MAXCRAD=100)
-        INTEGER PHOSsize,PHOS_Ndiv_magic
-        REAL    PHOSflags,PHOScell,PHOSradius,PHOSCPV,
-     +          PHOScradlesA,PHOSTXW,PHOSAIR,PHOSFTI,
-     +          PHOSextra, PHOSangle
-        COMMON /PHOS_PARS/ PHOSflags(9),
-     +                           PHOScell(9),PHOSradius,PHOSCPV(9),
-     +                           PHOSsize(3), PHOScradlesA,
-     +                           PHOSTXW(3),PHOSAIR(3),PHOSFTI(4),
-     +                           PHOSextra(9), PHOSangle(MAXCRAD),
-     +                           PHOS_Ndiv_magic
-
-*KEND.
-      END

diff --git a/PHOS/AliPHOSf.F b/PHOS/AliPHOSf.F
deleted file mode 100644 (file)
index 801909a..0000000
--- a/PHOS/AliPHOSf.F
+++ /dev/null
@@ -1,227 +0,0 @@
-*CMZ :          15/02/99  14.40.30  by  Federico Carminati
-*CMZ :  2.03/01 20/08/98  09.43.00  by  Federico Carminati
-*CMZ :  2.03/00 09/07/98  19.21.29  by  Federico Carminati
-*CMZ :  2.00/05 25/05/98  14.39.01  by  Federico Carminati
-*CMZ :  1.05/06 26/10/95  17.04.53  by  Nick van Eijndhoven (RUU/CERN)
-*CMZ :  1.05/00 11/11/94  15.21.30  by  Nick van Eijndhoven (RUU/CERN)
-*-- Author :    Nick van Eijndhoven (CERN)   24/09/90
-      SUBROUTINE PHOS_INIT
-C
-C *** DEFINITION OF THE GEOMETRY OF THE PHOS ***
-C *** NVE 24-SEP-1990 CERN GENEVA ***
-C
-C CALLED BY : SXGEOM
-C ORIGIN    : NICK VAN EIJNDHOVEN
-C
-*KEEP,GCKINE.
-      COMMON/GCKINE/IKINE,PKINE(10),ITRA,ISTAK,IVERT,IPART,ITRTYP
-     +      ,NAPART(5),AMASS,CHARGE,TLIFE,VERT(3),PVERT(4),IPAOLD
-C
-      INTEGER       IKINE,ITRA,ISTAK,IVERT,IPART,ITRTYP,NAPART,IPAOLD
-      REAL          PKINE,AMASS,CHARGE,TLIFE,VERT,PVERT
-C
-*KEEP,LUDAT1.
-      COMMON/LUDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200)
-      INTEGER MSTU,MSTJ
-      REAL    PARU,PARJ
-      SAVE /LUDAT1/
-*
-*KEEP,SHRUNP.
-      COMMON /SHRUNP/ VMAJ,IMIN,NRUN,NEVTOT
-*KEEP,SHPHYP.
-      COMMON /SHPHYP/ JWEI,NDNDY,YLIM,PTLIM,JWEAK,JPI0,JETA,JPIC,JPRO,
-     +                  JKAC,JKA0,JRHO,JOME,JPHI,JPSI,JDRY
-*KEEP,SCPHOS.
-        INTEGER MAXCRAD
-        PARAMETER (MAXCRAD=100)
-        INTEGER PHOSsize,PHOS_Ndiv_magic
-        REAL    PHOSflags,PHOScell,PHOSradius,PHOSCPV,
-     +          PHOScradlesA,PHOSTXW,PHOSAIR,PHOSFTI,
-     +          PHOSextra, PHOSangle
-        COMMON /PHOS_PARS/ PHOSflags(9),
-     +                           PHOScell(9),PHOSradius,PHOSCPV(9),
-     +                           PHOSsize(3), PHOScradlesA,
-     +                           PHOSTXW(3),PHOSAIR(3),PHOSFTI(4),
-     +                           PHOSextra(9), PHOSangle(MAXCRAD),
-     +                           PHOS_Ndiv_magic
-*KEND.
-C
-      IF (PHOSsize(3).GT.MAXCRAD) THEN
-         STOP 'PHOS_INIT Increase MAXCRAD, too many cradles!'
-      ENDIF
-
-*AZ { SHAKER initialization
-      IF( IKINE.EQ.700 ) THEN
-         JWEI        = 0
-         NDNDY       = NINT(PKINE(4))
-         YLIM        = PKINE(5)
-         PTLIM       = PKINE(6)
-         JWEAK       = 0
-         JPI0        = 1
-         JETA        = 1
-         JPIC        = NINT(PKINE(7))
-         JPRO        = NINT(PKINE(7))
-         JKAC        = NINT(PKINE(7))
-         JKA0        = NINT(PKINE(7))
-         JRHO        = NINT(PKINE(7))
-         JOME        = NINT(PKINE(7))
-         JPHI        = NINT(PKINE(7))
-         JPSI        = NINT(PKINE(7))
-         JDRY        = NINT(PKINE(7))
-         NEVTOT      = 999999999
-
-         MSTU(11)    = 6        ! Shaker output to screen (Fortran channel 6).
-         CALL SHINIT            ! Shaker initialization.
-
-         print *,'************************************************'
-         print *,'Print some SHAKER parameters.'
-         print *,'NDNDY=',NDNDY
-         print *,'YLIM=',YLIM
-         print *,'PTLIM=',PTLIM
-         print *,'JPIC=',JPIC
-         print *,'************************************************'
-*AZ }
-
-      ENDIF
-*
-      END
-*CMZ :          15/02/99  14.40.30  by  Federico Carminati
-*CMZ :  2.03/01 28/07/98  16.12.22  by  Federico Carminati
-*-- Author :    Federico Carminati   17/07/98
-      SUBROUTINE PHOS_KINE(NT)
-*KEEP,GCKINE.
-      COMMON/GCKINE/IKINE,PKINE(10),ITRA,ISTAK,IVERT,IPART,ITRTYP
-     +      ,NAPART(5),AMASS,CHARGE,TLIFE,VERT(3),PVERT(4),IPAOLD
-C
-      INTEGER       IKINE,ITRA,ISTAK,IVERT,IPART,ITRTYP,NAPART,IPAOLD
-      REAL          PKINE,AMASS,CHARGE,TLIFE,VERT,PVERT
-C
-*KEEP,SHGENE.
-      COMMON /SHGENE/ IEVT,NPI0,NETA,NPIC,NPRO,NKAC,NKA0,NRHO,NOME,
-     +                  NPHI,NPSI,NDRY
-*KEEP,BLUJETS.
-      COMMON /LUJETS/ N,K(200000,5),P(200000,5),V(200000,5)
-      SAVE /LUJETS/
-
-*KEEP,SCPHOS.
-        INTEGER MAXCRAD
-        PARAMETER (MAXCRAD=100)
-        INTEGER PHOSsize,PHOS_Ndiv_magic
-        REAL    PHOSflags,PHOScell,PHOSradius,PHOSCPV,
-     +          PHOScradlesA,PHOSTXW,PHOSAIR,PHOSFTI,
-     +          PHOSextra, PHOSangle
-        COMMON /PHOS_PARS/ PHOSflags(9),
-     +                           PHOScell(9),PHOSradius,PHOSCPV(9),
-     +                           PHOSsize(3), PHOScradlesA,
-     +                           PHOSTXW(3),PHOSAIR(3),PHOSFTI(4),
-     +                           PHOSextra(9), PHOSangle(MAXCRAD),
-     +                           PHOS_Ndiv_magic
-*KEND.
-*
-      DIMENSION V_TMP(3),P_TMP(3)
-*
-      IF(IKINE.EQ.700) THEN
-* Shaker genrator          SHOULD BE CHECKED!!!!
-         IEVT = IEVT + 1        ! Increament SHAKER event number.
-         CALL SHEVNT
-
-
-***********************************
-* Begin:   create list of SHAKER particles (if required)
-* ------
-* PHOSflags:    YES: X<>0   NO: X=0
-* PHOSflags(1) : -----X  Create branch for TObjArray of AliPHOSCradle
-*                ----X-  Create file (ftn03 on HP-UX) with list of SHAKER particles (7Mb/event)
-         tmp = PHOSflags(1)/(10**2)
-         i   = tmp
-         i   = (tmp-i)*10
-
-         IF( i.NE.0. ) CALL SHLIST   ! List of SHAKER particles. 7 Mbytes/event
-
-* End of creation
-************************************
-
-         DO I=1,N
-                                !? IF( K_LUJETS(I,5).EQ.0 )      MPRIMA=MPRIMA+1
-            IPART = IPART_FROM_LUJET_TO_GEANT(K(I,2))
-
-            IF( K(I,5).EQ.0 ) THEN
-              IFLAG_DONE = 1
-            ELSE
-              IFLAG_DONE = 0
-            ENDIF
-            DO JJ=1,3
-               V_TMP(JJ)=V(I,JJ)
-               P_TMP(JJ)=P(I,JJ)
-            ENDDO
-            CALL RXSTRAK(IFLAG_DONE,K(I,3),IPART,P_TMP
-     $           ,V_TMP,V(I,4),'Primary',NT)
-            IF( I.NE.NT ) THEN
-               STOP 'GUKINE: Bad thing...'
-            ENDIF
-
-            CALL RXKEEP(I)
-         ENDDO
-
-      ENDIF
-      GOTO 999
-*
-  999 END
-      INTEGER FUNCTION IPART_FROM_LUJET_TO_GEANT(N)
-        ! Return GEANT particle number from LUJET particle number.
-        ! This code is from file shake005.f :  SUBROUTINE SHTOGL
-
-        IMPLICIT NONE
-        INTEGER N
-
-       IF      (N.EQ.0) THEN
-          IPART_FROM_LUJET_TO_GEANT = 0
-       ELSE IF (N.EQ.22) THEN
-         IPART_FROM_LUJET_TO_GEANT = 1         ! gamma
-       ELSE IF (N.EQ.-11) THEN
-         IPART_FROM_LUJET_TO_GEANT = 2
-       ELSE IF (N.EQ.11) THEN
-         IPART_FROM_LUJET_TO_GEANT = 3
-       ELSE IF (ABS(N).EQ.12) THEN
-          IPART_FROM_LUJET_TO_GEANT = 4
-       ELSE IF (ABS(N).EQ.14) THEN
-         IPART_FROM_LUJET_TO_GEANT = 4
-       ELSE IF (ABS(N).EQ.16) THEN
-         IPART_FROM_LUJET_TO_GEANT = 4
-       ELSE IF (N.EQ.-13) THEN
-         IPART_FROM_LUJET_TO_GEANT = 5
-       ELSE IF (N.EQ.13) THEN
-         IPART_FROM_LUJET_TO_GEANT = 6
-       ELSE IF (N.EQ.111) THEN
-         IPART_FROM_LUJET_TO_GEANT = 7
-       ELSE IF (N.EQ.211) THEN
-         IPART_FROM_LUJET_TO_GEANT = 8
-       ELSE IF (N.EQ.-211) THEN
-         IPART_FROM_LUJET_TO_GEANT = 9
-       ELSE IF (N.EQ.130) THEN
-         IPART_FROM_LUJET_TO_GEANT = 10
-       ELSE IF (N.EQ.321) THEN
-         IPART_FROM_LUJET_TO_GEANT = 11
-       ELSE IF (N.EQ.-321) THEN
-         IPART_FROM_LUJET_TO_GEANT = 12
-       ELSE IF (N.EQ.2112) THEN
-         IPART_FROM_LUJET_TO_GEANT = 13
-       ELSE IF (N.EQ.2212) THEN
-         IPART_FROM_LUJET_TO_GEANT = 14
-       ELSE IF (N.EQ.-2212) THEN
-         IPART_FROM_LUJET_TO_GEANT = 15
-       ELSE IF (N.EQ.310) THEN
-         IPART_FROM_LUJET_TO_GEANT = 16
-       ELSE IF (N.EQ.221) THEN
-         IPART_FROM_LUJET_TO_GEANT = 17        ! eta
-       ELSE IF (N.EQ.311) THEN                 ! This is (K0) and we set it to
-         IPART_FROM_LUJET_TO_GEANT = 10        ! GEANT K0 short
-       ELSE IF (N.EQ.-311) THEN                ! This is (K~0) and we set it to
-         IPART_FROM_LUJET_TO_GEANT = 10        ! GEANT K0 short
-       ELSE
-          WRITE(*,*) 'Unknown LUJET particle ', N
-          stop
-       ENDIF
-      END
-
-********************************************************************************

diff --git a/PHOS/Makefile b/PHOS/Makefile
index 089ff322b2e1b4be6bcef04e8a85485695e81db7..5c2dc8111ebc002a5f515bcf3a1a8c426e67fc5e 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -23,16 +23,10 @@ DICTO         = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(DICT))
 
 # FORTRAN sources
 
-FSRCS = AliPHOSf.F AliPHOScommon.F
-
-# FORTRAN Objectrs
-
-FOBJS         = $(patsubst %.F,tgt_$(ALICE_TARGET)/%.o,$(FSRCS))
+# FORTRAN Objects
 
 # C Objects
 
-COBJS         = $(patsubst %.c,tgt_$(ALICE_TARGET)/%.o,$(CSRCS))
-
 # C++ Objects
 
 OBJS          = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(SRCS)) $(DICTO)
@@ -43,44 +37,23 @@ CXXFLAGS      = $(CXXOPTS) -I$(ROOTSYS)/include -I. -I$(ALICE_ROOT)/include/
  
 # FORTRAN compilation flags
 
-FFLAGS      = $(FOPT)
-
-##### Other Libraries #####
-
-SHSRCS  = $(wildcard shaker/*.f)
-SHOBJS  = $(patsubst %.f,tgt_$(ALICE_TARGET)/%.o,$(SHSRCS))
-
-RCSRCS  = $(wildcard reconstruction/*.f)  
-RCOBJS  = $(patsubst %.f,tgt_$(ALICE_TARGET)/%.o,$(RCSRCS))
+ALSRCS  = $(SRCS)
 
-DUSRCS = libPHOSdummy.cxx
-DUOBJS = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(DUSRCS))
-
-ALSRCS  = $(SRCS) $(SHSRCS) $(RCSRCS) $(DUSRCS) dummies.c
-
-ALOBJS  = $(SHOBJS) $(RCOBJS) $(DUOBJS)
+ALOBJS  = $(OBJS)
 
 ##### COMMANDS ##### 
 
-SLIBRARY       = $(LIBDIR)/libPHOSdummy.$(SL) $(LIBDIR)/libPHOSshaker.$(SL) \
-                  $(LIBDIR)/libPHOSreconstruction.$(SL) $(LIBDIR)/libPHOS.$(SL)
+SLIBRARY       = $(LIBDIR)/libPHOS.$(SL)
 
 default:       $(SLIBRARY)
 
-$(LIBDIR)/libPHOSdummy.$(SL):          $(DUOBJS)
-
-$(LIBDIR)/libPHOSshaker.$(SL):         $(SHOBJS)
-
-$(LIBDIR)/libPHOSreconstruction.$(SL): $(RCOBJS)
-
 $(LIBDIR)/libPHOS.$(SL):                       $(OBJS) $(FOBJS)
 
 $(DICT):                                       $(HDRS)
 
-depend:                                $(SRCS) $(DUSRCS) $(SHSRCS) $(RCSRCS)
+depend:                                $(SRCS) 
 
-TOCLEAN                =       $(DUOBJS) $(SHOBJS) $(RCOBJS) $(OBJS) $(FOBJS) \
-                        *Cint.cxx *Cint.h
+TOCLEAN                =       $(OBJS) *Cint.cxx *Cint.h
 
 ############################### General Macros ################################
 

diff --git a/PHOS/dummies.c b/PHOS/dummies.c
deleted file mode 100644 (file)
index 268f472..0000000
--- a/PHOS/dummies.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifdef linux
-void MAIN__() {}
-#endif

diff --git a/PHOS/libPHOSdummy.cxx b/PHOS/libPHOSdummy.cxx
deleted file mode 100644 (file)
index a9d8e0e..0000000
--- a/PHOS/libPHOSdummy.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/*
-$Log$
-*/
-
-#include <stdio.h>
-/*
-
-    dummy entry points for phos
-
-    */
-
-#ifdef WIN32
-#define shlist SHLIST
-#define shinit SHINIT
-#define shevnt SHEVNT
-#define reconsfirst RECONSFIRST
-#define type_of_call  _stdcall
-#else
-#define shlist shlist_
-#define shinit shinit_
-#define shevnt shevnt_
-#define reconsfirst reconsfirst_
-#define type_of_call
-#endif
-
-#define DUMMY(name) \
-extern "C" type_of_call void name() {\
-     printf("Dummy version of \"" #name "\" reached \n"); \
-     }
-
-DUMMY(shlist)
-DUMMY(shinit)
-DUMMY(shevnt)
-DUMMY(reconsfirst)
-
-