Minor corrections thanks to I.Hrivnacova

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index 9e4bcf348ceb2311b0648a0cd4714b8d61ddeb42..1511354f555ef10cd55c626c8763e2c023ac3fd8 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  1999/09/29 09:24:23  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ////////////////////////////////////////////////
@@ -34,6 +37,7 @@ $Log$
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <iostream.h>
 
 // --- galice header files ---
 #include "AliPHOS.h"

diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx
index 4da06d09f7ca36035cb20e0d12c4fca38920808d..efddcc0caa7a67f5739e24f7a357ebf935e84384 100644 (file)
--- a/PHOS/AliPHOSv0.cxx
+++ b/PHOS/AliPHOSv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  1999/09/29 09:24:23  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 /////////////////////////////////////////////////////////
@@ -156,7 +159,7 @@ void AliPHOSv0::CreateGeometry()
     gMC->Gspos("PASP", 1, "PAIR", 0., yo, 0., 0, "ONLY");
 
 // --- Divide in X and Z direction (same way as PTCB) --- 
-    gMC->Gsdvn("PCMO", "PCSE", 13, 3);
+    //    gMC->Gsdvn("PCMO", "PCSE", 13, 3);
     gMC->Gsdvn("PCST", "PCMO", 8, 1);
     gMC->Gsdvn("PCCE", "PCST", 8, 3);
 

diff --git a/PHOS/AliPHOSv2.cxx b/PHOS/AliPHOSv2.cxx
index 46ba70b916effddeba8203e9e9d7e1b612a90206..43ebebbdc857e70d7353c99ef66d694344aeacfb 100644 (file)
--- a/PHOS/AliPHOSv2.cxx
+++ b/PHOS/AliPHOSv2.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.8  1999/09/29 09:24:25  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 //-*-C++-*-
@@ -42,7 +45,6 @@ $Log$
 #include "AliPHOSv2.h"
 #include "AliRun.h"
 #include "AliConst.h"
-#include "AliMC.h" 
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -77,7 +79,7 @@ AliPHOSv2::AliPHOSv2()
 ///////////////////////////////////////////////////////////////////////////////
 
 AliPHOSv2::AliPHOSv2(const char *name, const char *title):
-  AliDetector(name,title)
+  AliPHOS(name,title)
 {
   
   //Begin_Html
@@ -475,8 +477,8 @@ void AliPHOSv2::CreateGeometry()
   gMC->Gsvolu("PCBL", "BOX ", IDTMED[798], DPCBL, 3);
   
   // --- Divide PCBL in X (phi) and Z directions --
-  gMC->Gsdvn("PROW", "PCBL", Int_t (GetNphi()), 1);
-  gMC->Gsdvn("PCEL", "PROW", Int_t (GetNz()), 3);
+  gMC->Gsdvn("PROW", "PCBL", GetNphi(), 1);
+  gMC->Gsdvn("PCEL", "PROW", GetNz(), 3);
   YO=-TCB_THICK/2.0;
   gMC->Gspos("PCBL", 1, "PTCB", 0.0, YO, 0.0, 0, "ONLY");
 
@@ -563,8 +565,8 @@ void AliPHOSv2::CreateGeometry()
   DPCPV[2]=DPCBL[2];
   //  gMC->Gsvolu("PCPV", "BOX ", IDTMED[700], DPCPV, 3);
   gMC->Gsvolu("PCPV", "BOX ", IDTMED[798], DPCPV, 3);
-  gMC->Gsdvn("PCRO", "PCPV", Int_t (GetNphi()), 1);
-  gMC->Gsdvn("PCCE", "PCRO", Int_t (GetNz()), 3);
+  gMC->Gsdvn("PCRO", "PCPV", GetNphi(), 1);
+  gMC->Gsdvn("PCCE", "PCRO", GetNz(), 3);
 
   // Define CPV sensitive pad. It has the same size as PCCE.
   DPCPA[0]=DPCBL[0]/GetNphi();

diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h
index d48cad48b1f6d362f218274251899d60dd092815..083d7e3f09919c3a1e74517cdfc5e5ec4a35d49e 100644 (file)
--- a/PHOS/AliPHOSv2.h
+++ b/PHOS/AliPHOSv2.h
@@ -16,10 +16,10 @@
 #include <TRandom.h> 
 
 // --- galice header files ---
-#include "AliDetector.h"
+#include "AliPHOS.h"
 #include "AliHit.h"
 
-class AliPHOSv2 : public AliDetector{
+class AliPHOSv2 : public AliPHOS {
 
 protected:
   Float_t fXtlSize[3]; // PWO crystal dimensions
@@ -31,8 +31,8 @@ protected:
   Float_t fPHOSAir[3]; // Inner air filled volume dimensions
   Float_t fRadius[2]; // Distances from IP to outer cover and to Xtal surface
   Float_t fPHOSextra[10]; // Assorted geometrical parameters
-  Float_t fNphi; // Number of crystal units in X (phi) direction
-  Float_t fNz; // Number of crystal units in Z direction
+  Int_t   fNphi; // Number of crystal units in X (phi) direction
+  Int_t   fNz; // Number of crystal units in Z direction
   Float_t fNModules; // Number of modules constituing PHOS
   Float_t fPHOSAngle[4]; // Position angles of modules
   
@@ -64,8 +64,8 @@ public:
   virtual Float_t GetPHOSAir(Int_t n) const {return fPHOSAir[n];}
   virtual Float_t GetRadius(Int_t n) const {return fRadius[n];}
   virtual Float_t GetPHOSextra(Int_t n) const {return fPHOSextra[n];}
-  virtual Float_t GetNphi(void) const {return fNphi;}
-  virtual Float_t GetNz(void) const {return fNz;}
+  virtual Int_t   GetNphi(void) const {return fNphi;}
+  virtual Int_t   GetNz(void) const {return fNz;}
   virtual Float_t GetNModules(void) const {return fNModules;}
   virtual Float_t &GetModuleAngle(Int_t n) {return fPHOSAngle[n];}