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

update to geant4.9.3

Location:
trunk/examples/extended/optical/LXe
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/examples/extended/optical/LXe/LXe.cc

    r807 r1230  
    2727#include "G4UImanager.hh"
    2828#include "G4String.hh"
    29 #include "G4UItcsh.hh"
    30 #include "G4UIterminal.hh"
    3129
    3230#include "LXeDetectorConstruction.hh"
    … …  
    4442#ifdef G4VIS_USE
    4543#include "G4VisExecutive.hh"
     44#endif
     45
     46#ifdef G4UI_USE
     47#include "G4UIExecutive.hh"
    4648#endif
    4749
    … …  
    7173  runManager->SetUserAction(new LXeSteppingAction(recorder));
    7274
    73   runManager->Initialize();
     75  // runManager->Initialize();
    7476 
    7577  // get the pointer to the UI manager and set verbosities
    76   G4UImanager* UI = G4UImanager::GetUIpointer();
     78  G4UImanager* UImanager = G4UImanager::GetUIpointer();
    7779 
    7880  if(argc==1){
    79     G4UIsession* session=0;
    80 #ifdef G4UI_USE_TCSH
    81     session = new G4UIterminal(new G4UItcsh);
    82 #else
    83     session = new G4UIterminal();
     81#ifdef G4UI_USE
     82    G4UIExecutive* ui = new G4UIExecutive(argc, argv);
     83#ifdef G4VIS_USE
     84    UImanager->ApplyCommand("/control/execute vis.mac");     
    8485#endif
    85 
    86     //execute vis.mac
    87     UI->ApplyCommand("/control/execute vis.mac");
    88 
    89     session->SessionStart();
    90     delete session;
    91 
     86    ui->SessionStart();
     87    delete ui;
     88#endif
    9289  }
    9390  else{
    9491    G4String command = "/control/execute ";
    9592    G4String filename = argv[1];
    96     UI->ApplyCommand(command+filename);
     93    UImanager->ApplyCommand(command+filename);
    9794  }
    9895

  • trunk/examples/extended/optical/LXe/include/LXeEMPhysics.hh

    r807 r1230  
    3535#include "G4ComptonScattering.hh"
    3636#include "G4GammaConversion.hh"
    37 #include "G4MultipleScattering.hh"
     37#include "G4eMultipleScattering.hh"
    3838#include "G4eIonisation.hh"
    3939#include "G4eBremsstrahlung.hh"
    … …  
    6363 
    6464    // Electron physics
    65     G4MultipleScattering* theElectronMultipleScattering;
     65    G4eMultipleScattering* theElectronMultipleScattering;
    6666    G4eIonisation* theElectronIonisation;
    6767    G4eBremsstrahlung* theElectronBremsStrahlung;
    6868 
    6969    //Positron physics
    70     G4MultipleScattering* thePositronMultipleScattering;
     70    G4eMultipleScattering* thePositronMultipleScattering;
    7171    G4eIonisation* thePositronIonisation;
    7272    G4eBremsstrahlung* thePositronBremsStrahlung; 

  • trunk/examples/extended/optical/LXe/include/LXeMuonPhysics.hh

    r807 r1230  
    3131
    3232#include "G4VPhysicsConstructor.hh"
    33 #include "G4MultipleScattering.hh"
     33#include "G4MuMultipleScattering.hh"
    3434#include "G4MuBremsstrahlung.hh"
    3535#include "G4MuPairProduction.hh"
    … …  
    5858   // Muon physics
    5959   G4MuIonisation*         fMuPlusIonisation;
    60    G4MultipleScattering*  fMuPlusMultipleScattering;
     60   G4MuMultipleScattering* fMuPlusMultipleScattering;
    6161   G4MuBremsstrahlung*     fMuPlusBremsstrahlung ;
    6262   G4MuPairProduction*     fMuPlusPairProduction;
    6363
    6464   G4MuIonisation*         fMuMinusIonisation;
    65    G4MultipleScattering*  fMuMinusMultipleScattering;
     65   G4MuMultipleScattering* fMuMinusMultipleScattering;
    6666   G4MuBremsstrahlung*     fMuMinusBremsstrahlung ;
    6767   G4MuPairProduction*     fMuMinusPairProduction;

  • trunk/examples/extended/optical/LXe/include/LXePrimaryGeneratorAction.hh

    r807 r1230  
    2828#define LXePrimaryGeneratorAction_h 1
    2929
    30 #include "G4GeneralParticleSource.hh"
    3130#include "G4VUserPrimaryGeneratorAction.hh"
    3231

  • trunk/examples/extended/optical/LXe/src/LXeDetectorConstruction.cc

    r807 r1230  
    140140  LXe_mt->AddConstProperty("YIELDRATIO",1.0);
    141141  LXe->SetMaterialPropertiesTable(LXe_mt);
     142
     143  // Set the Birks Constant for the LXe scintillator
     144
     145  LXe->GetIonisation()->SetBirksConstant(0.126*mm/MeV);
    142146 
    143147  G4double Glass_RIND[LXe_NUMENTRIES]={1.49,1.49,1.49};
    … …  
    171175  Pstyrene->SetMaterialPropertiesTable(MPTPStyrene);
    172176
     177  // Set the Birks Constant for the Polystyrene scintillator
     178
     179  Pstyrene->GetIonisation()->SetBirksConstant(0.126*mm/MeV);
     180
    173181  G4double RefractiveIndexFiber[WLS_NUMENTRIES]={ 1.60, 1.60, 1.60, 1.60};
    174182  G4double AbsFiber[WLS_NUMENTRIES]={9.00*m,9.00*m,0.1*mm,0.1*mm};
    … …  
    343351  G4LogicalSkinSurface::CleanSurfaceTable();
    344352  G4LogicalBorderSurface::CleanSurfaceTable();
     353  G4SurfaceProperty::CleanSurfacePropertyTable();
    345354
    346355  //define new one

  • trunk/examples/extended/optical/LXe/src/LXeEMPhysics.cc

    r807 r1230  
    7474 
    7575    // Electron physics
    76   theElectronMultipleScattering = new G4MultipleScattering();
     76  theElectronMultipleScattering = new G4eMultipleScattering();
    7777  theElectronIonisation = new G4eIonisation();
    7878  theElectronBremsStrahlung = new G4eBremsstrahlung();
    7979 
    8080    //Positron physics
    81   thePositronMultipleScattering = new G4MultipleScattering();
     81  thePositronMultipleScattering = new G4eMultipleScattering();
    8282  thePositronIonisation = new G4eIonisation();
    8383  thePositronBremsStrahlung = new G4eBremsstrahlung(); 

  • trunk/examples/extended/optical/LXe/src/LXeMainVolume.cc

    r807 r1230  
    266266  //**Photocathode surface properties
    267267  G4double photocath_EFF[num]={1.,1.}; //Enables 'detection' of photons
    268   G4double photocath_REFL[num]={0.,0.};
     268  G4double photocath_ReR[num]={1.92,1.92};
     269  G4double photocath_ImR[num]={1.69,1.69};
    269270  G4MaterialPropertiesTable* photocath_mt = new G4MaterialPropertiesTable();
    270271  photocath_mt->AddProperty("EFFICIENCY",Ephoton,photocath_EFF,num);
    271   photocath_mt->AddProperty("REFLECTIVITY",Ephoton,photocath_REFL,num);
     272  photocath_mt->AddProperty("REALRINDEX",Ephoton,photocath_ReR,num);
     273  photocath_mt->AddProperty("IMAGINARYRINDEX",Ephoton,photocath_ImR,num);
    272274  G4OpticalSurface* photocath_opsurf=
    273275    new G4OpticalSurface("photocath_opsurf",glisur,polished,

  • trunk/examples/extended/optical/LXe/src/LXeMuonPhysics.cc

    r807 r1230  
    6363{
    6464  fMuPlusIonisation = new G4MuIonisation();
    65   fMuPlusMultipleScattering = new G4MultipleScattering();
     65  fMuPlusMultipleScattering = new G4MuMultipleScattering();
    6666  fMuPlusBremsstrahlung=new G4MuBremsstrahlung();
    6767  fMuPlusPairProduction= new G4MuPairProduction();
    6868
    6969  fMuMinusIonisation = new G4MuIonisation();
    70   fMuMinusMultipleScattering = new G4MultipleScattering;
     70  fMuMinusMultipleScattering = new G4MuMultipleScattering;
    7171  fMuMinusBremsstrahlung = new G4MuBremsstrahlung();
    7272  fMuMinusPairProduction = new G4MuPairProduction();

  • trunk/examples/extended/optical/LXe/src/LXePMTSD.cc

    r807 r1230  
    6565
    6666//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
    67 G4bool LXePMTSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist){
    68   return ProcessHits_constStep(aStep,ROhist);
     67G4bool LXePMTSD::ProcessHits(G4Step* ,G4TouchableHistory* ){
     68  return false;
    6969}
    7070
    … …  
    120120  }
    121121   
    122 
    123122  return true;
    124123}

  • trunk/examples/extended/optical/LXe/src/LXePhysicsList.cc

    r807 r1230  
    2626#include "LXePhysicsList.hh"
    2727
    28 #include "globals.hh"
    29 #include "G4ParticleDefinition.hh"
    30 #include "G4ProcessManager.hh"
    31 #include "G4ProcessVector.hh"
    32 #include "G4ParticleTypes.hh"
    33 #include "G4ParticleTable.hh"
    34 
    35 #include "G4Material.hh"
    36 #include "G4MaterialTable.hh"
    37 #include "G4ios.hh"
    38 #include <iomanip>   
    39 
    4028#include "LXeGeneralPhysics.hh"
    4129#include "LXeEMPhysics.hh"
    4230#include "LXeMuonPhysics.hh"
    43 #include "LXeOpticalPhysics.hh"
     31
     32#include "G4OpticalPhysics.hh"
    4433
    4534LXePhysicsList::LXePhysicsList():  G4VModularPhysicsList()
    … …  
    4736  // default cut value  (1.0mm)
    4837  defaultCutValue = 1.0*mm;
    49   // SetVerboseLevel(1);
    5038
    5139  // General Physics
    … …  
    5644
    5745  // Muon Physics
    58   RegisterPhysics(  new LXeMuonPhysics("muon"));
     46  RegisterPhysics( new LXeMuonPhysics("muon"));
    5947
    60    // Optical Physics
    61   RegisterPhysics(  new LXeOpticalPhysics("optical"));
     48  // Optical Physics
     49  G4OpticalPhysics* opticalPhysics = new G4OpticalPhysics();
     50  RegisterPhysics( opticalPhysics );
     51
     52  opticalPhysics->SetWLSTimeProfile("delta");
     53
     54  opticalPhysics->SetScintillationYieldFactor(1.0);
     55  opticalPhysics->SetScintillationExcitationRatio(0.0);
     56
     57  opticalPhysics->SetMaxNumPhotonsPerStep(100);
     58  opticalPhysics->SetMaxBetaChangePerStep(10.0);
     59
     60  opticalPhysics->SetTrackSecondariesFirst(true);
    6261
    6362}
Note: See TracChangeset for help on using the changeset viewer.