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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4PSNofCollision.cc,v 1.1 2007/07/11 01:31:02 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PSNofCollision.cc,v 1.3 2010/07/23 04:35:38 taso Exp $
+// GEANT4 tag $Name:  $
 //
 // G4PSNofCollision
@@ -37 +37 @@
 //
 // Created: 2007-02-02  Tsukasa ASO, Akinori Kimura.
+// 2010-07-22   Introduce Unit specification.
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -42 +43 @@
 G4PSNofCollision::G4PSNofCollision(G4String name, G4int depth)
   :G4VPrimitiveScorer(name,depth),HCID(-1),weighted(false)
-{;}
+{
+    SetUnit("");
+}
 
 G4PSNofCollision::~G4PSNofCollision()
@@ -83 +86 @@
   for(; itr != EvtMap->GetMap()->end(); itr++) {
     G4cout << "  copy no.: " << itr->first
-           << "  collisions: " << *(itr->second)
+           << "  collisions: " << *(itr->second)/GetUnitValue()
+           << " [collision] "
            << G4endl;
   }
 }
 
+
+void G4PSNofCollision::SetUnit(const G4String& unit)
+{
+  if (unit == "" ){
+    unitName = unit;
+    unitValue = 1.0;
+  }else{
+      G4String msg = "Invalid unit ["+unit+"] (Current  unit is [" +GetUnit()+"] )";
+      G4Exception(GetName(),"DetScorer0000",JustWarning,msg);
+  }
+}
+
+