Changeset 1230 for trunk/examples/extended/eventgenerator/exgps/src

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/extended/eventgenerator/exgps/src

Files:

• exGPSAnalysisManager.cc (modified) (6 diffs)
• exGPSAnalysisMessenger.cc (modified) (1 diff)
• exGPSEventAction.cc (modified) (4 diffs)
• exGPSEventActionMessenger.cc (modified) (1 diff)
• exGPSRunAction.cc (modified) (4 diffs)

trunk/examples/extended/eventgenerator/exgps/src/exGPSAnalysisManager.cc

@@ -37 +37 @@
 
 exGPSAnalysisManager::exGPSAnalysisManager(): 
-fileName("exgps.aida"),fileType("xml"),analysisFactory(0), hFactory(0), tFactory(0),
-minpos(-10.),maxpos(10),mineng(0.),maxeng(1000.)
+fileName("exgps.aida"),fileType("xml"),analysisFactory(0), tree(0),plotter(0),
+minpos(-10.),maxpos(10),mineng(0.),maxeng(1000.),
+enerHisto(0),posiXY(0),posiXZ(0),posiYZ(0),anglCTP(0),anglTP(0),tuple(0)
 {
   // Define the messenger and the analysis system
@@ -55 +56 @@
 
 
-IHistogramFactory* exGPSAnalysisManager::getHistogramFactory()
-{
-  return hFactory;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-
-ITupleFactory* exGPSAnalysisManager::getTupleFactory()
-{
-  return tFactory;
-}
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-IPlotter* exGPSAnalysisManager::createPlotter()
-{
-#ifdef JAIDA_HOME 
-  if (analysisFactory)
-  {
-    IPlotterFactory* pf = analysisFactory->createPlotterFactory(0,0);
-    if (pf) return pf->create("Plotter");
-  }
-#endif
-  return 0;
-}
-
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -108 +83 @@
                                 G4double t, G4double p, G4double w)
 {
-  enerHisto->fill(e/MeV,w);
-  posiXY->fill(x/cm,y/cm,w);
-  posiXZ->fill(x/cm,z/cm,w);
-  posiYZ->fill(y/cm,z/cm,w);
-  anglCTP->fill(p/deg,std::cos(t),w);
-  anglTP->fill(p/deg,t/deg,w);
+  if(enerHisto) {
+    enerHisto->fill(e/MeV,w);
+    posiXY->fill(x/cm,y/cm,w);
+    posiXZ->fill(x/cm,z/cm,w);
+    posiYZ->fill(y/cm,z/cm,w);
+    anglCTP->fill(p/deg,std::cos(t),w);
+    anglTP->fill(p/deg,t/deg,w);
+  }
 
   if (plotter) plotter->refresh();
@@ -141 +118 @@
 void exGPSAnalysisManager::BeginOfRun() 
 { 
+  tree = 0;
+  plotter = 0;
+
+  enerHisto =0;
+  posiXY = posiXZ = posiYZ = anglCTP =anglTP = 0;
+  tuple = 0;
 
   // Hooking an AIDA compliant analysis system.
   analysisFactory = AIDA_createAnalysisFactory();
-  if(analysisFactory){
-    ITreeFactory* treeFactory = analysisFactory->createTreeFactory();
+  if(!analysisFactory) //Have to check that, it can fail.
+  {
+    G4cout << "exGPSAnalysisManager::BeginOfRun: can't get AIDA." << G4endl; 
+    return;
+  }
+  AIDA::ITreeFactory* treeFactory = analysisFactory->createTreeFactory();
+  if(treeFactory) 
+  {
     tree = treeFactory->create(fileName,fileType,false,true,"compress=yes");
-    hFactory = analysisFactory->createHistogramFactory(*tree);
-    tFactory = analysisFactory->createTupleFactory(*tree);
+    if(!tree) //Have to check that, it can fail.
+    {
+      G4cout << "exGPSAnalysisManager::BeginOfRun:"
+             << " can't create the AIDA::ITree : " << fileName << G4endl; 
+      return;
+    }
+
     delete treeFactory; // Will not delete the ITree.
   }
-  //
-  enerHisto =0;
-  posiXY = posiXZ = posiYZ = anglCTP =anglTP = 0;
-  plotter = 0;
-  tuple = 0;
-  //
+
+  AIDA::IHistogramFactory* hFactory = analysisFactory->createHistogramFactory(*tree);
   if (hFactory)
   {
@@ -173 +163 @@
     anglTP = hFactory->createHistogram2D("Source phi-theta distribution",360,0,360
                                                   ,180,0,180);
-#ifdef JAIDA_HOME
-    plotter = createPlotter();
-
+    delete hFactory;
+  }
+
+  // Create a Tuple
+
+  AIDA::ITupleFactory* tFactory = analysisFactory->createTupleFactory(*tree);
+  if (tFactory)
+  {
+     tuple = tFactory->create("MyTuple","MyTuple","string Pname, double Energy, X, Y, Z, Theta, Phi, Weight","");
+     delete tFactory;
+  }
+  
+  AIDA::IPlotterFactory* pf = analysisFactory->createPlotterFactory(0,0);
+  if(pf) 
+  {
+    plotter = pf->create();
     if (plotter)
     {
        plotter->createRegions(2,3);
-       plotter->region(0)->plot(*enerHisto);
-       plotter->region(1)->plot(*posiXY);
-       plotter->region(2)->plot(*posiXZ);
-       plotter->region(3)->plot(*posiYZ);
-       plotter->region(4)->plot(*anglCTP);
-       plotter->region(5)->plot(*anglTP);
+       if(enerHisto) plotter->region(0)->plot(*enerHisto);
+       if(posiXY) plotter->region(1)->plot(*posiXY);
+       if(posiXZ) plotter->region(2)->plot(*posiXZ);
+       if(posiYZ) plotter->region(3)->plot(*posiYZ);
+       if(anglCTP) plotter->region(4)->plot(*anglCTP);
+       if(anglTP) plotter->region(5)->plot(*anglTP);
        plotter->show();
-     }
-#endif
-  }
-
-  // Create a Tuple
-
-  if (tFactory)
-  {
-     tuple = tFactory->create("MyTuple","MyTuple","std::string Pname, std::double Energy, X, Y, Z, Theta, Phi, Weight","");
-  }
-
+    }
+    delete pf;
+  }
 }
 
@@ -210 +205 @@
     if (!tree->commit()) G4cout << "Commit failed: no AIDA file produced!" << G4endl;
     delete tree;
-    delete tFactory;
-    delete hFactory;
+    tree = 0;
     //    G4cout << "Warning: Geant4 will NOT continue unless you close the JAS-AIDA window." << G4endl;
-    delete analysisFactory;
-  }
-  //  dispose();
+
+    delete plotter;
+    plotter = 0;
+
+    delete analysisFactory; //cleanup all AIDA related things.
+    analysisFactory = 0;
+
+    enerHisto = 0;
+    posiXY = posiXZ = posiYZ = anglCTP =anglTP = 0;
+    tuple = 0;
+
+  }
 }
 

trunk/examples/extended/eventgenerator/exgps/src/exGPSAnalysisMessenger.cc

@@ -25 +25 @@
 //
 #ifdef G4ANALYSIS_USE
-
-#include <AIDA/AIDA.h>
 
 #include "exGPSAnalysisMessenger.hh"

trunk/examples/extended/eventgenerator/exgps/src/exGPSEventAction.cc

@@ -28 +28 @@
 
 #ifdef G4ANALYSIS_USE
-#include <AIDA/AIDA.h>
 #include "exGPSAnalysisManager.hh"
 #endif
@@ -89 +88 @@
       E=std::sqrt(P*P+E0*E0);   
       E -= E0;
-      G4String pname = evt->GetPrimaryVertex(j)->GetPrimary(i)->GetG4code()->GetParticleName();
+//      G4String pname = evt->GetPrimaryVertex(j)->GetPrimary(i)->GetG4code()->GetParticleName();
+      G4double pid = G4double(evt->GetPrimaryVertex(j)->GetPrimary(i)->GetPDGcode());
       //
       direction=direction*(1./direction.mag());                
@@ -101 +101 @@
       z=position.z();
       w = evt->GetPrimaryVertex(j)->GetPrimary(i)->GetWeight();
-      exGPSAnalysisManager::getInstance()->Fill(pname,E,x,y,z,Theta,Phi,w);
+//      exGPSAnalysisManager::getInstance()->Fill(pname,E,x,y,z,Theta,Phi,w);
+     exGPSAnalysisManager::getInstance()->Fill(pid,E,x,y,z,Theta,Phi,w);
     }
   }   
 #endif
-  
+
+#ifdef G4VIS_USE
   // extract the trajectories and draw them
   if (G4VVisManager::GetConcreteInstance())
@@ -122 +124 @@
        }
    }             
+#endif
 }
 

trunk/examples/extended/eventgenerator/exgps/src/exGPSEventActionMessenger.cc

@@ -32 +32 @@
 //
 // $Id: exGPSEventActionMessenger.cc,v 1.3 2006/06/29 17:14:43 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

trunk/examples/extended/eventgenerator/exgps/src/exGPSRunAction.cc

@@ -33 +33 @@
 
 #ifdef G4ANALYSIS_USE
-#include <AIDA/AIDA.h>
 #include "exGPSAnalysisManager.hh"
 #endif
@@ -55 +54 @@
   G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
 
+#ifdef G4VIS_USE
   if (G4VVisManager::GetConcreteInstance())
     {
@@ -60 +60 @@
       UI->ApplyCommand("/vis/scene/notifyHandlers");
     } 
+#endif
 #ifdef G4ANALYSIS_USE
   // If analysis is used reset the histograms
@@ -70 +71 @@
 void exGPSRunAction::EndOfRunAction(const G4Run* )
 {
+#ifdef G4VIS_USE
   if (G4VVisManager::GetConcreteInstance()) {
      G4UImanager::GetUIpointer()->ApplyCommand("/vis/viewer/update");
   }
+#endif
   // If analysis is used
 #ifdef G4ANALYSIS_USE