Ignore:
Timestamp:
Jan 8, 2010, 3:02:48 PM (14 years ago)
Author:
garnier
Message:

update to geant4.9.3

Location:
trunk/examples/extended/radioactivedecay/exrdm/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r807 r1230  
    5858
    5959  static exrdmAnalysisManager* getInstance();
     60  static void dispose();
    6061
    6162private:
    6263
    6364  exrdmAnalysisManager();
     65  ~exrdmAnalysisManager();
    6466
    6567public: // Without description
    66 
    67   ~exrdmAnalysisManager();
    6868
    6969  void bookHisto();

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

    r807 r1230  
    3939#include <vector>
    4040
    41 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    42 
    43 class exrdmHistoMessenger;
    44 
    45 #ifdef G4ANALYSIS_USE_AIDA
     41#ifdef G4ANALYSIS_USE
    4642namespace AIDA {
     43 class IAnalysisFactory;
    4744 class ITree;
    4845 class ITuple;
    … …  
    5148#endif
    5249
     50//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
     51
    5352#ifdef G4ANALYSIS_USE_ROOT
     53// Root classes
    5454class TFile;
    5555class TH1D;
    … …  
    5757#endif
    5858
     59class exrdmHistoMessenger;
    5960
    6061class exrdmHisto
    … …  
    9293  void fillTuple(G4int, G4int, G4double);
    9394  // Fill nTuple at a given col with a double
    94   void fillTuple(G4int, const G4String&, G4String);
     95  void fillTuple(G4int, const G4String&, G4String&);
    9596  // Fill nTuple parameter with a string
    9697
    … …  
    115116  G4int    verbose;
    116117  G4int    defaultAct;
    117 
    118 #ifdef G4ANALYSIS_USE_AIDA
     118#ifdef G4ANALYSIS_USE
    119119  std::vector<AIDA::IHistogram1D*> histo;
    120120  std::vector<AIDA::ITuple*>   ntup;
     121  AIDA::IAnalysisFactory* aida;
    121122  AIDA::ITree*    tree;
    122123#endif
Note: See TracChangeset for help on using the changeset viewer.