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

update ti head

Location:
trunk/source/digits_hits/detector
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/digits_hits/detector/CVS/Entries

    r1337 r1340  
    11D/include////
    22D/src////
    3 /GNUmakefile/1.3/Wed Sep 29 21:47:24 2010//Tgeant4-09-04-beta-01
    4 /History/1.6/Wed Sep 29 21:47:24 2010//Tgeant4-09-04-beta-01
     3/CMakeLists.txt/1.1/Wed Sep 29 18:37:57 2010//
     4/sources.cmake/1.1/Wed Sep 29 18:38:06 2010//
     5/GNUmakefile/1.5/Fri Nov  5 10:01:04 2010//
     6/History/1.6/Wed Sep 29 21:47:24 2010//

  • trunk/source/digits_hits/detector/GNUmakefile

    r814 r1340  
    1 # $Id: GNUmakefile,v 1.3 2004/06/11 14:10:29 gcosmo Exp $
     1# $Id: GNUmakefile,v 1.5 2010/10/27 08:10:13 gcosmo Exp $
    22# --------------------------------------------------------------
    33# GNUmakefile for digits+hits library.  Makoto Asai, 1/11/96.

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

    r1337 r1340  
    1 /G4CellScoreComposer.hh/1.2/Wed Sep 29 21:47:24 2010//Tgeant4-09-04-beta-01
    2 /G4CellScoreValues.hh/1.2/Wed Sep 29 21:47:24 2010//Tgeant4-09-04-beta-01
    3 /G4CollectionNameVector.hh/1.2/Wed Sep 29 21:47:24 2010//Tgeant4-09-04-beta-01
    4 /G4HCtable.hh/1.3/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    5 /G4MultiFunctionalDetector.hh/1.3/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    6 /G4SDManager.hh/1.4/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    7 /G4SDStructure.hh/1.3/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    8 /G4SDmessenger.hh/1.2/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    9 /G4SensitiveVolumeList.hh/1.2/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    10 /G4SensitiveVolumeList.icc/1.2/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    11 /G4TrackLogger.hh/1.2/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    12 /G4VPrimitiveScorer.hh/1.3/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    13 /G4VReadOutGeometry.hh/1.3/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    14 /G4VSDFilter.hh/1.2/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
    15 /G4VSensitiveDetector.hh/1.4/Wed Sep 29 21:47:25 2010//Tgeant4-09-04-beta-01
     1/G4CellScoreComposer.hh/1.2/Wed Sep 29 21:47:24 2010//
     2/G4CellScoreValues.hh/1.2/Wed Sep 29 21:47:24 2010//
     3/G4CollectionNameVector.hh/1.2/Wed Sep 29 21:47:24 2010//
     4/G4HCtable.hh/1.3/Wed Sep 29 21:47:25 2010//
     5/G4MultiFunctionalDetector.hh/1.3/Wed Sep 29 21:47:25 2010//
     6/G4SDManager.hh/1.4/Wed Sep 29 21:47:25 2010//
     7/G4SDStructure.hh/1.3/Wed Sep 29 21:47:25 2010//
     8/G4SDmessenger.hh/1.2/Wed Sep 29 21:47:25 2010//
     9/G4SensitiveVolumeList.hh/1.2/Wed Sep 29 21:47:25 2010//
     10/G4SensitiveVolumeList.icc/1.2/Wed Sep 29 21:47:25 2010//
     11/G4TrackLogger.hh/1.2/Wed Sep 29 21:47:25 2010//
     12/G4VReadOutGeometry.hh/1.3/Wed Sep 29 21:47:25 2010//
     13/G4VSDFilter.hh/1.2/Wed Sep 29 21:47:25 2010//
     14/G4VSensitiveDetector.hh/1.4/Wed Sep 29 21:47:25 2010//
     15/G4VPrimitiveScorer.hh/1.6/Fri Nov  5 10:01:08 2010//
    1616D

  • trunk/source/digits_hits/detector/include/G4VPrimitiveScorer.hh

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VPrimitiveScorer.hh,v 1.3 2007/08/28 07:51:45 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VPrimitiveScorer.hh,v 1.6 2010/07/22 07:36:50 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030
    … …  
    4646// used either as a sensitive detector or to be registered to
    4747// G4MultiFunctionalDetector to define multiple functionalities.
     48//
     49//
    4850
    4951class G4VPrimitiveScorer
    … …  
    7880      // These methods are invoked by G4SDManager through G4MultiFunctionalDetector.
    7981
     82       virtual void SetUnit(const G4String& unit)=0;
     83       G4String GetUnit() const { return unitName;}
     84       G4double  GetUnitValue() const { return unitValue;}
     85
     86  protected:
     87     void CheckAndSetUnit(const G4String& unit,const G4String& category);
     88
    8089  protected:
    8190      G4String primitiveName;
    … …  
    8493      G4int verboseLevel;
    8594      G4int indexDepth;
     95      G4String unitName;
     96      G4double unitValue;
    8697
    8798  public: // with description

  • trunk/source/digits_hits/detector/src/CVS/Entries

    r1337 r1340  
    1 /G4CellScoreComposer.cc/1.3/Wed Sep 29 21:47:29 2010//Tgeant4-09-04-beta-01
    2 /G4HCtable.cc/1.4/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    3 /G4MultiFunctionalDetector.cc/1.5/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    4 /G4SDManager.cc/1.4/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    5 /G4SDStructure.cc/1.3/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    6 /G4SDmessenger.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    7 /G4SensitiveVolumeList.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    8 /G4TrackLogger.cc/1.3/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    9 /G4VPrimitiveScorer.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-01
    10 /G4VReadOutGeometry.cc/1.2/Wed Sep 29 21:47:36 2010//Tgeant4-09-04-beta-01
    11 /G4VSDFilter.cc/1.2/Wed Sep 29 21:47:37 2010//Tgeant4-09-04-beta-01
    12 /G4VSensitiveDetector.cc/1.3/Wed Sep 29 21:47:37 2010//Tgeant4-09-04-beta-01
     1/G4CellScoreComposer.cc/1.3/Wed Sep 29 21:47:29 2010//
     2/G4HCtable.cc/1.4/Wed Sep 29 21:47:30 2010//
     3/G4SDManager.cc/1.4/Wed Sep 29 21:47:30 2010//
     4/G4SDStructure.cc/1.3/Wed Sep 29 21:47:30 2010//
     5/G4SDmessenger.cc/1.2/Wed Sep 29 21:47:30 2010//
     6/G4SensitiveVolumeList.cc/1.2/Wed Sep 29 21:47:30 2010//
     7/G4TrackLogger.cc/1.3/Wed Sep 29 21:47:30 2010//
     8/G4VReadOutGeometry.cc/1.2/Wed Sep 29 21:47:36 2010//
     9/G4VSDFilter.cc/1.2/Wed Sep 29 21:47:37 2010//
     10/G4VSensitiveDetector.cc/1.3/Wed Sep 29 21:47:37 2010//
     11/G4MultiFunctionalDetector.cc/1.6/Fri Nov  5 10:01:08 2010//
     12/G4VPrimitiveScorer.cc/1.5/Fri Nov  5 10:01:08 2010//
    1313D

  • trunk/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4MultiFunctionalDetector.cc,v 1.5 2008/03/06 23:31:12 asaim Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4MultiFunctionalDetector.cc,v 1.6 2010/07/23 02:07:23 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// G4MultiFunctionalDetector
     31//
     32// 2010-07-23 T.Aso Call PS if the step length or energy deposit is not zero.
     33//       
     34//
    3135#include "G4MultiFunctionalDetector.hh"
    3236#include "G4SDManager.hh"
    … …  
    4246G4bool G4MultiFunctionalDetector::ProcessHits(G4Step* aStep,G4TouchableHistory* aTH)
    4347{
    44    G4int nPrim = primitives.size();
    45    for(G4int iPrim=0;iPrim<nPrim;iPrim++)
    46    { if(aStep->GetStepLength()>0.) primitives[iPrim]->HitPrimitive(aStep,aTH); }
     48    if(aStep->GetStepLength()>0. || aStep->GetTotalEnergyDeposit()>0.){
     49        G4int nPrim = primitives.size();
     50        for(G4int iPrim=0;iPrim<nPrim;iPrim++)
     51        {
     52            primitives[iPrim]->HitPrimitive(aStep,aTH);
     53        }
     54    }
    4755   return true;
    4856}

  • trunk/source/digits_hits/detector/src/G4VPrimitiveScorer.cc

    r1337 r1340  
    2525//
    2626//
    27 // $Id: G4VPrimitiveScorer.cc,v 1.2 2006/06/29 18:06:03 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VPrimitiveScorer.cc,v 1.5 2010/07/23 04:34:59 taso Exp $
     28// GEANT4 tag $Name: $
    2929//
    3030// G4VPrimitiveScorer
    … …  
    3434#include "G4Step.hh"
    3535#include "G4TouchableHistory.hh"
    36 
     36#include "G4UnitsTable.hh"
    3737
    3838G4VPrimitiveScorer::G4VPrimitiveScorer(G4String name, G4int depth)
    39  :primitiveName(name),detector(0),filter(0),verboseLevel(0),indexDepth(depth)
     39  :primitiveName(name),detector(0),filter(0),verboseLevel(0),indexDepth(depth),
     40   unitName("NoUnit"),unitValue(1.0)
    4041{;}
    4142
    … …  
    7475}
    7576
     77void G4VPrimitiveScorer::CheckAndSetUnit(const G4String& unit,
     78                                         const G4String& category){
     79    if ( G4UnitDefinition::GetCategory(unit) == category){
     80        unitName = unit;
     81        unitValue = G4UnitDefinition::GetValueOf(unit);
     82    } else {
     83        G4String msg = "Invalid unit ["+unit+"] (Current  unit is [" +GetUnit()+"] )";
     84        G4Exception(GetName(),"DetPS0000",JustWarning,msg);
     85    }
     86}
Note: See TracChangeset for help on using the changeset viewer.