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

update to geant4.9.3

Location:
trunk/examples/extended/optical/LXe/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • 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.