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

update to geant4.9.3

Location:
trunk/examples/advanced/gammaray_telescope
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/advanced/gammaray_telescope/GammaRayTel.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: GammaRayTel.cc,v 1.16 2006/06/29 15:54:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: GammaRayTel.cc,v 1.17 2009/11/18 15:54:55 flongo Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    8787  //runManager->SetUserInitialization(new QGSP_BIC);
    8888
    89  
    9089
    9190  // Set mandatory user action classes

  • trunk/examples/advanced/gammaray_telescope/emlowe.mac

    r807 r1230  
    1 /process/activate   LowEnRayleigh   gamma
    2 /process/activate   LowEnPhotoElec  gamma
    3 /process/activate   LowEnCompton    gamma
    4 /process/activate   LowEnConversion gamma
    5 
    6 /process/inactivate phot            gamma
    7 /process/inactivate compt           gamma
    8 /process/inactivate conv            gamma
    9 
    10 /process/activate   LowEnergyIoni   
    11 /process/activate   LowEnBrem       
    12 
    13 /process/inactivate eIoni           
    14 /process/inactivate eBrem           
    15 
    16 /process/list
     1/physics/addPhysics LowE EM

  • trunk/examples/advanced/gammaray_telescope/emstd.mac

    r807 r1230  
    1 /process/inactivate LowEnRayleigh   gamma
    2 /process/inactivate LowEnPhotoElec  gamma
    3 /process/inactivate LowEnCompton    gamma
    4 /process/inactivate LowEnConversion gamma
     1/physics/addPhysics Standard EM
    52
    6 /process/activate   phot            gamma
    7 /process/activate   compt           gamma
    8 /process/activate   conv            gamma
    9 
    10 /process/inactivate LowEnergyIoni   
    11 /process/inactivate LowEnBrem       
    12 
    13 /process/activate   eIoni           
    14 /process/activate   eBrem           
    15 
    16 /process/list

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysis.hh

    r807 r1230  
    2727//
    2828// $Id: GammaRayTelAnalysis.hh,v 1.18 2006/06/29 15:54:51 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3030// ------------------------------------------------------------
    3131//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelAnalysisMessenger.hh

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

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceHit.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelAnticoincidenceHit.hh,v 1.3 2006/06/29 15:54:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelAnticoincidenceSD.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelAnticoincidenceSD.hh,v 1.5 2006/06/29 15:55:00 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterHit.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelCalorimeterHit.hh,v 1.3 2006/06/29 15:55:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelCalorimeterSD.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelCalorimeterSD.hh,v 1.5 2006/06/29 15:55:06 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorConstruction.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDetectorConstruction.hh,v 1.10 2006/06/29 15:55:09 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDetectorMessenger.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDetectorMessenger.hh,v 1.4 2006/06/29 15:55:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDigi.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDigi.hh,v 1.3 2006/06/29 15:55:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizer.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDigitizer.hh,v 1.4 2006/06/29 15:55:18 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDigitizerMessenger.hh

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

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelDummySD.hh

    r807 r1230  
    2727//
    2828// $Id: GammaRayTelDummySD.hh,v 1.6 2006/06/29 15:55:24 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3030// ------------------------------------------------------------
    3131//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelEventAction.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelEventAction.hh,v 1.10 2006/06/29 15:55:29 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelGeneralPhysics.hh

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

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelHadronPhysics.hh

    r807 r1230  
    2525//
    2626// $Id: GammaRayTelHadronPhysics.hh,v 1.4 2006/06/29 15:55:35 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2828//
    2929// ------------------------------------------------------------

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelIonPhysics.hh

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

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelMuonPhysics.hh

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

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelPhysicsList.hh

    r807 r1230  
    3030#include "globals.hh"
    3131
     32class GammaRayTelPhysicsListMessenger;
     33
    3234class GammaRayTelPhysicsList: public G4VModularPhysicsList
    3335{
    … …  
    3941  // SetCuts()
    4042  virtual void SetCuts();
     43  void SetRegionCut(G4double);
     44  void AddPhysicsList(const G4String& name);
     45  // void ConstructProcess();
    4146
     47 
     48private:
     49
     50  G4String                             emName;
     51  G4VPhysicsConstructor*               emPhysicsList;
     52  GammaRayTelPhysicsListMessenger* pMessenger;
    4253
    4354};

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorAction.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelPrimaryGeneratorAction.hh,v 1.8 2006/06/29 15:55:49 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelPrimaryGeneratorMessenger.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelPrimaryGeneratorMessenger.hh,v 1.5 2006/06/29 15:55:52 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelRunAction.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelRunAction.hh,v 1.6 2006/06/29 15:55:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerHit.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelTrackerHit.hh,v 1.3 2006/06/29 15:55:58 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerROGeometry.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelTrackerROGeometry.hh,v 1.5 2006/06/29 15:56:01 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/include/GammaRayTelTrackerSD.hh

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelTrackerSD.hh,v 1.5 2006/06/29 15:56:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class header file

  • trunk/examples/advanced/gammaray_telescope/macro1.mac

    r807 r1230  
    1414/run/verbose 1
    1515/gun/sourceGen true
     16/control/execute emstd.mac
     17
    1618/run/initialize
    1719
    18 /control/execute emstd.mac
    19 
    20 /gun/particle gamma
    21 /gun/energy 1 GeV
     20/particle/select gamma 
    2221/gun/vertexRadius 25. cm
    2322/gun/sourceType 2

  • trunk/examples/advanced/gammaray_telescope/macro2.mac

    r807 r1230  
    1414/run/verbose 2
    1515/gun/sourceGen true
    16 /run/initialize
     16
    1717
    1818/control/execute emlowe.mac
     19
     20/run/initialize
    1921
    2022/gun/particle mu-

  • trunk/examples/advanced/gammaray_telescope/macro3.mac

    r807 r1230  
    1414/run/verbose 1
    1515/gun/sourceGen true
     16/control/execute emstd.mac
    1617/run/initialize
    17 
    18 /control/execute emstd.mac
    19 
    2018/gun/particle gamma
    2119/gun/energy 1 GeV

  • trunk/examples/advanced/gammaray_telescope/macro4.mac

    r807 r1230  
    22/tracking/storeTrajectory 1
    33/gun/sourceGen false
     4/control/execute emlowe.mac
    45/run/initialize
    56/gps/particle e-

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysis.cc

    r807 r1230  
    2727//
    2828// $Id: GammaRayTelAnalysis.cc,v 1.21 2006/06/29 15:56:07 gunter Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3030// ------------------------------------------------------------
    3131//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnalysisMessenger.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelAnalysisMessenger.cc,v 1.9 2006/06/29 15:56:10 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceHit.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelAnticoincidenceHit.cc,v 1.4 2006/06/29 15:56:12 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelAnticoincidenceSD.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelAnticoincidenceSD.cc,v 1.6 2006/06/29 15:56:15 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterHit.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelCalorimeterHit.cc,v 1.4 2006/06/29 15:56:17 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelCalorimeterSD.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelCalorimeterSD.cc,v 1.7 2006/06/29 15:56:19 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorConstruction.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDetectorConstruction.cc,v 1.15 2006/06/29 15:56:22 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDetectorMessenger.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDetectorMessenger.cc,v 1.8 2006/06/29 15:56:25 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigi.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDigi.cc,v 1.5 2006/06/29 15:56:28 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizer.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDigitizer.cc,v 1.6 2006/06/29 15:56:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelDigitizerMessenger.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelDigitizerMessenger.cc,v 1.5 2006/06/29 15:56:34 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelEventAction.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelEventAction.cc,v 1.19 2006/06/29 15:56:39 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelHadronPhysics.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelHadronPhysics.cc,v 1.4 2006/06/29 15:56:45 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelIonPhysics.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelIonPhysics.cc,v 1.4 2006/06/29 15:56:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelMuonPhysics.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: GammaRayTelMuonPhysics.cc,v 1.4 2006/06/29 15:56:50 gunter Exp $
    28 // GEANT4 tag $Name:  $
    29 //
     27// $Id: GammaRayTelMuonPhysics.cc,v 1.8 2008/11/24 15:10:47 cirrone Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3029//
    3130
    … …  
    3433#include "globals.hh"
    3534#include "G4ios.hh"
     35#include "G4MuonPlus.hh"
     36#include "G4TauPlus.hh"
     37#include "G4TauMinus.hh"
    3638#include <iomanip>   
     39
     40
     41#include "G4ParticleTypes.hh"
    3742
    3843

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPhysicsList.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: GammaRayTelPhysicsList.cc,v 1.7 2006/06/29 15:56:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: GammaRayTelPhysicsList.cc,v 1.8 2009/11/18 15:59:05 flongo Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//
    … …  
    4444#include "G4ios.hh"
    4545#include <iomanip>   
     46
    4647#include "GammaRayTelParticles.hh"
    4748#include "GammaRayTelGeneralPhysics.hh"
    48 #include "GammaRayTelEMPhysics.hh"
     49#include "GammaRayTelEMstdPhysics.hh"
     50#include "GammaRayTelEMlowePhysics.hh"
    4951#include "GammaRayTelMuonPhysics.hh"
    5052#include "GammaRayTelHadronPhysics.hh"
    5153#include "GammaRayTelIonPhysics.hh"
    5254
     55#include "G4PhysListFactory.hh"
     56#include "G4VPhysicsConstructor.hh"
     57#include "G4EmProcessOptions.hh"
     58
     59
     60#include "GammaRayTelPhysicsListMessenger.hh"
     61
    5362GammaRayTelPhysicsList::GammaRayTelPhysicsList():  G4VModularPhysicsList()
    5463{
    … …  
    5766  SetVerboseLevel(1);
    5867
     68  pMessenger = new GammaRayTelPhysicsListMessenger(this);
     69
     70  // Particles
     71
     72 
    5973  RegisterPhysics( new GammaRayTelParticles("particles") );
    6074
     75  G4cout << "PARTICLES DONE" << G4endl;
     76
     77  // EM physics
     78
     79  emPhysicsList = new GammaRayTelEMstdPhysics;
     80  emName = G4String("Standard EM");
     81
     82
    6183  // General Physics
     84
    6285  RegisterPhysics( new GammaRayTelGeneralPhysics("general") );
    6386
    64   // EM Physics
    65   RegisterPhysics( new GammaRayTelEMPhysics("electromagnetic"));
     87  G4cout << "GENERAL DONE" << G4endl;
     88
    6689
    6790  // Muon Physics
     91
    6892  RegisterPhysics(  new GammaRayTelMuonPhysics("muon"));
     93
     94
     95  G4cout << "MUON DONE" << G4endl;
    6996
    7097   // Hadron Physics
    7198  RegisterPhysics(  new GammaRayTelHadronPhysics("hadron"));
    7299
     100  G4cout << "HADRONS DONE" << G4endl;
     101
    73102  // Ion Physics
    74103  RegisterPhysics( new GammaRayTelIonPhysics("ion"));
    75104
    76105
     106  G4cout << "IONS DONE" << G4endl;
     107
    77108}
    78109
    79110GammaRayTelPhysicsList::~GammaRayTelPhysicsList()
    80111{
     112  delete pMessenger;
     113  delete emPhysicsList;
    81114}
    82115
    … …  
    94127  // These values are used as the default production thresholds
    95128  // for the world volume.
     129
     130  G4cout << "CUT STD" << G4endl;
     131
    96132  SetCutsWithDefault();
    97133
    98  
     134
     135}
     136
     137void GammaRayTelPhysicsList::SetRegionCut(G4double cutvalue)
     138{
     139
     140 SetCutsWithDefault();
     141
     142  if (verboseLevel >0){
     143    G4cout << "GammaRayTelPhysicsList::SetCuts: default cut length : "
     144         << G4BestUnit(defaultCutValue,"Length") << G4endl;
     145  }
     146 
     147  G4cout << "CUTS NEW" << G4endl;
     148 
    99149  // Production thresholds for detector regions
    100150
    101151  G4String regName[] = {"Calorimeter","Tracker"};
    102   G4double cutValue[] = {1*mm, 0.1*mm};
     152  //  G4double cutValue[] = {1*mm, 0.1*mm};
     153  G4double cutValue[] = {cutvalue, cutvalue/10.};
     154
     155
    103156 
    104157  for(G4int i=0;i<2;i++)
    … …  
    109162    reg->SetProductionCuts(cuts);
    110163  }
    111 }
    112 
    113 
    114 
    115 
     164
     165}
     166
     167
     168/////////////////////////////////////////////////////////////////////////////
     169
     170void GammaRayTelPhysicsList::AddPhysicsList(const G4String& name)
     171{
     172
     173  if (verboseLevel>1) {
     174    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">" << G4endl;
     175  }
     176
     177  if (name == "Standard EM") {
     178
     179    emName = name;
     180    delete emPhysicsList;
     181    emPhysicsList = new GammaRayTelEMstdPhysics();
     182    G4cout << "THE FOLLOWING ELECTROMAGNETIC PHYSICS LIST HAS BEEN ACTIVATED: EM Standard" << G4endl;
     183   
     184  } else if (name == "LowE EM") {
     185    emName = name;
     186    delete emPhysicsList;
     187    emPhysicsList = new GammaRayTelEMlowePhysics();;
     188     G4cout << "THE FOLLOWING ELECTROMAGNETIC PHYSICS LIST HAS BEEN ACTIVATED: EM LowE" << G4endl;
     189  }
     190  else {
     191    G4cout << "PhysicsList::AddPhysicsList: <" << name << ">"
     192           << " is not defined"
     193           << G4endl;
     194  }
     195
     196
     197  G4cout << "REGISTRATION DONE " << G4endl;
     198
     199    RegisterPhysics(emPhysicsList);
     200
     201}

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorAction.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.10 2006/06/29 15:56:58 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: GammaRayTelPrimaryGeneratorAction.cc,v 1.11 2007/11/09 16:33:34 flongo Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file
    … …  
    6969  G4int n_particle = 1;
    7070
    71   if (sourceGun)
    72     {
    73       particleGun  = new G4ParticleGun(n_particle);     
     71  particleGun  = new G4ParticleGun(n_particle);     
    7472      // default particle kinematic
    75      
    76       G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
    77       G4String particleName;
    78       G4ParticleDefinition* particle
    79         = particleTable->FindParticle(particleName="e-");
    80       particleGun->SetParticleDefinition(particle);
    81       particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,-1.));
    82       particleGun->SetParticleEnergy(30.*MeV);
    83       G4double position = 0.5*(GammaRayTelDetector->GetWorldSizeZ());
    84       particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,position));
    85     }
    86   else
    87     {
    88       particleSource = new G4GeneralParticleSource();
    89     }
    9073 
     74  G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
     75  G4String particleName;
     76  G4ParticleDefinition* particle
     77    = particleTable->FindParticle(particleName="e-");
     78  particleGun->SetParticleDefinition(particle);
     79  particleGun->SetParticleMomentumDirection(G4ThreeVector(0.,0.,-1.));
     80  particleGun->SetParticleEnergy(30.*MeV);
     81  G4double position = 0.5*(GammaRayTelDetector->GetWorldSizeZ());
     82  particleGun->SetParticlePosition(G4ThreeVector(0.*cm,0.*cm,position));
     83  particleSource = new G4GeneralParticleSource();
     84   
    9185}
    9286

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelPrimaryGeneratorMessenger.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelPrimaryGeneratorMessenger.cc,v 1.8 2006/06/29 15:57:01 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelRunAction.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelRunAction.cc,v 1.11 2006/06/29 15:57:04 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerHit.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelTrackerHit.cc,v 1.4 2006/06/29 15:57:07 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// ------------------------------------------------------------
    3030//      GEANT 4 class implementation file

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerROGeometry.cc

    r807 r1230  
    2626//
    2727// $Id: GammaRayTelTrackerROGeometry.cc,v 1.6 2006/06/29 15:57:10 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//

  • trunk/examples/advanced/gammaray_telescope/src/GammaRayTelTrackerSD.cc

    r807 r1230  
    2525//
    2626//
    27 // $Id: GammaRayTelTrackerSD.cc,v 1.9 2006/06/29 15:57:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
    2927// ------------------------------------------------------------
    3028//      GEANT 4 class implementation file
    … …  
    9795G4bool GammaRayTelTrackerSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
    9896{
    99 
     97   
    10098  G4double edep = aStep->GetTotalEnergyDeposit();
    10199  if ((edep/keV == 0.)) return false;     
    … …  
    103101  G4int StripTotal = Detector->GetNbOfTKRStrips();
    104102  G4int TileTotal  = Detector->GetNbOfTKRTiles(); 
    105  
     103
    106104  // This TouchableHistory is used to obtain the physical volume
    107105  // of the hit
    … …  
    123121  G4VPhysicalVolume* strip = 0;
    124122  strip = ROhist->GetVolume();
    125   G4String StripName = strip->GetName();
    126   StripNumber= strip->GetCopyNo(); 
    127 
    128   ROhist->MoveUpHistory();
    129   G4VPhysicalVolume* tile = ROhist->GetVolume();
     123
     124  //  if (strip){
     125    G4String StripName = strip->GetName();
     126    StripNumber= strip->GetCopyNo(); 
     127    //  }
     128  //  ROhist->MoveUpHistory();
     129  G4VPhysicalVolume* tile = ROhist->GetVolume(1);
    130130  G4int TileNumber = tile->GetCopyNo(); 
    131131  G4String TileName = tile->GetName();   
Note: See TracChangeset for help on using the changeset viewer.