Import Geant4 8.3.0 source tree

examples/extended/radioactivedecay/exrdm/include/exrdmAnalysisManager.hh

@@ -74,16 +74,12 @@ public: // Without description
   void BeginOfEvent();
   void EndOfEvent();
 
-  //  void AddParticle(G4double particleName, G4double energy, G4double weight, G4double time );
-  // void AddIsotope(G4double particleName, G4double weight, G4double time );
-  void AddParticle(G4String particleName, G4double energy, G4double weight, G4double time );
-  void AddIsotope(G4String particleName, G4double weight, G4double time );
-  void AddEnergy(G4double edep, G4double weight, G4double time);
+  void AddParticle(G4double, G4double, G4double, G4double);
+  void AddIsotope(G4double, G4double, G4double);
+  void AddEnergy(G4double, G4double, G4double);
 
   void SetVerbose(G4int val) {verbose = val;};
   G4int GetVerbose() const {return verbose;};
-  //  void SetHistoNumber(G4int val) {nHisto = val;};
-  // void SetNtuple(G4bool val) {nTuple = val;};
 
   void SetFirstEventToDebug(G4int val) {nEvt1 = val;};
   G4int FirstEventToDebug() const {return nEvt1;};

examples/extended/radioactivedecay/exrdm/include/exrdmHisto.hh

@@ -42,11 +42,20 @@
 
 class exrdmHistoMessenger;
 
+#ifdef G4ANALYSIS_USE_AIDA
 namespace AIDA {
  class ITree;
  class ITuple;
  class IHistogram1D;
 }
+#endif
+
+#ifdef G4ANALYSIS_USE_ROOT
+class TFile;
+class TH1D;
+class TNtuple;
+#endif
+
 
 class exrdmHisto
 {
@@ -80,15 +89,21 @@ public:
   void fillTuple(G4int, const G4String&, G4double);
   // Fill nTuple parameter with a double
 
+  void fillTuple(G4int, G4int, G4double);
+  // Fill nTuple at a given col with a double
   void fillTuple(G4int, const G4String&, G4String);
   // Fill nTuple parameter with a string
 
+  void fillTuple(G4int, const G4String&, G4bool);
+  // Fill nTuple parameter with a bool
+
   void addRow(G4int);
   // Save tuple event 
 
   void setFileName(const G4String&);
 
   void setFileType(const G4String&);
+  const G4String& FileType() const;
 
 private:
 
@@ -100,9 +115,20 @@ private:
   G4int    verbose;
   G4int    defaultAct;
 
+#ifdef G4ANALYSIS_USE_AIDA
   std::vector<AIDA::IHistogram1D*> histo;
   std::vector<AIDA::ITuple*>   ntup;
   AIDA::ITree*    tree;
+#endif
+
+#ifdef G4ANALYSIS_USE_ROOT
+  TFile* hfileROOT; 
+  std::vector<TH1D*> ROOThisto;
+  std::vector<TNtuple*>   ROOTntup;
+  std::vector< std::vector<float> > Rarray;
+  std::vector<G4int> Rcol;
+#endif
+
   exrdmHistoMessenger* messenger;
 
   std::vector<G4int>     active;
@@ -115,7 +141,7 @@ private:
   std::vector<G4String>  tupleName;
   std::vector<G4String>  tupleId;
   std::vector<G4String>  tupleList;
-
+  std::vector<G4String>  tupleListROOT; 
 };
 
 #endif

examples/extended/radioactivedecay/exrdm/include/exrdmPhysListEmStandard.hh

@@ -1,68 +0,0 @@
-//
-// ********************************************************************
-// * License and Disclaimer                                           *
-// *                                                                  *
-// * The  Geant4 software  is  copyright of the Copyright Holders  of *
-// * the Geant4 Collaboration.  It is provided  under  the terms  and *
-// * conditions of the Geant4 Software License,  included in the file *
-// * LICENSE and available at  http://cern.ch/geant4/license .  These *
-// * include a list of copyright holders.                             *
-// *                                                                  *
-// * Neither the authors of this software system, nor their employing *
-// * institutes,nor the agencies providing financial support for this *
-// * work  make  any representation or  warranty, express or implied, *
-// * regarding  this  software system or assume any liability for its *
-// * use.  Please see the license in the file  LICENSE  and URL above *
-// * for the full disclaimer and the limitation of liability.         *
-// *                                                                  *
-// * This  code  implementation is the result of  the  scientific and *
-// * technical work of the GEANT4 collaboration.                      *
-// * By using,  copying,  modifying or  distributing the software (or *
-// * any work based  on the software)  you  agree  to acknowledge its *
-// * use  in  resulting  scientific  publications,  and indicate your *
-// * acceptance of all terms of the Geant4 Software license.          *
-// ********************************************************************
-//
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#ifndef exrdmPhysListEmStandard_h
-#define exrdmPhysListEmStandard_h 1
-
-#include "G4VPhysicsConstructor.hh"
-#include "globals.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-class exrdmPhysListEmStandard : public G4VPhysicsConstructor
-{
-public: 
-  exrdmPhysListEmStandard(const G4String& name = "standard");
-  virtual ~exrdmPhysListEmStandard();
-
-public: 
-  // This method is dummy for physics
-  virtual void ConstructParticle() {};
- 
-  // This method will be invoked in the Construct() method.
-  // each physics process will be instantiated and
-  // registered to the process manager of each particle type 
-  virtual void ConstructProcess();
-
-private:
-  // name of used to differetiate usage with std-hadron phys
-  G4String name;
-
-};
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
-#endif
-
-
-
-
-
-
-
-