Import Geant4 9.0.0 source tree

examples/extended/analysis/A01/History

@@ -1,4 +1,4 @@
-$Id: History,v 1.41 2006/11/14 07:11:18 perl Exp $
+$Id: History,v 1.43 2007/05/17 09:55:13 duns Exp $
 -------------------------------------------------------------------
 
      =========================================================
@@ -10,6 +10,11 @@ $Id: History,v 1.41 2006/11/14 07:11:18 perl Exp $
      ----------------------------------------------------------
 
 ---------------------------------------------------------------------------  
+17 May 2007 - Mark Donszelmann (exampleA01-V08-03-01)
+- Fixed memory leak for plotter
+
+16 May 2007 - Mark Donszelmann
+- Fixed warning message about JAS-JAIDA window on exit.
 
 13 November 2006 - Joseph Perl (exampleA01-V08-01-02)
 - Remove unused attributes from hit classes.

examples/extended/analysis/A01/include/A01AnalysisManager.hh

@@ -70,7 +70,7 @@ public:
 
   IHistogramFactory* getHistogramFactory();
   ITupleFactory* getTupleFactory();
-  IPlotter* createPlotter();
+  IPlotter* getPlotter();
 
 private:
 
@@ -80,6 +80,7 @@ private:
   IAnalysisFactory* analysisFactory;
   IHistogramFactory* hFactory;
   ITupleFactory* tFactory;
+  IPlotter* plotter;
   ITree* tree;
 };
 

examples/extended/analysis/A01/src/A01AnalysisManager.cc

@@ -62,7 +62,7 @@
 A01AnalysisManager* A01AnalysisManager::instance = 0;
 
 A01AnalysisManager::A01AnalysisManager()
-:analysisFactory(0), hFactory(0), tFactory(0)
+:analysisFactory(0), hFactory(0), tFactory(0), plotter(0)
 {
   // Hooking an AIDA compliant analysis system.
   analysisFactory = AIDA_createAnalysisFactory();
@@ -72,6 +72,11 @@ A01AnalysisManager::A01AnalysisManager()
     tree = treeFactory->create("A01.aida","xml",false,true,"compress=yes");
     hFactory = analysisFactory->createHistogramFactory(*tree);
     tFactory = analysisFactory->createTupleFactory(*tree);
+    IPlotterFactory* pf = analysisFactory->createPlotterFactory(0,0);
+    if (pf) {
+      plotter = pf->create("Plotter");
+      delete pf;
+    }
     delete treeFactory; // Will not delete the ITree.
   }
 }
@@ -84,7 +89,8 @@ A01AnalysisManager::~A01AnalysisManager()
     delete tree;
     delete tFactory;
     delete hFactory;
-    G4cout << "Warning: Geant4 will NOT exit unless you close the JAS-AIDA window." << G4endl;
+    delete plotter;
+    G4cout << "Warning: In case of working with JAS-AIDA, Geant4 will NOT exit unless you close the JAS-AIDA window." << G4endl;
     delete analysisFactory;
   }
 }
@@ -96,14 +102,9 @@ ITupleFactory* A01AnalysisManager::getTupleFactory()
 {
   return tFactory;
 }
-IPlotter* A01AnalysisManager::createPlotter()
+IPlotter* A01AnalysisManager::getPlotter()
 {
-  if (analysisFactory)
-  {
-    IPlotterFactory* pf = analysisFactory->createPlotterFactory(0,0);
-    if (pf) return pf->create("Plotter");
-  }
-  return 0;
+  return plotter;
 }
 
 A01AnalysisManager* A01AnalysisManager::getInstance()

examples/extended/analysis/A01/src/A01EventAction.cc

@@ -23,7 +23,7 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: A01EventAction.cc,v 1.9 2006/11/10 21:04:51 duns Exp $
+// $Id: A01EventAction.cc,v 1.10 2007/05/17 09:55:14 duns Exp $
 // --------------------------------------------------------------
 //
 
@@ -90,7 +90,7 @@ A01EventAction::A01EventAction()
     dc2XY = hFactory->createCloud2D("Drift Chamber 2 X vs Y");
     evstof = hFactory->createCloud2D("EDep vs Time-of-flight");
 
-    plotter = analysisManager->createPlotter();
+    plotter = analysisManager->getPlotter();
     if (plotter)
     {
        plotter->createRegions(3,2);

examples/extended/analysis/A01/test.out

@@ -1,6 +1,6 @@
 
 *************************************************************
- Geant4 version $Name: geant4-08-02 $   (25-June-2004)
+ Geant4 version $Name: geant4-09-00 $   (25-June-2004)
                       Copyright : Geant4 Collaboration
                       Reference : NIM A 506 (2003), 250-303
                             WWW : http://cern.ch/geant4