Ignore:
Timestamp:
Nov 5, 2010, 3:45:55 PM (15 years ago)
Author:
garnier
Message:

update ti head

Location:
trunk/source/digits_hits/scorer/include
Files:
40 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/digits_hits/scorer/include/CVS/Entries

    r1337 r1340  
    1 /G4PSCellCharge.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    2 /G4PSCellCharge3D.hh/1.2/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    3 /G4PSCellFlux.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    4 /G4PSCellFlux3D.hh/1.2/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    5 /G4PSCylinderSurfaceCurrent.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    6 /G4PSCylinderSurfaceCurrent3D.hh/1.2/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    7 /G4PSCylinderSurfaceFlux.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    8 /G4PSCylinderSurfaceFlux3D.hh/1.2/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    9 /G4PSDirectionFlag.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    10 /G4PSDoseDeposit.hh/1.1/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    11 /G4PSDoseDeposit3D.hh/1.2/Wed Sep 29 21:47:40 2010//Tgeant4-09-04-beta-01
    12 /G4PSEnergyDeposit.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    13 /G4PSEnergyDeposit3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    14 /G4PSFlatSurfaceCurrent.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    15 /G4PSFlatSurfaceCurrent3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    16 /G4PSFlatSurfaceFlux.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    17 /G4PSFlatSurfaceFlux3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    18 /G4PSMinKinEAtGeneration.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    19 /G4PSMinKinEAtGeneration3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    20 /G4PSNofCollision.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    21 /G4PSNofCollision3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    22 /G4PSNofSecondary.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    23 /G4PSNofSecondary3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    24 /G4PSNofStep.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    25 /G4PSNofStep3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    26 /G4PSPassageCellCurrent.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    27 /G4PSPassageCellCurrent3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    28 /G4PSPassageCellFlux.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    29 /G4PSPassageCellFlux3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    30 /G4PSPassageTrackLength.hh/1.1/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    31 /G4PSPassageTrackLength3D.hh/1.2/Wed Sep 29 21:47:49 2010//Tgeant4-09-04-beta-01
    32 /G4PSPopulation.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    33 /G4PSPopulation3D.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    34 /G4PSSphereSurfaceCurrent.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    35 /G4PSSphereSurfaceCurrent3D.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    36 /G4PSSphereSurfaceFlux.hh/1.1/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    37 /G4PSSphereSurfaceFlux3D.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    38 /G4PSTermination.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    39 /G4PSTermination3D.hh/1.3/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    40 /G4PSTrackCounter.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    41 /G4PSTrackCounter3D.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    42 /G4PSTrackLength.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    43 /G4PSTrackLength3D.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    44 /G4SDChargedFilter.hh/1.1/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    45 /G4SDKineticEnergyFilter.hh/1.1/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    46 /G4SDNeutralFilter.hh/1.1/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    47 /G4SDParticleFilter.hh/1.2/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
    48 /G4SDParticleWithEnergyFilter.hh/1.1/Wed Sep 29 21:47:50 2010//Tgeant4-09-04-beta-01
     1/G4PSDirectionFlag.hh/1.1/Wed Sep 29 21:47:40 2010//
     2/G4PSNofCollision3D.hh/1.2/Wed Sep 29 21:47:49 2010//
     3/G4PSNofSecondary3D.hh/1.2/Wed Sep 29 21:47:49 2010//
     4/G4PSPopulation3D.hh/1.2/Wed Sep 29 21:47:50 2010//
     5/G4PSTermination3D.hh/1.3/Wed Sep 29 21:47:50 2010//
     6/G4SDChargedFilter.hh/1.1/Wed Sep 29 21:47:50 2010//
     7/G4SDKineticEnergyFilter.hh/1.1/Wed Sep 29 21:47:50 2010//
     8/G4SDNeutralFilter.hh/1.1/Wed Sep 29 21:47:50 2010//
     9/G4SDParticleWithEnergyFilter.hh/1.1/Wed Sep 29 21:47:50 2010//
     10/G4PSCellCharge.hh/1.2/Fri Nov  5 09:57:28 2010//
     11/G4PSCellCharge3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     12/G4PSCellFlux.hh/1.3/Fri Nov  5 09:57:28 2010//
     13/G4PSCellFlux3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     14/G4PSCylinderSurfaceCurrent.hh/1.2/Fri Nov  5 09:57:28 2010//
     15/G4PSCylinderSurfaceCurrent3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     16/G4PSCylinderSurfaceFlux.hh/1.3/Fri Nov  5 09:57:28 2010//
     17/G4PSCylinderSurfaceFlux3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     18/G4PSDoseDeposit.hh/1.2/Fri Nov  5 09:57:28 2010//
     19/G4PSDoseDeposit3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     20/G4PSEnergyDeposit.hh/1.3/Fri Nov  5 09:57:28 2010//
     21/G4PSEnergyDeposit3D.hh/1.4/Fri Nov  5 09:57:28 2010//
     22/G4PSFlatSurfaceCurrent.hh/1.3/Fri Nov  5 09:57:28 2010//
     23/G4PSFlatSurfaceCurrent3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     24/G4PSFlatSurfaceFlux.hh/1.3/Fri Nov  5 09:57:28 2010//
     25/G4PSFlatSurfaceFlux3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     26/G4PSMinKinEAtGeneration.hh/1.3/Fri Nov  5 09:57:28 2010//
     27/G4PSMinKinEAtGeneration3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     28/G4PSNofCollision.hh/1.2/Fri Nov  5 09:57:28 2010//
     29/G4PSNofSecondary.hh/1.4/Fri Nov  5 09:57:28 2010//
     30/G4PSNofStep.hh/1.3/Fri Nov  5 09:57:28 2010//
     31/G4PSNofStep3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     32/G4PSPassageCellCurrent.hh/1.3/Fri Nov  5 09:57:28 2010//
     33/G4PSPassageCellCurrent3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     34/G4PSPassageCellFlux.hh/1.3/Fri Nov  5 09:57:28 2010//
     35/G4PSPassageCellFlux3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     36/G4PSPassageTrackLength.hh/1.2/Fri Nov  5 09:57:28 2010//
     37/G4PSPassageTrackLength3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     38/G4PSPopulation.hh/1.3/Fri Nov  5 09:57:28 2010//
     39/G4PSSphereSurfaceCurrent.hh/1.3/Fri Nov  5 09:57:28 2010//
     40/G4PSSphereSurfaceCurrent3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     41/G4PSSphereSurfaceFlux.hh/1.3/Fri Nov  5 09:57:28 2010//
     42/G4PSSphereSurfaceFlux3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     43/G4PSTermination.hh/1.3/Fri Nov  5 09:57:28 2010//
     44/G4PSTrackCounter.hh/1.3/Fri Nov  5 09:57:28 2010//
     45/G4PSTrackCounter3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     46/G4PSTrackLength.hh/1.3/Fri Nov  5 09:57:28 2010//
     47/G4PSTrackLength3D.hh/1.3/Fri Nov  5 09:57:28 2010//
     48/G4SDParticleFilter.hh/1.3/Fri Nov  5 09:57:28 2010//
    4949D

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCellCharge.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCellCharge.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2007-08-20  Tsukasa ASO
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////
    … …  
    4849   public: // with description
    4950      G4PSCellCharge(G4String name, G4int depth=0);
     51      G4PSCellCharge(G4String name, const G4String& unit, G4int depth=0);
    5052      virtual ~G4PSCellCharge();
    5153
    … …  
    6062      virtual void PrintAll();
    6163
     64      virtual void SetUnit(const G4String& unit);
     65
    6266  private:
    6367      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCellCharge3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCellCharge3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    3939//
    4040// Created: 2007-08-20  Tsukasa ASO
     41// 2010-07-22   Introduce Unit specification.
    4142//
    4243///////////////////////////////////////////////////////////////////////////////
    … …  
    4748   public: // with description
    4849      G4PSCellCharge3D(G4String name,
     50                     G4int ni=1,G4int nj=1, G4int nk=1,
     51                     G4int depi=2, G4int depj=1, G4int depk=0);
     52      G4PSCellCharge3D(G4String name, const G4String& unit,
    4953                     G4int ni=1,G4int nj=1, G4int nk=1,
    5054                     G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCellFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4848//
    4949// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     50// 2010-07-22   Introduce Unit specification.
     51// 2010-07-22   Add weighted option
    5052//
    5153///////////////////////////////////////////////////////////////////////////////
    … …  
    5658   public: // with description
    5759      G4PSCellFlux(G4String name, G4int depth=0);
     60      G4PSCellFlux(G4String name, const G4String& unit, G4int depth=0);
    5861      virtual ~G4PSCellFlux();
     62
     63      inline void Weighted(G4bool flg=true) { weighted = flg; }
     64      // Multiply track weight
    5965
    6066  protected: // with description
    … …  
    6874      virtual void PrintAll();
    6975
     76      virtual void SetUnit(const G4String& unit);   
     77
     78  protected:
     79      virtual void DefineUnitAndCategory();
     80
    7081  private:
    7182      G4int HCID;
    7283      G4THitsMap<G4double>* EvtMap;
     84      G4bool  weighted;
     85
    7386};
    7487#endif

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCellFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCellFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4646//
    4747// Created: 2007-08-14  Tsukasa ASO
     48// 2010-07-22   Introduce Unit specification.
    4849//
    4950///////////////////////////////////////////////////////////////////////////////
    … …  
    5455   public: // with description
    5556      G4PSCellFlux3D(G4String name,
     57                     G4int ni=1,G4int nj=1, G4int nk=1,
     58                     G4int depi=2, G4int depj=1, G4int depk=0);
     59     G4PSCellFlux3D(G4String name,const G4String& unit,
    5660                     G4int ni=1,G4int nj=1, G4int nk=1,
    5761                     G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCylinderSurfaceCurrent.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCylinderSurfaceCurrent.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5353//
    5454// Created: 2007-03-21  Tsukasa ASO
     55// 2010-07-22   Introduce Unit specification.
    5556//
    5657///////////////////////////////////////////////////////////////////////////////
    … …  
    6061 
    6162  public: // with description
    62       G4PSCylinderSurfaceCurrent(G4String name ,G4int direction, G4int depth=0);
     63      G4PSCylinderSurfaceCurrent(G4String name ,G4int direction,
     64                                 G4int depth=0);
     65      G4PSCylinderSurfaceCurrent(G4String name ,G4int direction,
     66                                 const G4String& unit, G4int depth=0);
    6367      virtual ~G4PSCylinderSurfaceCurrent();
    6468
    … …  
    8185      virtual void PrintAll();
    8286
     87      virtual void SetUnit(const G4String& unit);
     88
     89  protected:
     90      virtual void DefineUnitAndCategory();
     91
    8392  private:
    8493      G4int  HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCylinderSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4949//
    5050// Created: 2008-08-14  Tsukasa ASO
     51// 2010-07-22   Introduce Unit specification.
    5152///////////////////////////////////////////////////////////////////////////////
    5253
    … …  
    5657   public: // with description
    5758      G4PSCylinderSurfaceCurrent3D(G4String name, G4int direction,
     59                                   G4int ni=1,G4int nj=1, G4int nk=1,
     60                                   G4int depi=2, G4int depj=1, G4int depk=0);
     61      G4PSCylinderSurfaceCurrent3D(G4String name, G4int direction,
     62                                   const G4String& unit,
    5863                                   G4int ni=1,G4int nj=1, G4int nk=1,
    5964                                   G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCylinderSurfaceFlux.hh,v 1.1 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCylinderSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5353//
    5454// Created: 2007-03-29  Tsukasa ASO
     55// 2010-07-22   Introduce Unit specification.
     56// 2010-07-22   Add weighted and divideByArea options
    5557//
    5658///////////////////////////////////////////////////////////////////////////////
    … …  
    6062  public: // with description
    6163      G4PSCylinderSurfaceFlux(G4String name,G4int direction, G4int depth=0);
     64      G4PSCylinderSurfaceFlux(G4String name,G4int direction,
     65                              const G4String& unit, G4int depth=0);
    6266      virtual ~G4PSCylinderSurfaceFlux();
     67
     68      inline void Weighted(G4bool flg=true) { weighted = flg; }
     69      // Multiply track weight
     70
     71      inline void DivideByArea(G4bool flg=true) { divideByArea = flg; }
     72      // Divided by Area.
     73
    6374
    6475  protected: // with description
    … …  
    7384      virtual void PrintAll();
    7485
     86      virtual void SetUnit(const G4String& unit);
     87
     88  protected:
     89      virtual void DefineUnitAndCategory();
     90
    7591  private:
    7692      G4int  HCID;
    7793      G4int  fDirection;
    7894      G4THitsMap<G4double>* EvtMap;
    79 
     95      G4bool weighted;
     96      G4bool divideByArea;
    8097};
    8198

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSCylinderSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4949//
    5050// Created: 2008-08-14  Tsukasa ASO
     51// 2010-07-22   Introduce Unit specification.
    5152///////////////////////////////////////////////////////////////////////////////
    5253
    … …  
    5657   public: // with description
    5758      G4PSCylinderSurfaceFlux3D(G4String name, G4int direction,
     59                               G4int ni=1,G4int nj=1, G4int nk=1,
     60                               G4int di=2, G4int dj=1, G4int dk=0);
     61      G4PSCylinderSurfaceFlux3D(G4String name, G4int direction,
     62                                const G4String& unit,
    5863                               G4int ni=1,G4int nj=1, G4int nk=1,
    5964                               G4int di=2, G4int dj=1, G4int dk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSDoseDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSDoseDeposit.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////
    … …  
    4748 public: // with description
    4849      G4PSDoseDeposit(G4String name, G4int depth=0);
     50      G4PSDoseDeposit(G4String name, const G4String& unit, G4int depth=0);
    4951      virtual ~G4PSDoseDeposit();
    5052
    … …  
    5961      virtual void PrintAll();
    6062
     63      virtual void SetUnit(const G4String& unit);
     64
    6165  private:
    6266      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSDoseDeposit3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSDoseDeposit3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    3939//
    4040// Created: 2008-08-14  Tsukasa ASO
     41// 2010-07-22   Introduce Unit specification.
    4142//
    4243///////////////////////////////////////////////////////////////////////////////
    … …  
    4647 public: // with description
    4748      G4PSDoseDeposit3D(G4String name,
     49                        G4int ni=1,G4int nj=1, G4int nk=1,
     50                        G4int depi=2, G4int depj=1, G4int depk=0);
     51      G4PSDoseDeposit3D(G4String name, const G4String& unit,
    4852                        G4int ni=1,G4int nj=1, G4int nk=1,
    4953                        G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSEnergyDeposit.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSEnergyDeposit.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////
    … …  
    4748 
    4849 public: // with description
    49       G4PSEnergyDeposit(G4String name, G4int depth=0);
     50      G4PSEnergyDeposit(G4String name, G4int depth=0); // default unit
     51      G4PSEnergyDeposit(G4String name, const G4String& unit, G4int depth=0);
    5052      virtual ~G4PSEnergyDeposit();
    5153
    … …  
    6062      virtual void PrintAll();
    6163
     64      virtual void SetUnit(const G4String& unit);
     65
    6266  private:
    6367      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSEnergyDeposit3D.hh,v 1.2 2007/08/28 08:01:55 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSEnergyDeposit3D.hh,v 1.4 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    3838//
    3939// Created: 2007-08-14  Tsukasa ASO
     40// 2010-07-22   Introduce Unit specification.
    4041///////////////////////////////////////////////////////////////////////////////
    4142
    … …  
    4748                        G4int ni=1,G4int nj=1, G4int nk=1,
    4849                        G4int depi=2, G4int depj=1, G4int depk=0);
     50    G4PSEnergyDeposit3D(G4String name, const G4String& unit,
     51                        G4int ni=1,G4int nj=1, G4int nk=1,
     52                        G4int depi=2, G4int depj=1, G4int depk=0);
     53
    4954    virtual ~G4PSEnergyDeposit3D();
    5055

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSFlatSurfaceCurrent.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5555// 17-Nov-2005 T.Aso, Bug fix for area definition.
    5656// 31-Mar-2007 T.Aso, Add option for normalizing by the area.
     57// 2010-07-22   Introduce Unit specification.
    5758//
    5859///////////////////////////////////////////////////////////////////////////////
    … …  
    6364  public: // with description
    6465      G4PSFlatSurfaceCurrent(G4String name ,G4int direction, G4int depth=0);
     66      G4PSFlatSurfaceCurrent(G4String name ,G4int direction,
     67                             const G4String& unit, G4int depth=0);
    6568      virtual ~G4PSFlatSurfaceCurrent();
    6669
    … …  
    8285      virtual void PrintAll();
    8386
     87      virtual void SetUnit(const G4String& unit);   
     88
     89  protected:
     90      virtual void DefineUnitAndCategory();
     91
    8492  private:
    8593      G4int  HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSFlatSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4949//
    5050// Created: 2008-08-14  Tsukasa ASO
     51// 2010-07-22   Introduce Unit specification.
    5152///////////////////////////////////////////////////////////////////////////////
    5253
    … …  
    5657   public: // with description
    5758      G4PSFlatSurfaceCurrent3D(G4String name, G4int direction,
     59                               G4int ni=1,G4int nj=1, G4int nk=1,
     60                               G4int depi=2, G4int depj=1, G4int depk=0);
     61      G4PSFlatSurfaceCurrent3D(G4String name, G4int direction,
     62                               const G4String& unit,
    5863                               G4int ni=1,G4int nj=1, G4int nk=1,
    5964                               G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSFlatSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5757//                      Bug fix. Area definition.
    5858// 29-Mar-2007  T.Aso,  Bug fix for momentum direction at outgoing flux.
     59// 2010-07-22   Introduce Unit specification.
     60// 2010-07-22   Add weighted and divideByArea options
    5961///////////////////////////////////////////////////////////////////////////////
    6062
    … …  
    6365  public: // with description
    6466      G4PSFlatSurfaceFlux(G4String name,G4int direction, G4int depth=0);
     67      G4PSFlatSurfaceFlux(G4String name,G4int direction,
     68                          const G4String& unit, G4int depth=0);
    6569      virtual ~G4PSFlatSurfaceFlux();
     70
     71      inline void Weighted(G4bool flg=true) { weighted = flg; }
     72      // Multiply track weight
     73
     74      inline void DivideByArea(G4bool flg=true) { divideByArea = flg; }
     75      // Divided by Area.
    6676
    6777  protected: // with description
    … …  
    7686      virtual void PrintAll();
    7787
     88      virtual void SetUnit(const G4String& unit);
     89
     90  protected:
     91      virtual void DefineUnitAndCategory();
     92
    7893  private:
    7994      G4int  HCID;
    8095      G4int  fDirection;
    8196      G4THitsMap<G4double>* EvtMap;
    82 
     97      G4bool weighted;
     98      G4bool divideByArea;
    8399};
    84100

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSFlatSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSFlatSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5050//
    5151// Created: 2007-08-14  Tsukasa ASO
     52// 2010-07-22   Introduce Unit specification.
    5253//
    5354///////////////////////////////////////////////////////////////////////////////
    … …  
    5859   public: // with description
    5960      G4PSFlatSurfaceFlux3D(G4String name, G4int direction,
     61                            G4int ni=1,G4int nj=1, G4int nk=1,
     62                            G4int depi=2, G4int depj=1, G4int depk=0);
     63      G4PSFlatSurfaceFlux3D(G4String name, G4int direction,
     64                            const G4String& unit,
    6065                            G4int ni=1,G4int nj=1, G4int nk=1,
    6166                            G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSMinKinEAtGeneration.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSMinKinEAtGeneration.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4141//
    4242// Created: 2005-11-17  Tsukasa ASO, Akinori Kimura.
     43// 2010-07-22   Introduce Unit specification.
    4344//
    4445//
    … …  
    5152 public: // with description
    5253      G4PSMinKinEAtGeneration(G4String name, G4int depth=0);
     54      G4PSMinKinEAtGeneration(G4String name, const G4String& unit,
     55                              G4int depth=0);
    5356
    5457  protected: // with description
    … …  
    6770      virtual void PrintAll();
    6871
     72      virtual void SetUnit(const G4String& unit);
     73
    6974  private:
    7075      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSMinKinEAtGeneration3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSMinKinEAtGeneration3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2007-08-14  Tsukasa ASO
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344//
    … …  
    4849   public: // with description
    4950      G4PSMinKinEAtGeneration3D(G4String name,
     51                     G4int ni=1,G4int nj=1, G4int nk=1,
     52                     G4int depi=2, G4int depj=1, G4int depk=0);
     53      G4PSMinKinEAtGeneration3D(G4String name,const G4String& unit,
    5054                     G4int ni=1,G4int nj=1, G4int nk=1,
    5155                     G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSNofCollision.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSNofCollision.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4141//
    4242// Created: 2007-2-2  Tsukasa ASO, Akinori Kimura.
     43// 2010-07-22   Introduce Unit specification.
    4344//
    4445///////////////////////////////////////////////////////////////////////////////
    … …  
    6970      virtual void PrintAll();
    7071
     72      virtual void SetUnit(const G4String& unit);
     73
    7174  private:
    7275      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSNofSecondary.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSNofSecondary.hh,v 1.4 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4646//                       particleDef is not set, it accepts all secondaies.
    4747//                       But onece user sets it, it accepts only the particle.
     48//          2010-07-22   Introduce Unit specification.
    4849//
    4950//
    … …  
    5960    // Scoring option
    6061      void SetParticle(const G4String& particleName);
     62
     63    inline void Weighted(G4bool flg=true) { weighted = flg; }
     64    // Multiply track weight
    6165
    6266  protected: // with description
    … …  
    7579      virtual void PrintAll();
    7680
     81      virtual void SetUnit(const G4String& unit);
     82
    7783  private:
    7884      G4int HCID;
    7985      G4THitsMap<G4double>* EvtMap;
    8086      G4ParticleDefinition* particleDef;
     87      G4bool weighted;
    8188
    8289  public:

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSNofStep.hh,v 1.2 2007/08/29 06:36:41 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSNofStep.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////
    … …  
    6566      virtual void PrintAll();
    6667
     68      virtual void SetUnit(const G4String& unit);
     69
    6770  public:
    6871      void  SetBoundaryFlag(G4bool flg=true)

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSNofStep3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSNofStep3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    3838//
    3939// Created: 2007-08-14  Tsukasa ASO
     40// 2010-07-22   Introduce Unit specification.
    4041//
    4142///////////////////////////////////////////////////////////////////////////////

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageCellCurrent.hh,v 1.1 2007/08/14 21:30:45 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageCellCurrent.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4242//
    4343// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     44// 2010-07-22   Introduce Unit specification.
     45// 2010-07-22   Add weighted option
    4446//
    4547///////////////////////////////////////////////////////////////////////////////
    … …  
    7072      virtual void PrintAll();
    7173
     74      virtual void SetUnit(const G4String& unit);
     75
    7276  private:
    7377      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageCellCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageCellCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4141//
    4242// Created: 2007-08-14  Tsukasa ASO
     43// 2010-07-22   Introduce Unit specification.
    4344//
    4445///////////////////////////////////////////////////////////////////////////////

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageCellFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageCellFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4646//
    4747// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     48// 2010-07-22   Introduce Unit specification.
     49// 2010-07-22   Add weighted option
    4850//
    4951///////////////////////////////////////////////////////////////////////////////
    … …  
    5456  public: // with description
    5557      G4PSPassageCellFlux(G4String name, G4int depth=0);
     58      G4PSPassageCellFlux(G4String name, const G4String& unit, G4int depth=0);
     59
    5660      virtual ~G4PSPassageCellFlux();
     61
     62      inline void Weighted(G4bool flg=true) { weighted = flg; }
     63      // Multiply track weight
    5764
    5865  protected: // with description
    … …  
    6774      virtual void PrintAll();
    6875
     76      virtual void SetUnit(const G4String& unit);
     77
     78  protected:
     79      virtual void DefineUnitAndCategory();
     80
    6981  private:
    7082      G4int HCID;
    … …  
    7284      G4double fCellFlux;
    7385      G4THitsMap<G4double>* EvtMap;
     86      G4bool  weighted;
    7487
    7588};

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageCellFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageCellFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4444//
    4545// Created: 2007-08-14  Tsukasa ASO
     46// 2010-07-22   Introduce Unit specification.
    4647///////////////////////////////////////////////////////////////////////////////
    4748
    … …  
    5152   public: // with description
    5253      G4PSPassageCellFlux3D(G4String name,
     54                            G4int ni=1,G4int nj=1, G4int nk=1,
     55                            G4int depi=2, G4int depj=1, G4int depk=0);
     56      G4PSPassageCellFlux3D(G4String name,const G4String& unit,
    5357                            G4int ni=1,G4int nj=1, G4int nk=1,
    5458                            G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageTrackLength.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageTrackLength.hh,v 1.2 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4242//
    4343// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
     44// 2010-07-22   Introduce Unit specification.
    4445//
    4546///////////////////////////////////////////////////////////////////////////////
    … …  
    5051  public: // with description
    5152      G4PSPassageTrackLength(G4String name, G4int depth=0);
     53      G4PSPassageTrackLength(G4String name, const G4String& unit,
     54                             G4int depth=0);
    5255      virtual ~G4PSPassageTrackLength();
    5356
    … …  
    6669      virtual void PrintAll();
    6770
     71      virtual void SetUnit(const G4String& unit);
     72
    6873  private:
    6974      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPassageTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPassageTrackLength3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4141//
    4242// Created: 2008-08-14  Tsukasa ASO
     43// 2010-07-22   Introduce Unit specification.
    4344//
    4445///////////////////////////////////////////////////////////////////////////////
    … …  
    4950  public: // with description
    5051      G4PSPassageTrackLength3D(G4String name,
     52                     G4int ni=1,G4int nj=1, G4int nk=1,
     53                     G4int depi=2, G4int depj=1, G4int depk=0);
     54      G4PSPassageTrackLength3D(G4String name,const G4String& unit,
    5155                     G4int ni=1,G4int nj=1, G4int nk=1,
    5256                     G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSPopulation.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSPopulation.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4343//
    4444// Created: 2007-02-02  Tsukasa ASO, Akinori Kimura.
     45// 2010-07-22   Introduce Unit specification.
    4546//
    4647///////////////////////////////////////////////////////////////////////////////
    … …  
    7172      virtual void PrintAll();
    7273
     74      virtual void SetUnit(const G4String& unit);
     75
    7376  private:
    7477      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceCurrent.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSSphereSurfaceCurrent.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5353// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
    5454//   17-Nov-2005 Bug fix. square definition.
    55 // 31-Mar-2007 T.Aso, Add option for normalizing by the area.
     55//   31-Mar-2007 T.Aso, Add option for normalizing by the area.
     56// 2010-07-22   Introduce Unit specification.
    5657//
    5758///////////////////////////////////////////////////////////////////////////////
    … …  
    6263  public: // with description
    6364      G4PSSphereSurfaceCurrent(G4String name, G4int direction, G4int depth=0);
     65      G4PSSphereSurfaceCurrent(G4String name, G4int direction,
     66                               const G4String& unit, G4int depth=0);
    6467      virtual ~G4PSSphereSurfaceCurrent();
    6568
    … …  
    8083      virtual void PrintAll();
    8184
     85      virtual void SetUnit(const G4String& unit);
     86
     87  protected:
     88      virtual void DefineUnitAndCategory();
     89
    8290  private:
    8391      G4int  HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSSphereSurfaceCurrent3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4848//
    4949// Created: 2007-08-14  Tsukasa ASO
     50// 2010-07-22   Introduce Unit specification.
    5051//
    5152///////////////////////////////////////////////////////////////////////////////
    … …  
    5859                                 G4int ni=1,G4int nj=1, G4int nk=1,
    5960                                 G4int depi=2, G4int depj=1, G4int depk=0);
     61      G4PSSphereSurfaceCurrent3D(G4String name, G4int direction,
     62                                 const G4String& unit,
     63                                 G4int ni=1,G4int nj=1, G4int nk=1,
     64                                 G4int depi=2, G4int depj=1, G4int depk=0);
     65
    6066                               
    6167      virtual ~G4PSSphereSurfaceCurrent3D();

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceFlux.hh,v 1.1 2007/07/11 01:29:28 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSSphereSurfaceFlux.hh,v 1.3 2010/07/22 23:42:01 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    5353// Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
    5454//   17-Nov-2005 Bug fix. square definition.
    55 // 29-Mar-2007  T.Aso,  Bug fix for momentum direction at outgoing flux.
     55// 29-Mar-2007  T.Aso,  Bug fix for momentum direction for out-going flux.
     56// 2010-07-22   Introduce Unit specification.
     57// 2010-07-22   Add weighted and divideByArea options
    5658//
    5759///////////////////////////////////////////////////////////////////////////////
    … …  
    6264  public: // with description
    6365      G4PSSphereSurfaceFlux(G4String name, G4int direction, G4int depth=0);
     66      G4PSSphereSurfaceFlux(G4String name, G4int direction,
     67                            const G4String& unit, G4int depth=0);
    6468      virtual ~G4PSSphereSurfaceFlux();
     69
     70      inline void Weighted(G4bool flg=true) { weighted = flg; }
     71      // Multiply track weight
     72
     73      inline void DivideByArea(G4bool flg=true) { divideByArea = flg; }
     74      // Divided by Area.
    6575
    6676  protected: // with description
    … …  
    7585      virtual void PrintAll();
    7686
     87      virtual void SetUnit(const G4String& unit);
     88
     89  protected:
     90      virtual void DefineUnitAndCategory();
     91
    7792  private:
    7893      G4int  HCID;
    7994      G4int  fDirection;
    8095      G4THitsMap<G4double>* EvtMap;
    81 
     96      G4bool weighted;
     97      G4bool divideByArea;
    8298};
    8399

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSSphereSurfaceFlux3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSSphereSurfaceFlux3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4949//
    5050// Created: 2007-08-14  Tsukasa ASO
     51// 2010-07-22   Introduce Unit specification.
    5152///////////////////////////////////////////////////////////////////////////////
    5253
    … …  
    5657  public: // with description
    5758      G4PSSphereSurfaceFlux3D(G4String name, G4int direction,
     59                              G4int ni=1,G4int nj=1, G4int nk=1,
     60                              G4int depi=2, G4int depj=1, G4int depk=0);
     61
     62      G4PSSphereSurfaceFlux3D(G4String name, G4int direction,
     63                              const G4String& unit,
    5864                              G4int ni=1,G4int nj=1, G4int nk=1,
    5965                              G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSTermination.hh,v 1.2 2007/12/10 16:29:35 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSTermination.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4141//
    4242// Created: 2007-2-2  Tsukasa ASO, Akinori Kimura.
     43// 2010-07-22   Introduce Unit specification.
    4344//
    4445///////////////////////////////////////////////////////////////////////////////
    … …  
    6970      virtual void PrintAll();
    7071
     72      virtual void SetUnit(const G4String& unit);   
     73
    7174  private:
    7275      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSTrackCounter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSTrackCounter.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4242//
    4343// Created: 2007-02-02  Tsukasa ASO, Akinori Kimura.
     44// 2010-07-22   Introduce Unit specification.
    4445//
    4546///////////////////////////////////////////////////////////////////////////////
    … …  
    6970      virtual void PrintAll();
    7071
     72      virtual void SetUnit(const G4String& unit);
     73
    7174  private:
    7275      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSTrackCounter3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSTrackCounter3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2007-08-14  Tsukasa ASO
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSTrackLength.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSTrackLength.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4343// Modified: 2007-02-02 Tsukasa ASO, Add MultiplyKineticEnergy()
    4444//                                  and DivideByVelocity().
     45//           2010-07-22   Introduce Unit specification.
    4546//
    4647//
    … …  
    5253 public: // with description
    5354      G4PSTrackLength(G4String name, G4int depth=0);
     55      G4PSTrackLength(G4String name, const G4String& unit, G4int depth=0);
    5456      virtual ~G4PSTrackLength();
    5557
    … …  
    5759      // Multiply track weight
    5860
    59       inline void MultiplyKineticEnergy(G4bool flg=true) { multiplyKinE = flg; }
     61      void MultiplyKineticEnergy(G4bool flg=true);
    6062      // Multiply Kinetic Energy
    6163
    62       inline void DivideByVelocity(G4bool flg=true) { divideByVelocity = flg; }
     64      void DivideByVelocity(G4bool flg=true);
    6365      // Divide by velocity
    6466
    … …  
    7476      virtual void PrintAll();
    7577
     78      virtual void SetUnit(const G4String& unit);
     79
     80  protected:
     81      virtual void DefineUnitAndCategory();
     82
    7683  private:
    7784      G4int HCID;

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4PSTrackLength3D.hh,v 1.2 2007/08/28 10:11:29 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4PSTrackLength3D.hh,v 1.3 2010/07/22 07:23:45 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4040//
    4141// Created: 2008-08-14  Tsukasa ASO
     42// 2010-07-22   Introduce Unit specification.
    4243//
    4344///////////////////////////////////////////////////////////////////////////////
    … …  
    4849 public: // with description
    4950      G4PSTrackLength3D(G4String name,
     51                     G4int ni=1,G4int nj=1, G4int nk=1,
     52                     G4int depi=2, G4int depj=1, G4int depk=0);
     53      G4PSTrackLength3D(G4String name, const G4String& unit,
    5054                     G4int ni=1,G4int nj=1, G4int nk=1,
    5155                     G4int depi=2, G4int depj=1, G4int depk=0);

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

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4SDParticleFilter.hh,v 1.2 2007/08/14 21:23:51 taso Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4SDParticleFilter.hh,v 1.3 2010/07/23 00:59:33 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4848//
    4949// Created: 2005-11-14  Tsukasa ASO.
     50// 2010-07-22 T.Aso Filter for Ions
    5051//
    5152///////////////////////////////////////////////////////////////////////////////
    … …  
    7273      // set method for acceptable particle name.
    7374      //
     75      void addIon(G4int Z, G4int A);
    7476      void show();
    7577
    7678  private:
    7779      std::vector<G4ParticleDefinition*> thePdef;
     80      std::vector<G4int> theIonZ;
     81      std::vector<G4int> theIonA;
    7882
    7983};
Note: See TracChangeset for help on using the changeset viewer.