Changeset 1340 for trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/digits_hits/scorer/src/G4PSDoseDeposit.cc (modified) (6 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PSDoseDeposit.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PSDoseDeposit.cc,v 1.5 2010/09/16 06:44:44 asaim Exp $
+// GEANT4 tag $Name:  $
 //
 // G4PSDoseDeposit
@@ -41 +41 @@
 //
 // Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
+// 2010-07-22   Introduce Unit specification.
 // 
 ///////////////////////////////////////////////////////////////////////////////
@@ -46 +47 @@
 G4PSDoseDeposit::G4PSDoseDeposit(G4String name, G4int depth)
   :G4VPrimitiveScorer(name,depth),HCID(-1)
-{;}
+{
+    SetUnit("Gy");
+}
+
+G4PSDoseDeposit::G4PSDoseDeposit(G4String name, const G4String& unit,
+                                 G4int depth)
+  :G4VPrimitiveScorer(name,depth),HCID(-1)
+{
+    SetUnit(unit);
+}
 
 G4PSDoseDeposit::~G4PSDoseDeposit()
@@ -63 +73 @@
     G4int idx = ((G4TouchableHistory*)(aStep->GetPreStepPoint()->GetTouchable()))
                 ->GetReplicaNumber(indexDepth);
+    if(idx<0)
+    {
+      G4Exception("G4PSDoseDeposit","G4PSDoseDeposit::ProcessHits",JustWarning,
+                  "Incorrect replica number");
+      G4cerr << " --- GetReplicaNumber : " << idx << G4endl;
+    }
     solid = physParam->ComputeSolid(idx, physVol);
     solid->ComputeDimensions(physParam,idx,physVol);
@@ -71 +87 @@
   }
 
-  G4double density = aStep->GetTrack()->GetMaterial()->GetDensity();
+  G4double density = aStep->GetTrack()->GetStep()->GetPreStepPoint()->GetMaterial()->GetDensity();
   G4double dose    = edep / ( density * (solid->GetCubicVolume()) );
   dose *= aStep->GetPreStepPoint()->GetWeight(); 
@@ -106 +122 @@
   for(; itr != EvtMap->GetMap()->end(); itr++) {
     G4cout << "  copy no.: " << itr->first
-           << "  dose deposit: " << G4BestUnit(*(itr->second),"Dose")
+           << "  dose deposit: " 
+           << *(itr->second)/GetUnitValue()
+           << " ["<<GetUnit() <<"]"
            << G4endl;
   }
 }
 
+void G4PSDoseDeposit::SetUnit(const G4String& unit)
+{
+        CheckAndSetUnit(unit,"Dose");
+}
+
+
+