From 8109731a7c5f0a6eac55f1389379f3c04f0c42ae Mon Sep 17 00:00:00 2001
From: cussonno <cussonno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 25 Feb 2005 05:31:09 +0000
Subject: [PATCH] Added deleting of AliMUONFactory in AliMUON (Ivana)

---
 MUON/AliMUON.cxx   |  8 ++++++--
 MUON/AliMUON.h     |  2 ++
 MUON/AliMUONv1.cxx | 13 ++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 7a886291406..963b209f0c6 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -67,6 +67,7 @@
 #include "AliMUONDigitizerv2.h"
 #include "AliMUONSDigitizerv1.h"
 #include "AliMUONRawData.h"
+#include "AliMUONFactory.h"
 #include "AliLog.h"
 
 // Defaults parameters for Z positions of chambers
@@ -106,7 +107,8 @@ AliMUON::AliMUON()
     fMaxDestepAlu(0.),
     fMaxIterPad(0),
     fCurIterPad(0),
-    fMerger(0)
+    fMerger(0),
+    fFactory(0)
 {
 // Default Constructor
 //
@@ -134,7 +136,8 @@ AliMUON::AliMUON(const char *name, const char *title)
     fMaxDestepAlu(-1), // in the calculation of the tracking parameters
     fMaxIterPad(0),
     fCurIterPad(0),
-    fMerger(0)
+    fMerger(0),
+    fFactory(0)
 {
 
   fIshunt =  0;
@@ -225,6 +228,7 @@ AliMUON::~AliMUON()
   delete fMUONData;
   delete fGeometryBuilder;
   delete fDEIndexing;
+  delete fFactory; 
 }
 
 //________________________________________________________________________
diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index c3ba1547b72..2e005f965d2 100644
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -35,6 +35,7 @@ class AliMUONMerger;
 class AliMUONGeometryBuilder;
 class AliMUONVGeometryBuilder;
 class AliMUONGeometryDEIndexing;
+class AliMUONFactory;
 class AliESD;
 
 class AliMUON : public  AliDetector 
@@ -159,6 +160,7 @@ class AliMUON : public  AliDetector
     Int_t fCurIterPad;        // Current pad index
     // Background eent for event mixing
     AliMUONMerger *fMerger;   // ! pointer to merger
+    AliMUONFactory* fFactory; // ! MUON factory
     
     ClassDef(AliMUON,8)  // MUON Detector base class
 };
diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 2d87e0ac81f..b7de46f23ea 100644
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -127,7 +127,7 @@ AliMUONv1::~AliMUONv1()
   delete [] fDestepSum;
   delete fElossRatio;
   delete fAngleEffect10;
-  delete fAngleEffectNorma;  
+  delete fAngleEffectNorma; 
 }
 
 //_____________________________________________________________________________
@@ -176,19 +176,17 @@ void AliMUONv1::Init()
    fGeometryBuilder->InitGeometry();
    AliDebug(1,"Finished Init for version 1 - CPC chamber type");   
 
-   AliMUONFactory* factory = 0x0;
-
    if (fSegmentationType == 1) {
-     factory = new AliMUONFactory();
+     fFactory = new AliMUONFactory("Old MUON Factory");
      printf("\n Old Segmentation \n");
    }
 
    if (fSegmentationType == 2) {
-     factory = new AliMUONFactoryV2();
+     fFactory = new AliMUONFactoryV2("New MUON Factory");
      printf("\n New Segmentation \n");
    } 
 
-   factory->Build(this, "default");
+   fFactory->Build(this, "default");
 
    //
    // Initialize segmentation
@@ -954,7 +952,8 @@ void AliMUONv1::StepManagerOld2()
 //    new hit 
       
       new(lhits[fNhits++]) 
-          AliMUONHit(fIshunt, gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits);
+          AliMUONHit(fIshunt, gAlice->GetMCApp()->GetCurrentTrackNumber(), vol,hits,
+	             true);
       eloss = 0; 
       //
       // Check additional signal generation conditions 
-- 
2.43.0