Changeset 1007 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc

Timestamp:

Apr 20, 2009, 5:54:05 PM (15 years ago)

Author:

garnier

Message:

update to geant4.9.2

File:

• trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/src/G4IntraNucleiCascader.cc

@@ -158 +158 @@
                                                         theElementaryParticleCollider);
       if (verboseLevel > 2) {
-        G4cout << " New particles from G4NucleiModel::generateParticleFate " 
-               << new_cascad_particles.size() << G4endl;
+        G4cout << " ew particles " << new_cascad_particles.size() << G4endl;
       }
 
@@ -219 +218 @@
         } 
 
-      } else if (model.highEnergyInteraction() ) { // high energy projectile-nucleon interaction
+      } else { // interaction 
+
         cascad_particles.pop_back();
-        for (G4int i = 0; i < G4int(new_cascad_particles.size()); i++) {
-          // send secondaries straight to output - no further cascade
-          // for now, don't check for Coulomb barrier? 
-          output_particles.push_back(new_cascad_particles[i].getParticle() );
-        }
-        std::pair<G4int, G4int> holes = model.getTypesOfNucleonsInvolved();
-        theExitonConfiguration.incrementHoles(holes.first);
-        if (holes.second > 0) theExitonConfiguration.incrementHoles(holes.second);
-
-      } else { // medium energy projectile-nucleon interaction
-        cascad_particles.pop_back();
+
         for (G4int i = 0; i < G4int(new_cascad_particles.size()); i++) 
           cascad_particles.push_back(new_cascad_particles[i]);
+
         std::pair<G4int, G4int> holes = model.getTypesOfNucleonsInvolved();
+
         theExitonConfiguration.incrementHoles(holes.first);
+
         if (holes.second > 0) theExitonConfiguration.incrementHoles(holes.second);
-      }
-    }
+
+      };
+    };
 
     // Cascade is finished. Check if it's OK.