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

update to geant4.9.3

Location:
trunk/examples/extended/electromagnetic/TestEm9/include
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/electromagnetic/TestEm9/include/DetectorConstruction.hh

    r807 r1230  
    2525//
    2626//
    27 // $Id: DetectorConstruction.hh,v 1.5 2006/06/29 17:00:56 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: DetectorConstruction.hh,v 1.7 2008/04/07 18:09:05 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    5757class DetectorMessenger;
    5858class G4Region;
     59class G4ProductionCuts;
    5960
    6061//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    6566
    6667  DetectorConstruction();
    67   ~DetectorConstruction();
     68  virtual ~DetectorConstruction();
    6869
    6970public:
    … …  
    7172  void SetEcalMaterial(const G4String&);
    7273  void SetAbsMaterial(const G4String&);
    73   void SetEcalLength (G4double val)   {ecalLength = val;};
    74   void SetEcalWidth  (G4double val)   {ecalWidth = val;};
    75   void SetVertexLength (G4double val) {vertexLength = val;};
    76   void SetPadLength  (G4double val)   {padLength = val;};
    77   void SetPadWidth  (G4double val)    {padWidth = val;};
    78   void SetAbsLength(G4double val)     {absLength = val;};
     74  void SetEcalLength(G4double val);
     75  void SetEcalWidth(G4double val);
     76  void SetVertexLength(G4double val);
     77  void SetPadLength(G4double val);
     78  void SetPadWidth(G4double val);
     79  void SetAbsLength(G4double val);
    7980
    8081  G4VPhysicalVolume* Construct();
    … …  
    8283  void UpdateGeometry();
    8384
    84   G4double GetWorldSizeZ()            {return worldZ;}
     85  G4double GetWorldSizeZ()  {return worldZ;}
    8586
    8687private:
    … …  
    106107  G4Material* yorkMaterial;
    107108
    108   G4LogicalVolume* logicC;
     109  G4LogicalVolume* logicWorld;
     110  G4LogicalVolume* logicECal;
     111  G4LogicalVolume* logicCal;
    109112  G4LogicalVolume* logicA1;
    110113  G4LogicalVolume* logicA2;
    111114  G4LogicalVolume* logicA3;
    112115  G4LogicalVolume* logicA4;
     116  G4LogicalVolume* logicYV;
     117  G4LogicalVolume* logicY;
     118  G4LogicalVolume* logicVV;
     119  G4LogicalVolume* logicVD;
     120  G4LogicalVolume* logicV;
    113121 
    114122  G4Region*   vertexRegion;
    115123  G4Region*   muonRegion;
     124  G4ProductionCuts* vertexDetectorCuts;
     125  G4ProductionCuts* muonDetectorCuts;
    116126
    117127  DetectorMessenger* detectorMessenger;  //pointer to the Messenger

  • trunk/examples/extended/electromagnetic/TestEm9/include/DetectorMessenger.hh

    r807 r1230  
    2626//
    2727// $Id: DetectorMessenger.hh,v 1.4 2006/06/29 17:00:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm9/include/EmAcceptance.hh

    r807 r1230  
    2626//
    2727// $Id: EmAcceptance.hh,v 1.2 2006/06/29 17:01:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm9/include/EventAction.hh

    r807 r1230  
    2828
    2929// $Id: EventAction.hh,v 1.3 2006/06/29 17:01:02 gunter Exp $
    30 // GEANT4 tag $Name: $
     30// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3131
    3232//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....

  • trunk/examples/extended/electromagnetic/TestEm9/include/EventActionMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: EventActionMessenger.hh,v 1.3 2006/06/29 17:01:04 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/Histo.hh

    r807 r1230  
    2525//
    2626// $Id: Histo.hh,v 1.5 2007/05/24 13:17:41 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929#ifndef Histo_h

  • trunk/examples/extended/electromagnetic/TestEm9/include/HistoManager.hh

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: HistoManager.hh,v 1.8 2007/04/24 14:20:04 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: HistoManager.hh,v 1.11 2008/09/24 10:38:46 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828
    2929#ifndef HistoManager_h
    … …  
    110110  void SetThresholdEnergy(G4double val) {thKinE = val;};
    111111  void SetThresholdZ(G4double val) {thPosZ = val;};
    112   void AddStep() {n_step++;};
     112  void AddStep() {n_step += 1.0;};
    113113
    114114  // Acceptance parameters
    … …  
    133133
    134134  G4double trackLength;
     135  G4double n_step;
     136  G4double n_step_target;
    135137  G4bool trackAbs;        // Track is in absorber
    136138  G4int n_evt;
    … …  
    138140  G4int n_posit;
    139141  G4int n_gam;
    140   G4int n_step;
    141142  G4int n_gamph;
    142143  G4int n_gam_tar;
    143   G4int n_step_target;
     144  G4int n_lowe;
    144145  G4int nBinsE, nBinsEA, nBinsED;
    145146  G4bool nTuple;
    … …  
    153154  G4double  rmstrue[3];
    154155  G4double  limittrue[3];
    155   G4double  edep[3];
    156   G4double  erms[3];
    157   G4double  edeptr[3];
    158   G4double  ermstr[3];
    159   G4int     stat[3];
     156  G4double  edep[6];
     157  G4double  erms[6];
     158  G4double  edeptr[6];
     159  G4double  ermstr[6];
     160  G4int     stat[6];
    160161  G4int     nmax;
    161162

  • trunk/examples/extended/electromagnetic/TestEm9/include/HistoMessenger.hh

    r807 r1230  
    2727//
    2828// $Id: HistoMessenger.hh,v 1.3 2006/06/29 17:01:11 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3030//
    3131//

  • trunk/examples/extended/electromagnetic/TestEm9/include/PhysListEmLivermore.hh

    r807 r1230  
    2626//
    2727// $Id: PhysListEmLivermore.hh,v 1.1 2006/11/17 17:45:57 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/PhysListEmPenelope.hh

    r807 r1230  
    2626//
    2727// $Id: PhysListEmPenelope.hh,v 1.1 2006/11/17 17:45:57 vnivanch Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/PhysListEmStandard.hh

    r807 r1230  
    2626//
    2727// $Id: PhysListEmStandard.hh,v 1.3 2006/06/29 17:02:17 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/PhysicsList.hh

    r807 r1230  
    2424// ********************************************************************
    2525//
    26 // $Id: PhysicsList.hh,v 1.5 2006/11/17 17:03:26 vnivanch Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: PhysicsList.hh,v 1.7 2008/04/07 18:09:05 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
    … …  
    6161public:
    6262  PhysicsList();
    63   ~PhysicsList();
     63  virtual ~PhysicsList();
    6464
    6565  void ConstructParticle();
    … …  
    6969  void SetCutForElectron(G4double);
    7070  void SetCutForPositron(G4double);
    71   void SetMscStepLimit(G4bool val);
    7271
    7372  void AddPhysicsList(const G4String& name);
    … …  
    8988  G4double cutForElectron;
    9089  G4double cutForPositron;
     90  G4double cutForVertexDetector;
     91  G4double cutForMuonDetector;
    9192
    9293  G4VPhysicsConstructor*  emPhysicsList;
    … …  
    102103  G4ProductionCuts* muonDetectorCuts;
    103104
    104   G4bool mscStepLimit;
    105105  G4bool helIsRegisted;
    106106  G4bool bicIsRegisted;

  • trunk/examples/extended/electromagnetic/TestEm9/include/PhysicsListMessenger.hh

    r807 r1230  
    2626//
    2727// $Id: PhysicsListMessenger.hh,v 1.4 2006/06/29 17:02:32 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm9/include/PrimaryGeneratorAction.hh

    r807 r1230  
    2626//
    2727// $Id: PrimaryGeneratorAction.hh,v 1.3 2006/06/29 17:02:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/extended/electromagnetic/TestEm9/include/StepMax.hh

    r807 r1230  
    2525//
    2626// $Id: StepMax.hh,v 1.3 2006/06/29 17:02:40 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/StepMaxMessenger.hh

    r807 r1230  
    2525//
    2626// $Id: StepMaxMessenger.hh,v 1.3 2006/06/29 17:02:42 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

  • trunk/examples/extended/electromagnetic/TestEm9/include/SteppingAction.hh

    r807 r1230  
    2626//
    2727// $Id: SteppingAction.hh,v 1.3 2006/06/29 17:02:44 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.