Implementing of new function to check for holes (M.Ivanov)

diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h
index b08ca1f786f0c421f9e780c72cfe8b7dce49c4bd..8293645c14988be7f7b2ae05e749fc68ce08e6a7 100644 (file)
--- a/TRD/AliTRDgeometry.h
+++ b/TRD/AliTRDgeometry.h
@@ -69,7 +69,7 @@ class AliTRDgeometry : public AliGeometry {
 
   virtual Bool_t   GetPHOShole() const = 0;
   virtual Bool_t   GetRICHhole() const = 0;
-
+  virtual Bool_t   IsHole(Int_t /*iplan*/, Int_t /*icham*/, Int_t /*isect*/) const {return kFALSE;}
   virtual Int_t    GetDetectorSec(const Int_t p, const Int_t c) const;
   virtual Int_t    GetDetector(const Int_t p, const Int_t c, const Int_t s) const;
   virtual Int_t    GetPlane(const Int_t d)   const;

diff --git a/TRD/AliTRDgeometryHole.cxx b/TRD/AliTRDgeometryHole.cxx
index 5440a5bcf4ca947e7b362f9e2da6918724f043a6..06a792206c9a95a087be36e79c6323e41b5dea53 100644 (file)
--- a/TRD/AliTRDgeometryHole.cxx
+++ b/TRD/AliTRDgeometryHole.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.11  2003/09/18 09:06:07  cblume
+Geometry update, Removal of compiler warnings
+
 Revision 1.9  2002/11/21 22:38:47  alibrary
 Removing AliMC and AliMCProcess
 
@@ -88,6 +91,19 @@ AliTRDgeometryHole::~AliTRDgeometryHole()
 
 }
 
+Bool_t   AliTRDgeometryHole::IsHole(Int_t iplan, Int_t icham, Int_t isec) const
+{
+  // Position of Holes for PHOS (P) and RICH (R) starting at 6h
+  //                 P  P  P  -  -  R  R  R  -  -  -  -  -  -  -  -  P  P
+  //Int_t cham[18] = {1, 1, 1, 0, 0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1};
+  Int_t cham[18] = {2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0 };  // did we want this?
+
+  if ((cham[17-isec]==1) && (fClengthPH[iplan][icham]<0.00001)) return kTRUE;
+  if ((cham[17-isec]==2) &&(fClengthRH[iplan][icham]<0.000001))  return kTRUE;
+  return kFALSE;
+  
+}
+
 //_____________________________________________________________________________
 void AliTRDgeometryHole::Init()
 {

diff --git a/TRD/AliTRDgeometryHole.h b/TRD/AliTRDgeometryHole.h
index 1cf4b96dbdef982f7c69dfc6df29f353a599cdcb..78d3c28782b371bd72c8407e17fae160c0d0016d 100644 (file)
--- a/TRD/AliTRDgeometryHole.h
+++ b/TRD/AliTRDgeometryHole.h
@@ -26,7 +26,7 @@ class AliTRDgeometryHole : public AliTRDgeometry {
 
           void    SetPHOShole()       { };
           void    SetRICHhole()       { };
-
+         Bool_t   IsHole(Int_t iplan, Int_t icham, Int_t /*isec*/) const;
   virtual void    SetOldGeometry();
 
           Bool_t  GetPHOShole() const { return kTRUE; };