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

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

@@ -25 +25 @@
 //
 //
-// $Id: G4SDParticleFilter.cc,v 1.1 2007/07/11 01:31:03 asaim Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4SDParticleFilter.cc,v 1.2 2010/07/23 00:59:58 taso Exp $
+// GEANT4 tag $Name:  $
 //
 // G4VSensitiveDetector
@@ -49 +49 @@
 {
   thePdef.clear();
+  theIonZ.clear();
+  theIonA.clear();
 }
 
@@ -66 +68 @@
   }
   thePdef.push_back(pd);
+  theIonZ.clear();
+  theIonA.clear();
 }
 
@@ -84 +88 @@
    }
    thePdef.push_back(pd);
+   theIonZ.clear();
+   theIonA.clear();
   }
 }
@@ -89 +95 @@
 G4SDParticleFilter::G4SDParticleFilter(G4String name, 
                        const std::vector<G4ParticleDefinition*>& particleDef)
-  :G4VSDFilter(name), thePdef(particleDef)
+    :G4VSDFilter(name), thePdef(particleDef)
 {
   for ( size_t i = 0; i < particleDef.size(); i++){
@@ -95 +101 @@
        "NULL pointer is found in the given particleDef vector.");
   }
+  theIonZ.clear();
+  theIonA.clear();
 }
 
@@ -100 +108 @@
 { 
   thePdef.clear();
-}
+  theIonZ.clear();
+  theIonA.clear();
+      }
 
 G4bool G4SDParticleFilter::Accept(const G4Step* aStep) const
 {
+ 
   for ( size_t i = 0; i < thePdef.size(); i++){
     if ( thePdef[i] == aStep->GetTrack()->GetDefinition() ) return TRUE;
   }
+
+  // Ions by Z,A
+  for ( size_t i = 0; i < theIonZ.size(); i++){
+    if ( theIonZ[i] == aStep->GetTrack()->GetDefinition()->GetAtomicNumber() 
+         && theIonA[i] == aStep->GetTrack()->GetDefinition()->GetAtomicMass() ){
+        return TRUE;
+    }
+  }
+
   return FALSE;
 }
@@ -128 +148 @@
 }
 
+void G4SDParticleFilter::addIon(G4int Z, G4int A){
+    for ( size_t i = 0; i < theIonZ.size(); i++){
+        if ( theIonZ[i] == Z && theIonA[i] == A ){
+            G4cout << "G4SDParticleFilter:: Ion has been already registered."<<G4endl;
+            return;
+        }
+    }
+    theIonZ.push_back(Z);
+    theIonA.push_back(A);
+}
+
 void G4SDParticleFilter::show(){
   G4cout << "----G4SDParticleFileter particle list------"<<G4endl;
   for ( size_t i = 0; i < thePdef.size(); i++){
     G4cout << thePdef[i]->GetParticleName() << G4endl;
+  }
+  for ( size_t i = 0; i < theIonZ.size(); i++){
+      G4cout << " Ion PrtclDef (" << theIonZ[i]<<","<<theIonA[i]<<")"
+             << G4endl;
   }
   G4cout << "-------------------------------------------"<<G4endl;