Import Geant4 10.5.0 source tree

examples/advanced/composite_calorimeter/include/CCalActionInitializer.hh

@@ -23,8 +23,6 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-// $Id: CCalActionInitializer.hh 66241 2012-12-13 18:34:42Z gunter $
-// GEANT4 tag $Name:  $
 //
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

examples/advanced/composite_calorimeter/include/CCalEventAction.hh

@@ -46,7 +46,7 @@ class CCalEventAction: public G4UserEventAction{
 public:
   CCalEventAction(CCalPrimaryGeneratorAction*,CCalSteppingAction*);
   ~CCalEventAction();
-  virtual void StartOfEventAction(const G4Event* evt);    
+  virtual void BeginOfEventAction(const G4Event* evt);    
   virtual void EndOfEventAction(const G4Event* evt);    
 
 private:

examples/advanced/composite_calorimeter/include/CCalRunAction.hh

@@ -33,13 +33,13 @@
 #include "G4UserRunAction.hh"
 
 class G4Run;
+
 class CCalRunAction: public G4UserRunAction{
 
 public:
   CCalRunAction(){};
   virtual ~CCalRunAction(){};
       
-public:
   virtual void BeginOfRunAction(const G4Run* aRun);    
   virtual void EndOfRunAction(const G4Run* aRun);    
 

examples/advanced/composite_calorimeter/include/CCalStackingAction.hh

@@ -41,33 +41,31 @@ class CCalStackingAction : public G4UserStackingAction {
 
   friend class CCalSensAssign;
   
-private:
-  CCalStackingAction();
 public:
+
+  CCalStackingAction();
   ~CCalStackingAction();
 
-public:
   virtual G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track* aTrack);
   virtual void NewStage();
   virtual void PrepareNewEvent();
       
-public:
   enum stageLevel {firstStage, end} ; 
   enum {maxNumberOfSD = 30};
 
-private:
-  stageLevel stage;
-  int numberOfSD;
-  G4String SDName[maxNumberOfSD];
-  int nurgent;
-  int acceptSecondaries;
-  CCaloSD* theCaloSD[maxNumberOfSD];
-  G4bool isInitialized;
 private:
   void initialize();    
   G4bool trackStartsInCalo(const G4Track* atrack);
   void setPrimaryID(G4int id);
       
+  G4double fTimeLimit;
+  stageLevel stage;
+  G4int numberOfSD;
+  G4String SDName[maxNumberOfSD];
+  G4int nurgent;
+  G4int acceptSecondaries;
+  CCaloSD* theCaloSD[maxNumberOfSD];
+  G4bool isInitialized;
 };
 
 #endif

examples/advanced/composite_calorimeter/include/CCalSteppingAction.hh

@@ -34,23 +34,22 @@
 #include "globals.hh"
 
 class G4Step;
-class CCalRunAction;
+
 class CCalSteppingAction : public G4UserSteppingAction 
 {
   
 public:
   CCalSteppingAction();
-  ~CCalSteppingAction();
+  virtual ~CCalSteppingAction();
       
-public:
   virtual void UserSteppingAction(const G4Step* aStep);    
   void endOfEvent();
 
 private:
-  const CCalRunAction* runAct;
-  float          LateralProfile[70];	
-  float          timeDeposit[200];
-  int            timeHistoMaxBin;	    
+
+  G4float        LateralProfile[70];	
+  G4float        timeDeposit[200];
+  G4int          timeHistoMaxBin;	    
       
 };
 

examples/advanced/composite_calorimeter/include/CCaloSD.hh

@@ -71,16 +71,22 @@ public:
 
 public:
   
-  void SetPrimaryID(int i) {PrimaryID = i;
-#ifdef debug
-  G4cout << "CCaloSD SetPrimaryID primID =" << i << G4endl;
-#endif
-  }
+  void SetPrimaryID(int i) {PrimaryID = i;}
   int  GetPrimaryID( )     {return PrimaryID;}
   void SetOrganization(CCalVOrganization* org);
 
 private:
-  
+
+  G4ThreeVector SetToLocal(const G4ThreeVector& globalPoint) const;
+  void getStepInfo(const G4Step* aStep);
+  G4bool hitExists();
+  void createNewHit();
+  void updateHit();
+  void StoreHit(CCalG4Hit* ahit);
+  void ResetForNewPrimary();
+  void summarize();
+  G4double curve_LY(const G4StepPoint* stepPoint);
+        
   // Data relative to primary particle (the one which triggers a shower)
   // These data are common to all Hits of a given shower.
   // One shower is made of several hits which differ by the
@@ -90,39 +96,24 @@ private:
   float IncidentEnergy;
   G4int PrimID  ; //@@ ID of the primary particle.
 
-
-private:
   G4int                HCID;
   G4String             SDname;
   CCalG4HitCollection* theHC; 
 
   G4int              TSID; 
   CCalG4Hit*         CurrentHit;
-  G4Track*           theTrack;
+  const G4Track*     theTrack;
   G4VPhysicalVolume* CurrentPV;
   G4VPhysicalVolume* PreviousPV;
   unsigned int       UnitID, PreviousUnitID;
   G4int              PrimaryID, TSliceID;  
   G4double           TSlice;
 
-  G4StepPoint*   PreStepPoint  ; 
-  G4StepPoint*   PostStepPoint ; 
-  float          EdepositEM, EdepositEHAD     ;
-  G4ThreeVector  HitPoint      ;	 
- 
-private:
+  const G4StepPoint*   PreStepPoint; 
+  const G4StepPoint*   PostStepPoint; 
+  float          EdepositEM, EdepositEHAD;
+  G4ThreeVector  HitPoint;
 
-  G4ThreeVector SetToLocal(G4ThreeVector globalPoint);
-  void getStepInfo(G4Step* aStep);
-  G4bool hitExists();
-  void createNewHit();
-  void updateHit();
-  void StoreHit(CCalG4Hit* ahit);
-  void ResetForNewPrimary();
-  void summarize();
-  G4double curve_LY(G4StepPoint* stepPoint);
-      
-private:
   CCalVOrganization* theDescription;
 
 };