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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PSSphereSurfaceFlux.cc,v 1.3 2009/11/14 00:01:13 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PSSphereSurfaceFlux.cc,v 1.7 2010/07/23 04:35:38 taso Exp $
+// GEANT4 tag $Name:  $
 //
 // G4PSSphereSurfaceFlux
@@ -50 +50 @@
 // Created: 2005-11-14  Tsukasa ASO, Akinori Kimura.
 // 29-Mar-2007  T.Aso,  Bug fix for momentum direction at outgoing flux.
+// 2010-07-22   Introduce Unit specification.
+// 2010-07-22   Add weighted and divideByAre options
 // 
 ///////////////////////////////////////////////////////////////////////////////
@@ -55 +57 @@
 G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(G4String name, 
                                          G4int direction, G4int depth)
+    :G4VPrimitiveScorer(name,depth),HCID(-1),fDirection(direction),
+     weighted(true),divideByArea(true)
+{
+    DefineUnitAndCategory();
+    SetUnit("percm2");
+}
+
+G4PSSphereSurfaceFlux::G4PSSphereSurfaceFlux(G4String name, 
+                                             G4int direction,
+                                             const G4String& unit,
+                                             G4int depth)
   :G4VPrimitiveScorer(name,depth),HCID(-1),fDirection(direction)
-{;}
+{
+    DefineUnitAndCategory();
+    SetUnit(unit);
+}
 
 G4PSSphereSurfaceFlux::~G4PSSphereSurfaceFlux()
@@ -79 +95 @@
   }
 
-//  if( solid->GetEntityType() != "G4Sphere" ){
-//    G4Exception("G4PSSphereSurfaceFluxScorer. - Solid type is not supported.");
-//    return FALSE;
-//  }
   G4Sphere* sphereSolid = (G4Sphere*)(solid);
 
@@ -122 +134 @@
       G4double square = radi*radi*dph*( -std::cos(enth) + std::cos(stth) );
 
-      G4double current = thisStep->GetWeight(); // Flux (Particle Weight)
-      current = current/square;  // Flux with angle.
+      G4double current = 1.0;
+      if ( weighted ) thisStep->GetWeight(); // Flux (Particle Weight)
+      if ( divideByArea ) current = current/square;  // Flux with angle.
 
       current /= anglefactor;
@@ -205 +218 @@
   for(; itr != EvtMap->GetMap()->end(); itr++) {
     G4cout << "  copy no.: " << itr->first
-           << "  current  : " << *(itr->second)
+           << "  current  : " << *(itr->second)/GetUnitValue()
+           << " ["<<GetUnit()<<"]"
            << G4endl;
   }
 }
 
+void G4PSSphereSurfaceFlux::SetUnit(const G4String& unit)
+{
+    if ( divideByArea ) {
+        CheckAndSetUnit(unit,"Per Unit Surface");
+    } else {
+        if (unit == "" ){
+            unitName = unit;
+            unitValue = 1.0;
+        }else{
+            G4String msg = "Invalid unit ["+unit+"] (Current  unit is [" +GetUnit()+"] )";
+            G4Exception(GetName(),"DetScorer0000",JustWarning,msg);
+        }
+    }
+}
+
+void G4PSSphereSurfaceFlux::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));
+}
+