Import Geant4 6.0.0 source tree

examples/advanced/Rich/include/RichTbAnalysisManager.hh

@@ -132,20 +132,17 @@ public:
   AIDA::ITree* tree;
   AIDA::IHistogramFactory* histogramFactory;  
 
-#endif
-
   AIDA::IHistogram1D* getfhistoNPhotG() {return fhistoNrPhotG;}  
   AIDA::IHistogram1D* getfhistoNBeforeMirror() {return fhistoNBeforeMirror;}  
   AIDA::IHistogram1D* getfhistoWBeforeMirror() {return fhistoWBeforeMirror;}  
   AIDA::IHistogram1D* getfhistoWAfterMirror() {return fhistoWAfterMirror;}
- 
-   
-   
- 
+
   AIDA::IHistogram1D* getfhistoCkvProdSmall() {return fhistoCkvProdSmall;}  
   AIDA::IHistogram1D* getfhistoEmisZ() {return fhistoEmisZ;}  
  
   AIDA::IHistogram1D* getfhistoCkvRadius() {return fhistoCkvRadius; }
+
+#endif
  
  public:
 
@@ -185,15 +182,6 @@ public:
   G4double NumHXCoord;
   G4double NumHYCoord;
 
-
-
 };
 
-
 #endif
-
-
-
-
-
-

examples/advanced/Rich/include/RichTbGeometryParameters.hh

@@ -330,9 +330,9 @@ static const   G4double HpdPhCathodePosZ= HpdQuartzWPosZ;
 static const G4int NumberOfPadHpdSiPixels=128;
 static const G4int MaxNumberOfPixRow=24;
 static const G4int MaxNumberOfPixCol=10;
-static G4double PixRowNumSect[NumberOfPadHpdSiPixels];
-static G4double PixColNumSect[NumberOfPadHpdSiPixels];
-static G4bool PixelAtSectEdge[NumberOfPadHpdSiPixels];
+extern G4double PixRowNumSect[NumberOfPadHpdSiPixels];
+extern G4double PixColNumSect[NumberOfPadHpdSiPixels];
+extern G4bool PixelAtSectEdge[NumberOfPadHpdSiPixels];
 // the following is for the rows after the central big pixel.
 // the central pixel is at row 0. 
 // the others start from row number start at 1.

examples/advanced/Rich/include/RichTbRODummySD.hh

@@ -37,9 +37,9 @@ public:
   RichTbRODummySD();
   ~RichTbRODummySD() {};
 
-  void Initialize(G4HCofThisEvent*HCE) {};
-  G4bool ProcessHits(G4Step*aStep,G4TouchableHistory*ROhist) {return false;}
-  void EndOfEvent(G4HCofThisEvent*HCE) {};
+  void Initialize(G4HCofThisEvent*) {};
+  G4bool ProcessHits(G4Step*,G4TouchableHistory*) {return false;}
+  void EndOfEvent(G4HCofThisEvent*) {};
   void clear() {};
   void DrawAll() {};
   void PrintAll() {};

examples/advanced/Rich/include/RichTbTrackingAction.hh

@@ -35,8 +35,8 @@ class RichTbTrackingAction : public G4UserTrackingAction {
  public:
     RichTbTrackingAction();
   virtual ~RichTbTrackingAction();
-  void PreUserTrackingAction(const G4Track* aTrack){;}
-  void PostUserTrackingAction(const G4Track* aTrack){;}
+  void PreUserTrackingAction(const G4Track*){;}
+  void PostUserTrackingAction(const G4Track*){;}
 
 
 private: