Changeset 1340 for trunk/source/digits_hits/scorer/src/G4PSPassageCellFlux.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/G4PSPassageCellFlux.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PSPassageCellFlux.cc,v 1.2 2008/12/28 20:32:00 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PSPassageCellFlux.cc,v 1.4 2010/07/22 23:42:01 taso Exp $
+// GEANT4 tag $Name:  $
 //
 // G4PSPassageCellFlux
@@ -47 +47 @@
 //
 // Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
+// 2010-07-22   Introduce Unit specification.
+// 2010-07-22   Add weighted option
 // 
 ///////////////////////////////////////////////////////////////////////////////
 
 G4PSPassageCellFlux::G4PSPassageCellFlux(G4String name, G4int depth)
+    :G4VPrimitiveScorer(name,depth),HCID(-1),fCurrentTrkID(-1),fCellFlux(0),
+     weighted(true)
+{
+    DefineUnitAndCategory();
+    SetUnit("percm2");
+}
+
+G4PSPassageCellFlux::G4PSPassageCellFlux(G4String name, const G4String& unit,
+                                         G4int depth)
   :G4VPrimitiveScorer(name,depth),HCID(-1),fCurrentTrkID(-1),fCellFlux(0)
-{;}
+{
+    DefineUnitAndCategory();
+    SetUnit(unit);
+}
 
 G4PSPassageCellFlux::~G4PSPassageCellFlux()
@@ -92 +106 @@
   G4int  trkid  = aStep->GetTrack()->GetTrackID();
   G4double trklength  = aStep->GetStepLength();
-  trklength *= aStep->GetPreStepPoint()->GetWeight();
+  if ( weighted ) trklength *= aStep->GetPreStepPoint()->GetWeight();
 
   if ( IsEnter &&IsExit ){         // Passed at one step
@@ -143 +157 @@
   for(; itr != EvtMap->GetMap()->end(); itr++) {
     G4cout << "  copy no.: " << itr->first
-           << "  cell flux : " << *(itr->second)*cm*cm << " [cm^-2]"
+           << "  cell flux : " << *(itr->second)/GetUnitValue()
+           << " [" << GetUnit()
            << G4endl;
   }
 }
 
+void G4PSPassageCellFlux::SetUnit(const G4String& unit)
+{
+    CheckAndSetUnit(unit,"Per Unit Surface");
+}
+
+void G4PSPassageCellFlux::DefineUnitAndCategory(){
+   // Per Unit Surface
+   new G4UnitDefinition("percentimeter2","percm2","Per Unit Surface",(1./cm2));
+   new G4UnitDefinition("permillimeter2","permm2","Per Unit Surface",(1./mm2));
+   new G4UnitDefinition("permeter2","perm2","Per Unit Surface",(1./m2));
+}
+
+