Ignore:
Timestamp:
Nov 16, 2007, 11:59:21 AM (17 years ago)
Author:
garnier
Message:

r659@mac-90108: laurentgarnier | 2007-11-16 12:02:01 +0100
mise a jour de Geant4 au head ET qq mise a jour pour Qt de mon cote

Location:
trunk/geant4/N03/include
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/N03/include/ExN03DetectorConstruction.hh

    r483 r609  
    2626//
    2727// $Id: ExN03DetectorConstruction.hh,v 1.7 2006/06/29 17:48:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03DetectorMessenger.hh

    r483 r609  
    2626//
    2727// $Id: ExN03DetectorMessenger.hh,v 1.7 2006/06/29 17:48:34 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//

  • trunk/geant4/N03/include/ExN03EventAction.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03EventAction.hh,v 1.11 2006/10/26 14:30:05 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01-ref $
     27// $Id: ExN03EventAction.hh,v 1.12 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4646class ExN03EventAction : public G4UserEventAction
    4747{
    48  public:
    49    ExN03EventAction(ExN03RunAction*);
    50   ~ExN03EventAction();
     48public:
     49  ExN03EventAction(ExN03RunAction*);
     50  virtual ~ExN03EventAction();
    5151
    52  public:
    53    void  BeginOfEventAction(const G4Event*);
    54    void    EndOfEventAction(const G4Event*);
     52  void  BeginOfEventAction(const G4Event*);
     53  void    EndOfEventAction(const G4Event*);
    5554   
    56    void AddAbs(G4double de, G4double dl) {EnergyAbs += de; TrackLAbs += dl;};
    57    void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;};
     55  void AddAbs(G4double de, G4double dl) {EnergyAbs += de; TrackLAbs += dl;};
     56  void AddGap(G4double de, G4double dl) {EnergyGap += de; TrackLGap += dl;};
    5857                     
    59    void SetPrintModulo(G4int    val)  {printModulo = val;};
     58  void SetPrintModulo(G4int    val)  {printModulo = val;};
    6059   
    61  private:
     60private:
    6261   ExN03RunAction*  runAct;
    6362   

  • trunk/geant4/N03/include/ExN03EventActionMessenger.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03EventActionMessenger.hh,v 1.9 2006/10/26 14:28:00 allison Exp $
    28 // GEANT4 tag $Name: geant4-08-02-patch-01-ref $
     27// $Id: ExN03EventActionMessenger.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4747class ExN03EventActionMessenger: public G4UImessenger
    4848{
    49   public:
    50     ExN03EventActionMessenger(ExN03EventAction*);
    51   ~ExN03EventActionMessenger();
     49public:
     50  ExN03EventActionMessenger(ExN03EventAction*);
     51  virtual ~ExN03EventActionMessenger();
    5252   
    53     void SetNewValue(G4UIcommand*, G4String);
     53  void SetNewValue(G4UIcommand*, G4String);
    5454   
    55   private:
    56     ExN03EventAction*     eventAction;
    57     G4UIdirectory*        eventDir;   
    58     G4UIcmdWithAnInteger* PrintCmd;   
     55private:
     56  ExN03EventAction*     eventAction;
     57  G4UIdirectory*        eventDir;   
     58  G4UIcmdWithAnInteger* PrintCmd;   
    5959};
    6060

  • trunk/geant4/N03/include/ExN03PhysicsList.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03PhysicsList.hh,v 1.12 2006/06/29 17:48:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: ExN03PhysicsList.hh,v 1.13 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4343class ExN03PhysicsList: public G4VUserPhysicsList
    4444{
    45   public:
    46     ExN03PhysicsList();
    47   ~ExN03PhysicsList();
     45public:
     46  ExN03PhysicsList();
     47  virtual ~ExN03PhysicsList();
    4848
    49   protected:
    50     // Construct particle and physics
    51     void ConstructParticle();
    52     void ConstructProcess();
     49  // Construct particle and physics
     50  void ConstructParticle();
     51  void ConstructProcess();
    5352 
    54     void SetCuts();
     53  void SetCuts();
     54   
     55private:
     56  // these methods Construct particles
     57  void ConstructBosons();
     58  void ConstructLeptons();
     59  void ConstructMesons();
     60  void ConstructBaryons();
    5561
    56    
    57   protected:
    58     // these methods Construct particles
    59     void ConstructBosons();
    60     void ConstructLeptons();
    61     void ConstructMesons();
    62     void ConstructBaryons();
    63 
    64   protected:
    65     // these methods Construct physics processes and register them
    66     void ConstructGeneral();
    67     void ConstructEM();
     62  // these methods Construct physics processes and register them
     63  void ConstructDecay();
     64  void ConstructEM();
    6865};
    6966

  • trunk/geant4/N03/include/ExN03PrimaryGeneratorAction.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03PrimaryGeneratorAction.hh,v 1.7 2006/06/29 17:48:42 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: ExN03PrimaryGeneratorAction.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4848class ExN03PrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
    4949{
    50   public:
    51     ExN03PrimaryGeneratorAction(ExN03DetectorConstruction*);   
    52   ~ExN03PrimaryGeneratorAction();
     50public:
     51  ExN03PrimaryGeneratorAction(ExN03DetectorConstruction*);   
     52  virtual ~ExN03PrimaryGeneratorAction();
    5353
    54   public:
    55     void GeneratePrimaries(G4Event*);
    56     void SetRndmFlag(G4String val) { rndmFlag = val;}
     54  void GeneratePrimaries(G4Event*);
     55  void SetRndmFlag(G4String val) { rndmFlag = val;}
    5756
    58   private:
    59     G4ParticleGun*                particleGun;    //pointer a to G4  class
    60     ExN03DetectorConstruction*    ExN03Detector;  //pointer to the geometry
     57private:
     58  G4ParticleGun*                particleGun;      //pointer a to G4  class
     59  ExN03DetectorConstruction*    ExN03Detector;    //pointer to the geometry
    6160   
    62     ExN03PrimaryGeneratorMessenger* gunMessenger; //messenger of this class
    63     G4String                      rndmFlag;       //flag for a rndm impact point
     61  ExN03PrimaryGeneratorMessenger* gunMessenger;  //messenger of this class
     62  G4String                      rndmFlag;         //flag for a rndm impact point
    6463};
    6564

  • trunk/geant4/N03/include/ExN03PrimaryGeneratorMessenger.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.7 2006/06/29 17:48:44 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: ExN03PrimaryGeneratorMessenger.hh,v 1.8 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4747class ExN03PrimaryGeneratorMessenger: public G4UImessenger
    4848{
    49   public:
    50     ExN03PrimaryGeneratorMessenger(ExN03PrimaryGeneratorAction*);
    51   ~ExN03PrimaryGeneratorMessenger();
     49public:
     50  ExN03PrimaryGeneratorMessenger(ExN03PrimaryGeneratorAction*);
     51  virtual ~ExN03PrimaryGeneratorMessenger();
    5252   
    53     void SetNewValue(G4UIcommand*, G4String);
     53  void SetNewValue(G4UIcommand*, G4String);
    5454   
    55   private:
    56     ExN03PrimaryGeneratorAction* ExN03Action;
    57     G4UIdirectory*               gunDir;
    58     G4UIcmdWithAString*          RndmCmd;
     55private:
     56  ExN03PrimaryGeneratorAction* ExN03Action;
     57  G4UIdirectory*               gunDir;
     58  G4UIcmdWithAString*          RndmCmd;
    5959};
    6060

  • trunk/geant4/N03/include/ExN03RunAction.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03RunAction.hh,v 1.10 2006/06/29 17:48:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: ExN03RunAction.hh,v 1.11 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4545class ExN03RunAction : public G4UserRunAction
    4646{
    47   public:
    48     ExN03RunAction();
    49   ~ExN03RunAction();
     47public:
     48  ExN03RunAction();
     49  virtual ~ExN03RunAction();
    5050
    51   public:
    52     void BeginOfRunAction(const G4Run*);
    53     void   EndOfRunAction(const G4Run*);
     51  void BeginOfRunAction(const G4Run*);
     52  void   EndOfRunAction(const G4Run*);
    5453   
    55     void fillPerEvent(G4double, G4double, G4double, G4double);
     54  void fillPerEvent(G4double, G4double, G4double, G4double);
    5655
    57   private:
    58     G4double sumEAbs, sum2EAbs;
    59     G4double sumEGap, sum2EGap;
     56private:
     57  G4double sumEAbs, sum2EAbs;
     58  G4double sumEGap, sum2EGap;
    6059   
    61     G4double sumLAbs, sum2LAbs;
    62     G4double sumLGap, sum2LGap;   
     60  G4double sumLAbs, sum2LAbs;
     61  G4double sumLGap, sum2LGap;   
    6362};
    6463

  • trunk/geant4/N03/include/ExN03SteppingAction.hh

    r483 r609  
    2525//
    2626//
    27 // $Id: ExN03SteppingAction.hh,v 1.9 2006/06/29 17:48:49 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     27// $Id: ExN03SteppingAction.hh,v 1.10 2007/07/02 13:22:08 vnivanch Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030//
    … …  
    4545class ExN03SteppingAction : public G4UserSteppingAction
    4646{
    47   public:
    48     ExN03SteppingAction(ExN03DetectorConstruction*, ExN03EventAction*);
    49   ~ExN03SteppingAction();
     47public:
     48  ExN03SteppingAction(ExN03DetectorConstruction*, ExN03EventAction*);
     49  virtual ~ExN03SteppingAction();
    5050
    51     void UserSteppingAction(const G4Step*);
     51  void UserSteppingAction(const G4Step*);
    5252   
    53   private:
    54     ExN03DetectorConstruction* detector;
    55     ExN03EventAction*          eventaction; 
     53private:
     54  ExN03DetectorConstruction* detector;
     55  ExN03EventAction*          eventaction; 
    5656};
    5757

  • trunk/geant4/N03/include/ExN03SteppingVerbose.hh

    r483 r609  
    2626//
    2727// $Id: ExN03SteppingVerbose.hh,v 1.9 2006/06/29 17:48:52 gunter Exp $
    28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
     28// GEANT4 tag $Name: $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.