Ignore:
Timestamp:
Apr 22, 2009, 12:00:47 PM (17 years ago)
Author:
garnier
Message:

update

Location:
trunk/source/digits_hits/scorer
Files:
95 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/digits_hits/scorer/include/G4PSCellCharge.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCellCharge.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCellCharge3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCellCharge3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCellFlux.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCellFlux3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCellFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceCurrent.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceFlux.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSDirectionFlag.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSDirectionFlag.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/digits_hits/scorer/include/G4PSDoseDeposit.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSDoseDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSDoseDeposit3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSEnergyDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSEnergyDeposit3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSMinKinEAtGeneration.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSMinKinEAtGeneration3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofCollision.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofCollision.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofCollision3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofCollision3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofSecondary.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofSecondary.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofSecondary3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofSecondary3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofStep.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofStep.hh,v 1.2 2007/08/29 06:36:41 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSNofStep3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSNofStep3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellCurrent.hh,v 1.1 2007/08/14 21:30:45 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageTrackLength.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPopulation.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPopulation.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSPopulation3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSPopulation3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSSphereSurfaceFlux3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTermination.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTermination.hh,v 1.2 2007/12/10 16:29:35 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTermination3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTermination3D.hh,v 1.3 2007/12/10 16:29:37 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTrackCounter.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackCounter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTrackCounter3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackCounter3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTrackLength.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackLength.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4PSTrackLength3D.hh

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4SDChargedFilter.hh

    r850 r1012  
    2626//
    2727// $Id: G4SDChargedFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4SDKineticEnergyFilter.hh

    r850 r1012  
    2626//
    2727// $Id: G4SDKineticEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4SDNeutralFilter.hh

    r850 r1012  
    2626//
    2727// $Id: G4SDNeutralFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4SDParticleFilter.hh

    r850 r1012  
    2626//
    2727// $Id: G4SDParticleFilter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/include/G4SDParticleWithEnergyFilter.hh

    r850 r1012  
    2626//
    2727// $Id: G4SDParticleWithEnergyFilter.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030

  • trunk/source/digits_hits/scorer/src/G4PSCellCharge.cc

    r850 r1012  
    2525//
    2626// $Id: G4PSCellCharge.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    27 // GEANT4 tag $Name: HEAD $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929// G4PSCellCharge

  • trunk/source/digits_hits/scorer/src/G4PSCellCharge3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSCellCharge3D.cc,v 1.3 2007/08/29 06:36:41 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCellCharge3D

  • trunk/source/digits_hits/scorer/src/G4PSCellFlux.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSCellFlux.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCellFlux
    … …  
    3232#include "G4Track.hh"
    3333#include "G4VSolid.hh"
     34#include "G4VPhysicalVolume.hh"
     35#include "G4VPVParameterisation.hh"
    3436#include "G4UnitsTable.hh"
    3537
    … …  
    5860G4bool G4PSCellFlux::ProcessHits(G4Step* aStep,G4TouchableHistory*)
    5961{
    60     G4double stepLength = aStep->GetStepLength();
    61     if ( stepLength == 0. ) return FALSE;
    62     G4double volume     = aStep->GetPreStepPoint()->GetPhysicalVolume()
    63                          ->GetLogicalVolume()->GetSolid()->GetCubicVolume();
    64     G4double CellFlux = stepLength / volume ;
    65     CellFlux *= aStep->GetPreStepPoint()->GetWeight();
    66     G4int index = GetIndex(aStep);
    67     EvtMap->add(index,CellFlux);
     62  G4double stepLength = aStep->GetStepLength();
     63  if ( stepLength == 0. ) return FALSE;
     64
     65  G4VPhysicalVolume* physVol = aStep->GetPreStepPoint()->GetPhysicalVolume();
     66  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     67  G4VSolid* solid = 0;
     68  if(physParam)
     69  { // for parameterized volume
     70    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     71                ->GetReplicaNumber(indexDepth);
     72    solid = physParam->ComputeSolid(idx, physVol);
     73    solid->ComputeDimensions(physParam,idx,physVol);
     74  }
     75  else
     76  { // for ordinary volume
     77    solid = physVol->GetLogicalVolume()->GetSolid();
     78  }
     79
     80  G4double CellFlux = stepLength / (solid->GetCubicVolume());
     81  CellFlux *= aStep->GetPreStepPoint()->GetWeight();
     82  G4int index = GetIndex(aStep);
     83  EvtMap->add(index,CellFlux);
    6884
    6985  return TRUE;

  • trunk/source/digits_hits/scorer/src/G4PSCellFlux3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCellFlux3D

  • trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSCylinderSurfaceCurrent.cc,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSCylinderSurfaceCurrent.cc,v 1.2 2008/12/28 21:10:51 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCylinderSurfaceCurrent
    … …  
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6265{
    6366  G4StepPoint* preStep = aStep->GetPreStepPoint();
    64   G4VSolid * solid =
    65     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    66   if( solid->GetEntityType() != "G4Tubs" ){
    67     G4Exception("G4PSCylinderSurfaceCurrentScorer. - Solid type is not supported.");
    68     return FALSE;
     67  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     68  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     69  G4VSolid * solid = 0;
     70  if(physParam)
     71  { // for parameterized volume
     72    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     73                ->GetReplicaNumber(indexDepth);
     74    solid = physParam->ComputeSolid(idx, physVol);
     75    solid->ComputeDimensions(physParam,idx,physVol);
    6976  }
     77  else
     78  { // for ordinary volume
     79    solid = physVol->GetLogicalVolume()->GetSolid();
     80  }
     81
     82//  if( solid->GetEntityType() != "G4Tubs" ){
     83//    G4Exception("G4PSCylinderSurfaceCurrentScorer. - Solid type is not supported.");
     84//    return FALSE;
     85//  }
    7086  G4Tubs* tubsSolid = (G4Tubs*)(solid);
    7187

  • trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceCurrent3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCylinderSurfaceCurrent3D

  • trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux.cc

    r850 r1012  
    1 // //
    2 // // ********************************************************************
    3 // // * License and Disclaimer                                           *
    4 // // *                                                                  *
    5 // // * The  Geant4 software  is  copyright of the Copyright Holders  of *
    6 // // * the Geant4 Collaboration.  It is provided  under  the terms  and *
    7 // // * conditions of the Geant4 Software License,  included in the file *
    8 // // * LICENSE and available at  http://cern.ch/geant4/license .  These *
    9 // // * include a list of copyright holders.                             *
    10 // // *                                                                  *
    11 // // * Neither the authors of this software system, nor their employing *
    12 // // * institutes,nor the agencies providing financial support for this *
    13 // // * work  make  any representation or  warranty, express or implied, *
    14 // // * regarding  this  software system or assume any liability for its *
    15 // // * use.  Please see the license in the file  LICENSE  and URL above *
    16 // // * for the full disclaimer and the limitation of liability.         *
    17 // // *                                                                  *
    18 // // * This  code  implementation is the result of  the  scientific and *
    19 // // * technical work of the GEANT4 collaboration.                      *
    20 // // * By using,  copying,  modifying or  distributing the software (or *
    21 // // * any work based  on the software)  you  agree  to acknowledge its *
    22 // // * use  in  resulting  scientific  publications,  and indicate your *
    23 // // * acceptance of all terms of the Geant4 Software license.          *
    24 // // ********************************************************************
    25 // //
    26 // //
    27 // // $Id: G4PSCylinderSurfaceFlux.cc,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // // GEANT4 tag $Name: HEAD $
    29 // //
     1//
     2// ********************************************************************
     3// * License and Disclaimer                                           *
     4// *                                                                  *
     5// * The  Geant4 software  is  copyright of the Copyright Holders  of *
     6// * the Geant4 Collaboration.  It is provided  under  the terms  and *
     7// * conditions of the Geant4 Software License,  included in the file *
     8// * LICENSE and available at  http://cern.ch/geant4/license .  These *
     9// * include a list of copyright holders.                             *
     10// *                                                                  *
     11// * Neither the authors of this software system, nor their employing *
     12// * institutes,nor the agencies providing financial support for this *
     13// * work  make  any representation or  warranty, express or implied, *
     14// * regarding  this  software system or assume any liability for its *
     15// * use.  Please see the license in the file  LICENSE  and URL above *
     16// * for the full disclaimer and the limitation of liability.         *
     17// *                                                                  *
     18// * This  code  implementation is the result of  the  scientific and *
     19// * technical work of the GEANT4 collaboration.                      *
     20// * By using,  copying,  modifying or  distributing the software (or *
     21// * any work based  on the software)  you  agree  to acknowledge its *
     22// * use  in  resulting  scientific  publications,  and indicate your *
     23// * acceptance of all terms of the Geant4 Software license.          *
     24// ********************************************************************
     25//
     26//
     27// $Id: G4PSCylinderSurfaceFlux.cc,v 1.3 2008/12/28 21:10:51 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
     29//
    3030// // G4PSCylinderSurfaceFlux
    3131#include "G4PSCylinderSurfaceFlux.hh"
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6164  G4StepPoint* preStep = aStep->GetPreStepPoint();
    6265  G4StepPoint* postStep = aStep->GetPreStepPoint();
    63   G4VSolid * solid =
    64     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    65   if( solid->GetEntityType() != "G4Tubs" ){
    66     G4Exception("G4PSCylinderSurfaceFluxScorer. - Solid type is not supported.");
    67     return FALSE;
     66
     67  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     68  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     69  G4VSolid * solid = 0;
     70  if(physParam)
     71  { // for parameterized volume
     72    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     73                ->GetReplicaNumber(indexDepth);
     74    solid = physParam->ComputeSolid(idx, physVol);
     75    solid->ComputeDimensions(physParam,idx,physVol);
    6876  }
     77  else
     78  { // for ordinary volume
     79    solid = physVol->GetLogicalVolume()->GetSolid();
     80  }
     81
     82//  if( solid->GetEntityType() != "G4Tubs" ){
     83//    G4Exception("G4PSCylinderSurfaceFluxScorer. - Solid type is not supported.");
     84//    return FALSE;
     85//  }
    6986  G4Tubs* tubsSolid = (G4Tubs*)(solid);
    7087 

  • trunk/source/digits_hits/scorer/src/G4PSCylinderSurfaceFlux3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSCylinderSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSCylinderSurfaceFlux3D

  • trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSDoseDeposit.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSDoseDeposit.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSDoseDeposit
    3131#include "G4PSDoseDeposit.hh"
    3232#include "G4VSolid.hh"
     33#include "G4VPhysicalVolume.hh"
     34#include "G4VPVParameterisation.hh"
    3335#include "G4UnitsTable.hh"
    3436
    … …  
    5355  G4double edep = aStep->GetTotalEnergyDeposit();
    5456  if ( edep == 0. ) return FALSE;
    55   G4double volume  = aStep->GetPreStepPoint()->GetPhysicalVolume()
    56                      ->GetLogicalVolume()->GetSolid()->GetCubicVolume();
     57
     58  G4VPhysicalVolume* physVol = aStep->GetPreStepPoint()->GetPhysicalVolume();
     59  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     60  G4VSolid* solid = 0;
     61  if(physParam)
     62  { // for parameterized volume
     63    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     64                ->GetReplicaNumber(indexDepth);
     65    solid = physParam->ComputeSolid(idx, physVol);
     66    solid->ComputeDimensions(physParam,idx,physVol);
     67  }
     68  else
     69  { // for ordinary volume
     70    solid = physVol->GetLogicalVolume()->GetSolid();
     71  }
     72
    5773  G4double density = aStep->GetTrack()->GetMaterial()->GetDensity();
    58   G4double dose    = edep / ( density * volume );
     74  G4double dose    = edep / ( density * (solid->GetCubicVolume()) );
    5975  dose *= aStep->GetPreStepPoint()->GetWeight();
    6076  G4int  index = GetIndex(aStep);

  • trunk/source/digits_hits/scorer/src/G4PSDoseDeposit3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSDoseDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSDoseDeposit3D

  • trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSEnergyDeposit.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSEnergyDeposit

  • trunk/source/digits_hits/scorer/src/G4PSEnergyDeposit3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSEnergyDeposit3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSEnergyDeposit3D

  • trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceCurrent.cc,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSFlatSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSFlatSurfaceCurrent
    … …  
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6467{
    6568  G4StepPoint* preStep = aStep->GetPreStepPoint();
    66   G4VSolid * solid =
    67     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    68   if( solid->GetEntityType() != "G4Box" ){
    69     G4Exception("G4PSFlatSurfaceCurrentScorer. - Solid type is not supported.");
    70     return FALSE;
     69  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     70  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     71  G4VSolid * solid = 0;
     72  if(physParam)
     73  { // for parameterized volume
     74    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     75                ->GetReplicaNumber(indexDepth);
     76    solid = physParam->ComputeSolid(idx, physVol);
     77    solid->ComputeDimensions(physParam,idx,physVol);
    7178  }
     79  else
     80  { // for ordinary volume
     81    solid = physVol->GetLogicalVolume()->GetSolid();
     82  }
     83
     84//  if( solid->GetEntityType() != "G4Box" ){
     85//    G4Exception("G4PSFlatSurfaceCurrentScorer. - Solid type is not supported.");
     86//    return FALSE;
     87//  }
    7288  G4Box* boxSolid = (G4Box*)(solid);
    7389

  • trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceCurrent3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSFlatSurfaceCurrent3D

  • trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceFlux.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSFlatSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSFlatSurfaceFlux
    … …  
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6366{
    6467  G4StepPoint* preStep = aStep->GetPreStepPoint();
    65   G4VSolid * solid =
    66     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    67   if( solid->GetEntityType() != "G4Box" ){
    68     G4Exception("G4PSFlatSurfaceFluxScorer. - Solid type is not supported.");
    69     return FALSE;
     68  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     69  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     70  G4VSolid * solid = 0;
     71  if(physParam)
     72  { // for parameterized volume
     73    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     74                ->GetReplicaNumber(indexDepth);
     75    solid = physParam->ComputeSolid(idx, physVol);
     76    solid->ComputeDimensions(physParam,idx,physVol);
    7077  }
     78  else
     79  { // for ordinary volume
     80    solid = physVol->GetLogicalVolume()->GetSolid();
     81  }
     82
     83//  if( solid->GetEntityType() != "G4Box" ){
     84//    G4Exception("G4PSFlatSurfaceFluxScorer. - Solid type is not supported.");
     85//    return FALSE;
     86//  }
    7187  G4Box* boxSolid = (G4Box*)(solid);
    7288

  • trunk/source/digits_hits/scorer/src/G4PSFlatSurfaceFlux3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSFlatSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSFlatSurfaceFlux3D

  • trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSMinKinEAtGeneration.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSMinKinEAtGeneration

  • trunk/source/digits_hits/scorer/src/G4PSMinKinEAtGeneration3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSMinKinEAtGeneration3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSMinKinEAtGeneration3D

  • trunk/source/digits_hits/scorer/src/G4PSNofCollision.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofCollision.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofCollision

  • trunk/source/digits_hits/scorer/src/G4PSNofCollision3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofCollision3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofCollision3D

  • trunk/source/digits_hits/scorer/src/G4PSNofSecondary.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofSecondary.cc,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofSecondary

  • trunk/source/digits_hits/scorer/src/G4PSNofSecondary3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofSecondary3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofSecondary3D

  • trunk/source/digits_hits/scorer/src/G4PSNofStep.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofStep.cc,v 1.2 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofStep

  • trunk/source/digits_hits/scorer/src/G4PSNofStep3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSNofStep3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSNofStep3D

  • trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellCurrent.cc,v 1.1 2007/08/14 21:30:46 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageCellCurrent

  • trunk/source/digits_hits/scorer/src/G4PSPassageCellCurrent3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageCellCurrent3D

  • trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSPassageCellFlux.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSPassageCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageCellFlux
    … …  
    3333#include "G4Track.hh"
    3434#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3537#include "G4UnitsTable.hh"
    3638////////////////////////////////////////////////////////////////////////////////
    … …  
    5961
    6062  if ( IsPassed(aStep) ) {
    61     fCellFlux /=
    62       aStep->GetPreStepPoint()->GetPhysicalVolume()
    63       ->GetLogicalVolume()->GetSolid()->GetCubicVolume();
     63    G4VPhysicalVolume* physVol = aStep->GetPreStepPoint()->GetPhysicalVolume();
     64    G4VPVParameterisation* physParam = physVol->GetParameterisation();
     65    G4VSolid* solid = 0;
     66    if(physParam)
     67    { // for parameterized volume
     68      G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     69                  ->GetReplicaNumber(indexDepth);
     70      solid = physParam->ComputeSolid(idx, physVol);
     71      solid->ComputeDimensions(physParam,idx,physVol);
     72    }
     73    else
     74    { // for ordinary volume
     75      solid = physVol->GetLogicalVolume()->GetSolid();
     76    }
     77
     78    fCellFlux /= solid->GetCubicVolume();
    6479    G4int index = GetIndex(aStep);
    6580    EvtMap->add(index,fCellFlux);

  • trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageCellFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageCellFlux3D

  • trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageTrackLength

  • trunk/source/digits_hits/scorer/src/G4PSPassageTrackLength3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPassageTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPassageTrackLength3D

  • trunk/source/digits_hits/scorer/src/G4PSPopulation.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPopulation.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPopulation

  • trunk/source/digits_hits/scorer/src/G4PSPopulation3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSPopulation3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSPopulation3D

  • trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceCurrent.cc,v 1.2 2007/08/14 21:23:52 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSSphereSurfaceCurrent.cc,v 1.3 2008/12/29 00:17:14 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSSphereSurfaceCurrent
    … …  
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6164{
    6265  G4StepPoint* preStep = aStep->GetPreStepPoint();
    63   G4VSolid * solid =
    64     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    65   if( solid->GetEntityType() != "G4Sphere" ){
    66     G4Exception("G4PSSphereSurfaceCurrentScorer. - Solid type is not supported.");
    67     return FALSE;
     66  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     67  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     68  G4VSolid * solid = 0;
     69  if(physParam)
     70  { // for parameterized volume
     71    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     72                ->GetReplicaNumber(indexDepth);
     73    solid = physParam->ComputeSolid(idx, physVol);
     74    solid->ComputeDimensions(physParam,idx,physVol);
    6875  }
     76  else
     77  { // for ordinary volume
     78    solid = physVol->GetLogicalVolume()->GetSolid();
     79  }
     80
     81//  if( solid->GetEntityType() != "G4Sphere" ){
     82//    G4Exception("G4PSSphereSurfaceCurrentScorer. - Solid type is not supported.");
     83//    return FALSE;
     84//  }
    6985  G4Sphere* sphereSolid = (G4Sphere*)(solid);
    7086

  • trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceCurrent3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceCurrent3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSSphereSurfaceCurrent3D

  • trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux.cc

    r850 r1012  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceFlux.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     27// $Id: G4PSSphereSurfaceFlux.cc,v 1.2 2008/12/29 00:17:14 asaim Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSSphereSurfaceFlux
    … …  
    3232#include "G4StepStatus.hh"
    3333#include "G4Track.hh"
     34#include "G4VSolid.hh"
     35#include "G4VPhysicalVolume.hh"
     36#include "G4VPVParameterisation.hh"
    3437#include "G4UnitsTable.hh"
    3538#include "G4GeometryTolerance.hh"
    … …  
    6164{
    6265  G4StepPoint* preStep = aStep->GetPreStepPoint();
    63   G4VSolid * solid =
    64     preStep->GetPhysicalVolume()->GetLogicalVolume()->GetSolid();
    65   if( solid->GetEntityType() != "G4Sphere" ){
    66     G4Exception("G4PSSphereSurfaceFluxScorer. - Solid type is not supported.");
    67     return FALSE;
    68   }
     66  G4VPhysicalVolume* physVol = preStep->GetPhysicalVolume();
     67  G4VPVParameterisation* physParam = physVol->GetParameterisation();
     68  G4VSolid * solid = 0;
     69  if(physParam)
     70  { // for parameterized volume
     71    G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
     72                ->GetReplicaNumber(indexDepth);
     73    solid = physParam->ComputeSolid(idx, physVol);
     74    solid->ComputeDimensions(physParam,idx,physVol);
     75  }
     76  else
     77  { // for ordinary volume
     78    solid = physVol->GetLogicalVolume()->GetSolid();
     79  }
     80
     81//  if( solid->GetEntityType() != "G4Sphere" ){
     82//    G4Exception("G4PSSphereSurfaceFluxScorer. - Solid type is not supported.");
     83//    return FALSE;
     84//  }
    6985  G4Sphere* sphereSolid = (G4Sphere*)(solid);
    7086

  • trunk/source/digits_hits/scorer/src/G4PSSphereSurfaceFlux3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSSphereSurfaceFlux3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSSphereSurfaceFlux3D

  • trunk/source/digits_hits/scorer/src/G4PSTermination.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTermination.cc,v 1.2 2007/12/10 16:29:42 gunter Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTermination

  • trunk/source/digits_hits/scorer/src/G4PSTermination3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTermination3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTermination3D

  • trunk/source/digits_hits/scorer/src/G4PSTrackCounter.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackCounter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTrackCounter

  • trunk/source/digits_hits/scorer/src/G4PSTrackCounter3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackCounter3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTrackCounter3D

  • trunk/source/digits_hits/scorer/src/G4PSTrackLength.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackLength.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTrackLength

  • trunk/source/digits_hits/scorer/src/G4PSTrackLength3D.cc

    r850 r1012  
    2626//
    2727// $Id: G4PSTrackLength3D.cc,v 1.3 2007/08/29 06:36:42 taso Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4PSTrackLength3D

  • trunk/source/digits_hits/scorer/src/G4SDChargedFilter.cc

    r850 r1012  
    2626//
    2727// $Id: G4SDChargedFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4VSensitiveDetector

  • trunk/source/digits_hits/scorer/src/G4SDKineticEnergyFilter.cc

    r850 r1012  
    2626//
    2727// $Id: G4SDKineticEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4VSensitiveDetector

  • trunk/source/digits_hits/scorer/src/G4SDNeutralFilter.cc

    r850 r1012  
    2626//
    2727// $Id: G4SDNeutralFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4VSensitiveDetector

  • trunk/source/digits_hits/scorer/src/G4SDParticleFilter.cc

    r850 r1012  
    2626//
    2727// $Id: G4SDParticleFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4VSensitiveDetector

  • trunk/source/digits_hits/scorer/src/G4SDParticleWithEnergyFilter.cc

    r850 r1012  
    2626//
    2727// $Id: G4SDParticleWithEnergyFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
    28 // GEANT4 tag $Name: HEAD $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// G4VSensitiveDetector
Note: See TracChangeset for help on using the changeset viewer.