Changeset 1340 for trunk/source/digits_hits/detector/src
- Timestamp:
- Nov 5, 2010, 3:45:55 PM (14 years ago)
- Location:
- trunk/source/digits_hits/detector/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
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-012 /G4HCtable.cc/1.4/Wed Sep 29 21:47:30 2010// Tgeant4-09-04-beta-013 /G4 MultiFunctionalDetector.cc/1.5/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-014 /G4SD Manager.cc/1.4/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-015 /G4SD Structure.cc/1.3/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-016 /G4S Dmessenger.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-017 /G4 SensitiveVolumeList.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-018 /G4 TrackLogger.cc/1.3/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-019 /G4V PrimitiveScorer.cc/1.2/Wed Sep 29 21:47:30 2010//Tgeant4-09-04-beta-0110 /G4V ReadOutGeometry.cc/1.2/Wed Sep 29 21:47:36 2010//Tgeant4-09-04-beta-0111 /G4 VSDFilter.cc/1.2/Wed Sep 29 21:47:37 2010//Tgeant4-09-04-beta-0112 /G4V SensitiveDetector.cc/1.3/Wed Sep 29 21:47:37 2010//Tgeant4-09-04-beta-011 /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// 13 13 D -
trunk/source/digits_hits/detector/src/G4MultiFunctionalDetector.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4MultiFunctionalDetector.cc,v 1. 5 2008/03/06 23:31:12 asaimExp $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: $ 29 29 // 30 30 // G4MultiFunctionalDetector 31 // 32 // 2010-07-23 T.Aso Call PS if the step length or energy deposit is not zero. 33 // 34 // 31 35 #include "G4MultiFunctionalDetector.hh" 32 36 #include "G4SDManager.hh" … … 42 46 G4bool G4MultiFunctionalDetector::ProcessHits(G4Step* aStep,G4TouchableHistory* aTH) 43 47 { 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 } 47 55 return true; 48 56 } -
trunk/source/digits_hits/detector/src/G4VPrimitiveScorer.cc
r1337 r1340 25 25 // 26 26 // 27 // $Id: G4VPrimitiveScorer.cc,v 1. 2 2006/06/29 18:06:03 gunterExp $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: $ 29 29 // 30 30 // G4VPrimitiveScorer … … 34 34 #include "G4Step.hh" 35 35 #include "G4TouchableHistory.hh" 36 36 #include "G4UnitsTable.hh" 37 37 38 38 G4VPrimitiveScorer::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) 40 41 {;} 41 42 … … 74 75 } 75 76 77 void 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.