Import Geant4 7.1.0 source tree

examples/advanced/Rich/include/RichTbEventAction.hh

@@ -34,7 +34,7 @@
 #include "RichTbAnalysisManager.hh"
 
 class G4Event;
-class RichTbVisManager;
+class G4VVisManager;
 class RichTbAnalysisManager;
 class RichTbIOData;
 
@@ -44,7 +44,7 @@ class RichTbEventAction : public G4UserEventAction {
   RichTbEventAction();
 
   RichTbEventAction(RichTbRunConfig* ,
-		    RichTbVisManager* , RichTbIOData* );
+		    G4VVisManager* , RichTbIOData* );
   virtual ~RichTbEventAction();
 public:
     void BeginOfEventAction(const G4Event* );
@@ -52,13 +52,13 @@ public:
     G4int GetRichCollID() {return RichTbCollID;};
   RichTbAnalysisManager* getAnalysisM()
   {return ranalysisManager; }
-  RichTbVisManager* getVisM()
+  G4VVisManager* getVisM()
   {return pVisManager; }
  private:
   RichTbRunConfig* runConfiguration;
   G4int RichTbCollID;
   RichTbAnalysisManager* ranalysisManager;
-  RichTbVisManager* pVisManager;
+  G4VVisManager* pVisManager;
   RichTbIOData* rTbIOData;
 
 };

examples/advanced/Rich/include/RichTbGeometryParameters.hh

@@ -31,7 +31,7 @@
 
 #include "globals.hh"
 #include "AerogelTypeSpec.hh"
-#include <math.h>
+#include <cmath>
 extern void InitializeRichTbGeometry();
 extern G4double GetCurAerogelLength(G4int);
 //

examples/advanced/Rich/include/RichTbHit.hh

@@ -34,7 +34,7 @@
 #include "G4ThreeVector.hh"
 #include "G4Transform3D.hh"
 
-class RichTbVisManager;
+class G4VVisManager;
 class RichTbHit : public G4VHit
 {
   public:
@@ -50,7 +50,7 @@ class RichTbHit : public G4VHit
       inline void operator delete(void *aHit);
 
   void Draw();
-  void DrawWithVisM(RichTbVisManager*);
+  void DrawWithVisM(G4VVisManager*);
   void Print();
 
   private:

examples/advanced/Rich/include/RichTbRunConfig.hh

@@ -35,7 +35,7 @@
 #include "FilterTypeSpec.hh"
 #include "AerogelRefData.hh"
 #include "FilterTrData.hh"
-#include <math.h>
+#include <cmath>
 #include <fstream>
 class RichTbRunConfig{
  public:

examples/advanced/Rich/include/RichTbVisManager.hh

@@ -1,53 +0,0 @@
-//
-// ********************************************************************
-// * DISCLAIMER                                                       *
-// *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
-// *                                                                  *
-// * 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.                                                             *
-// *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
-// ********************************************************************
-//
-// Rich advanced example for Geant4
-// RichTbVisManager.hh for Rich of LHCb
-// History:
-// Created: Sajan Easo (Sajan.Easo@cern.ch)
-// Revision and changes: Patricia Mendez (Patricia.Mendez@cern.ch)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef RichTbVisManager_h
-#define RichTbVisManager_h 1
-
-#ifdef G4VIS_USE
-
-#include "G4VisManager.hh"
-
-//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
-class RichTbVisManager: public G4VisManager {
-
-public:
-
-  RichTbVisManager ();
-  virtual ~RichTbVisManager();
-private:
-
-  void RegisterGraphicsSystems ();
-
-};
-
-#endif
-
-#endif