Bug fixed: pointer was not properly deleted

[u/mrichter/AliRoot.git] / MUON / AliMUONSt1Segmentation.cxx

diff --git a/MUON/AliMUONSt1Segmentation.cxx b/MUON/AliMUONSt1Segmentation.cxx
index 9a0481d4367326fbe533d4cc80acaceef04fdcff..f975bd38dbc43bd2c4b815ff28791a15b2f30b89 100644 (file)
--- a/MUON/AliMUONSt1Segmentation.cxx
+++ b/MUON/AliMUONSt1Segmentation.cxx
@@ -21,22 +21,23 @@
 // ------------------------------
 // Segmentation for MUON station 1 using the external 
 // mapping package
+// Included in AliRoot 2003/01/28
 
-#include <Riostream.h>
 #include <TError.h>
+#include <TF1.h>
 #include <TObjArray.h>
 #include <TVector2.h>
-#include <TF1.h>
 
-#include <AliMpPlane.h>
-#include <AliMpPlaneType.h>
-#include <AliMpPlaneSegmentation.h>
-#include <AliMpPlaneAreaPadIterator.h>
+#include "AliMpPad.h"
+#include "AliMpPlane.h"
+#include "AliMpPlaneAreaPadIterator.h"
+#include "AliMpPlaneSegmentation.h"
 
 #include "AliMUONSt1Segmentation.h"
 #include "AliRun.h"
 #include "AliMUON.h"
 #include "AliMUONChamber.h"
+#include "AliLog.h"
 
 ClassImp(AliMUONSt1Segmentation)
 
@@ -108,11 +109,11 @@ AliMUONSt1Segmentation::AliMUONSt1Segmentation()
 }
 
 //______________________________________________________________________________
-AliMUONSt1Segmentation::AliMUONSt1Segmentation(const AliMUONSt1Segmentation& rhs) :AliSegmentation(rhs)
+AliMUONSt1Segmentation::AliMUONSt1Segmentation(const AliMUONSt1Segmentation& rhs) 
+  : AliSegmentation(rhs)
 {
 // Copy constructor
-  Fatal("Copy constructor", 
-        "Copy constructor is not implemented.");
+  AliFatal("Copy constructor is not implemented.");
 }
 
 //______________________________________________________________________________
@@ -137,8 +138,7 @@ AliMUONSt1Segmentation::operator=(const AliMUONSt1Segmentation& rhs)
   // check assignement to self
   if (this == &rhs) return *this;
 
-  Fatal("operator=", 
-        "Assignment operator is not implemented.");
+  AliFatal("Assignment operator is not implemented.");
     
   return *this;  
 }
@@ -170,7 +170,7 @@ void AliMUONSt1Segmentation::SetPadSize(Float_t /*p1*/, Float_t /*p2*/)
 // Set pad size Dx*Dy 
 // ---
 
-  Fatal("SetPadSize", "Not uniform pad size.");
+  AliFatal("Not uniform pad size.");
 }
 
 //______________________________________________________________________________
@@ -270,7 +270,7 @@ Float_t AliMUONSt1Segmentation::Dpx() const
 // Get pad size in x
 // ---
 
-  Fatal("Dpx", "Not uniform pad size.");
+  AliFatal( "Not uniform pad size.");
   return 0.;
 }
 
@@ -280,7 +280,7 @@ Float_t AliMUONSt1Segmentation::Dpy() const
 // Get pad size in y
 // ---
 
-  Fatal("Dpy", "Not uniform pad size.");
+  AliFatal("Not uniform pad size.");
   return 0.;
 }
  
@@ -408,7 +408,7 @@ Float_t AliMUONSt1Segmentation::Distance2AndOffset(Int_t iX, Int_t iY,
   AliMpPad pad = fPlaneSegmentation->PadByIndices(AliMpIntPair(iX, iY));
   
   if (!pad.IsValid())
-    Fatal("Distance2AndOffset", "Cannot locate pad.");
+    AliFatal("Cannot locate pad.");
 
   return (pad.Position()*fgkLengthUnit - TVector2(x, y)).Mod2();
 }
@@ -421,7 +421,7 @@ void AliMUONSt1Segmentation::GetNParallelAndOffset(Int_t /*iX*/, Int_t /*iY*/,
 // (specific to LYON, but mandatory for display)
 // ---
 
-  Fatal("GetNParallelAndOffset", "Not yet implemented.");
+  AliFatal( "Not yet implemented.");
 }
 
 
@@ -580,7 +580,7 @@ void AliMUONSt1Segmentation::Draw(const char * /*opt*/) const
 // (Called from AliMUON::BuildGeometry)
 // ---
 
-  Warning("Draw", "Not yet implemented.");
+  AliWarning("Not yet implemented.");
 }
 
 //______________________________________________________________________________