Added the w/o holes switch in AliTOF class: in this way, TOF will be indipendent...

diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx
index 96053d25ce70cd32a58602de0e5d0f854daff3d0..9f9c1d87ebc2f3e8e28e8986e7a0d8be02ab7ec6 100644 (file)
--- a/TOF/AliTOF.cxx
+++ b/TOF/AliTOF.cxx
@@ -12,7 +12,6 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
-
 /* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -85,6 +84,7 @@ AliTOF::AliTOF():
   fReconParticles(0x0),
   fIdSens(-1),
   fTZero(kFALSE),
+  fTOFHoles(kTRUE),
   fTOFGeometry(0x0)
 {
   //
@@ -111,6 +111,7 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option)
   fReconParticles(0x0),
   fIdSens(-1),
   fTZero(kFALSE),
+  fTOFHoles(kTRUE),
   fTOFGeometry(0x0)
 {
   //
@@ -188,7 +189,8 @@ void AliTOF::GetTOFSectors(Int_t *sectors) const
 }
 //_____________________________________________________________________________
 AliTOF::AliTOF(const AliTOF &source)
-  :AliDetector(),
+  :
+  AliDetector(),
   fFGeom(0x0),
   fDTask(0x0),
   fReTask(0x0),
@@ -197,6 +199,7 @@ AliTOF::AliTOF(const AliTOF &source)
   fReconParticles(0x0),
   fIdSens(-1),
   fTZero(kFALSE),
+  fTOFHoles(kTRUE),
   fTOFGeometry(0x0)
 {
   // copy constructor

diff --git a/TOF/AliTOF.h b/TOF/AliTOF.h
index 178a431350d9fac493c6f469aa3a0fc57ed30d6b..c814d4aa0e288ef21ef4236cc1aeb1f21998df6e 100644 (file)
--- a/TOF/AliTOF.h
+++ b/TOF/AliTOF.h
@@ -85,6 +85,8 @@ public:
   void CreateSDigitsArray();
   virtual void   SetTOFSectors(Int_t *sectors);
   virtual void   GetTOFSectors(Int_t *sectors) const;
+  virtual void   SetTOFHoles(Bool_t holes) { fTOFHoles = holes; };
+  virtual Bool_t GetTOFHoles() const { return fTOFHoles; };
   AliTOFGeometry *GetGeometry() const { return fTOFGeometry; }; 
 
   // Trigger
@@ -109,6 +111,7 @@ protected:
 
   Bool_t  fTZero;      // Flag indicating if T0 is used
   Int_t fTOFSectors[18]; // Selecting TOF Sectors to be simulated
+  Bool_t fTOFHoles; // Selecting geometry with and w/o holes
   AliTOFGeometry *fTOFGeometry; //The TOF Geometry parameters
  
 private:

diff --git a/TOF/AliTOFv6T0.cxx b/TOF/AliTOFv6T0.cxx
index b9113d034608670bad7bcd257e9eb9bc960d9d5b..8551f5f406cbcc8470183fd18fc29e4628ed71af 100644 (file)
--- a/TOF/AliTOFv6T0.cxx
+++ b/TOF/AliTOFv6T0.cxx
@@ -157,8 +157,8 @@ const Float_t AliTOFv6T0::fgkBarS2[3] = {fgkBarS[0], fgkBar2[1], fgkBar2[2]}; //
   fIdFTOC(-1),
   fIdFLTA(-1),
   fIdFLTB(-1),
-  fIdFLTC(-1),
-  fTOFHoles(kFALSE)
+  fIdFLTC(-1)//,
+//fTOFHoles(kFALSE)
 {
   //
   // Default constructor
@@ -174,33 +174,40 @@ AliTOFv6T0::AliTOFv6T0(const char *name, const char *title):
   fIdFTOC(-1),
   fIdFLTA(-1),
   fIdFLTB(-1),
-  fIdFLTC(-1),
-  fTOFHoles(kFALSE)
+  fIdFLTC(-1)//,
+  //fTOFHoles(kFALSE)
 {
   //
   // Standard constructor
   //
+
   //
   // Check that FRAME is there otherwise we have no place where to
   // put TOF
 
+  /*
   AliModule* frame = (AliModule*)gAlice->GetModule("FRAME");
+
   if(!frame) {
     AliFatal("TOF needs FRAME to be present");
-  } else{
-    
+  } else {
     if (fTOFGeometry) delete fTOFGeometry;
     fTOFGeometry = new AliTOFGeometry();
 
     if(frame->IsVersion()==1) {
       AliDebug(1,Form("Frame version %d", frame->IsVersion())); 
       AliDebug(1,"Full Coverage for TOF");
-      fTOFHoles=false;}    
+      fTOFHoles=false;}
     else {
       AliDebug(1,Form("Frame version %d", frame->IsVersion())); 
       AliDebug(1,"TOF with Holes for PHOS");
-      fTOFHoles=true;}      
+      fTOFHoles=true;}
+
   }
+  */
+
+  if (fTOFGeometry) delete fTOFGeometry;
+  fTOFGeometry = new AliTOFGeometry();
   fTOFGeometry->SetHoles(fTOFHoles);
 
   //AliTOF::fTOFGeometry = fTOFGeometry;

diff --git a/TOF/AliTOFv6T0.h b/TOF/AliTOFv6T0.h
index b9d6e784be2d298ce98d4b055934e1b843cbd8a7..3c0c32d08093f22419bcac7569b95200746b9a30 100644 (file)
--- a/TOF/AliTOFv6T0.h
+++ b/TOF/AliTOFv6T0.h
@@ -62,7 +62,6 @@ private:
   Int_t fIdFLTA; // FLTA volume identifier (inner plate A)
   Int_t fIdFLTB; // FLTB volume identifier (inner plate B)
   Int_t fIdFLTC; // FLTC volume identifier (inner plate C)
-  Bool_t fTOFHoles; // Selecting Geometry with and w/o holes
 
   //private: