Changeset 1007 for trunk/source/processes/hadronic/models/cascade/cascade

Timestamp:

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

Author:

garnier

Message:

update to geant4.9.2

Location:

trunk/source/processes/hadronic/models/cascade/cascade

Files:

• include/G4CascadSpecialFunctions.hh (modified) (1 diff)
• include/G4CascadeMomentum.hh (modified) (1 diff)
• include/G4ElementaryParticleCollider.hh (modified) (1 diff)
• include/G4NucleiModel.hh (modified) (2 diffs)
• src/G4CascadSpecialFunctions.cc (modified) (2 diffs)
• src/G4ElementaryParticleCollider.cc (modified) (8 diffs)
• src/G4IntraNucleiCascader.cc (modified) (2 diffs)
• src/G4NucleiModel.cc (modified) (3 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadSpecialFunctions.hh

@@ -45 +45 @@
                         G4int is);
 
-  void printCrossSections();
-
   std::pair<G4int, G4double> getPositionInEnergyScaleEMS(G4double e); 
 

trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeMomentum.hh

@@ -25 +25 @@
 //
 // $Id: G4CascadeMomentum.hh,v 1.1 2008/09/22 10:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

trunk/source/processes/hadronic/models/cascade/cascade/include/G4ElementaryParticleCollider.hh

@@ -46 +46 @@
                             G4InuclParticle* target);
 
-  G4bool HighEnergyFlag() const {
-    return high_energy;
-  }
-
 private:
 
+//   G4CascadeKplusPChannel kpp;
+//   G4CascadeKplusNChannel kpn;
+//   G4CascadeKzeroPChannel k0p;
+//   G4CascadeKzeroNChannel k0n;
+//   G4CascadeKminusPChannel kmp;
+//   G4CascadeKminusNChannel kmn;
+//   G4CascadeKzeroBarPChannel k0bp;
+//   G4CascadeKzeroBarNChannel k0bn;
+//   G4CascadeLambdaPChannel lp;
+//   G4CascadeLambdaNChannel ln;
+//   G4CascadeSigmaPlusPChannel spp;
+//   G4CascadeSigmaPlusNChannel spn;
+//   G4CascadeSigmaZeroPChannel s0p;
+//   G4CascadeSigmaZeroNChannel s0n;
+//   G4CascadeSigmaMinusPChannel smp;
+//   G4CascadeSigmaMinusNChannel smn;
+//   G4CascadeXiZeroPChannel x0p;
+//   G4CascadeXiZeroNChannel x0n;
+//   G4CascadeXiMinusPChannel xmp;
+//   G4CascadeXiMinusNChannel xmn;
+
   G4int verboseLevel;
-  mutable G4bool high_energy;     // Flag indicates beginning of string-like behavior
-
-  G4int generateMultiplicity(G4int is, G4double ekin) const;
+  G4int generateMultiplicity(G4int is, 
+                             G4double ekin) const;
 
   void collide(G4InuclElementaryParticle* bullet,

trunk/source/processes/hadronic/models/cascade/cascade/include/G4NucleiModel.hh

@@ -133 +133 @@
   G4CascadParticle initializeCascad(G4InuclElementaryParticle* particle);
 
-  std::pair<std::vector<G4CascadParticle>, std::vector<G4InuclElementaryParticle> > 
-  initializeCascad(G4InuclNuclei* bullet, G4InuclNuclei* target);
+  std::pair<std::vector<G4CascadParticle>, std::vector<G4InuclElementaryParticle> > initializeCascad(G4InuclNuclei* bullet, G4InuclNuclei* target);
 
   std::pair<G4int, G4int> getTypesOfNucleonsInvolved() const {
     return std::pair<G4int, G4int>(current_nucl1, current_nucl2);
   };
-
   G4bool worthToPropagate(const G4CascadParticle& cparticle) const; 
     
@@ -145 +143 @@
                                             G4int zone) const;
 
-  G4bool highEnergyInteraction() const {
-    return high_energy_interaction;
-  }
-
-private:
- 
-  G4int verboseLevel;
-  G4bool high_energy_interaction;
-
+private: 
+G4int verboseLevel;
   G4bool passFermi(const std::vector<G4InuclElementaryParticle>& particles, 
                    G4int zone);

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

@@ -113 +113 @@
   }
 
-  // was 0.2 since the beginning 
-  const G4double corr_fac = 1.0;
+  const G4double corr_fac = 0.2;
   G4double csec = 0.0;
   
@@ -177 +176 @@
 
   return std::pair<G4int, G4double>(ik, sk);
-}
-
-void
-G4CascadSpecialFunctions::printCrossSections()
-{
-  const G4double ke[74] =
-    {0.00, 0.01, 0.02, 0.03, 0.04, 0.05, 0.06, 0.07, 0.08, 0.09, 0.10,
-     0.11, 0.12, 0.13, 0.14, 0.15, 0.16, 0.17, 0.18, 0.19, 0.20, 0.25,
-     0.30, 0.35, 0.40, 0.45, 0.50, 0.55, 0.60, 0.65, 0.70, 0.75, 0.80,
-     0.85, 0.90, 0.95, 1.00, 1.05, 1.10, 1.15, 1.20, 1.25, 1.30, 1.35,
-     1.40, 1.45, 1.50, 1.55, 1.60, 1.65, 1.70, 1.75, 1.80, 1.85, 1.90,
-     1.95, 2.00, 2.20, 2.40, 2.60, 2.80, 3.00, 4.00, 5.00, 6.00, 7.00,
-     8.00, 9.00, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0};
-
-  const G4String channel_names[7] = {"pp", "pn", "pi+p", "nn", "pi-p", "pi+n", "pi0p"}; 
-
-  G4cout << " Kinetic energies in GeV " << G4endl;
-  for (G4int i = 0; i < 12; i++) {
-    G4int istart = i*6;
-    G4int istop = istart + 6;
-    for (G4int e = istart; e < istop; e++) G4cout << ke[e] << "  " ;
-    G4cout << G4endl;
-  }
-  G4cout << G4endl;
-
-  for (G4int channel = 1; channel < 8; channel++) {
-    G4cout << " Channel " << channel_names[channel-1] << G4endl;
-    for (G4int i = 0; i < 12; i++) {
-      G4int istart = i*6;
-      G4int istop = istart + 6;
-      for (G4int t = istart; t < istop; t++) G4cout << crossSection(ke[t], channel) << "  " ;
-      G4cout << G4endl;
-    }
-    G4cout << G4endl; 
-  }
 }
 

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

@@ -54 +54 @@
 
 G4ElementaryParticleCollider::G4ElementaryParticleCollider()
-  : verboseLevel(1), high_energy(false) 
+  : verboseLevel(1) 
 {
   if (verboseLevel > 3) {
     G4cout << " >>> G4ElementaryParticleCollider ctor " << G4endl;
-
-    printCrossSections();
   }
 }
@@ -177 +175 @@
 G4int 
 G4ElementaryParticleCollider::generateMultiplicity(G4int is, 
-                                                   G4double ekin) const
+                                                   G4double ekin) const 
 {
   if (verboseLevel > 3) {
@@ -379 +377 @@
     G4double sl = inuclRndm();
     G4double ptot = 0.0;
-    mul = 5;
-    high_energy = true;
-
+
+    mul = 4;
     for (G4int i = 0; i < 5; i++) {
       ptot += sigm[i] / stot;
@@ -387 +384 @@
       if (sl <= ptot) {
         mul = i;
-        high_energy = false;
         break;
       } 
@@ -537 +533 @@
     } else { // 2 -> many
 
-      if (high_energy) multiplicity = 6;
-
       if ( (is > 10 && is < 14) || (is > 14 && is < 63) ) {
         particle_kinds =
@@ -704 +698 @@
             };
           }; 
-        };
+        };
       };
 
@@ -715 +709 @@
 
       };
-    }  // 2->many
+    };
   }; 
 
@@ -724 +718 @@
   return particles;
 }
-
 
 std::vector<G4double> 

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.

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

@@ -54 +54 @@
 
 G4NucleiModel::G4NucleiModel()
-  : verboseLevel(2), high_energy_interaction(false) {
+  : verboseLevel(2) {
 
   if (verboseLevel > 3) {
@@ -760 +760 @@
 }
 
-std::vector<G4CascadParticle> 
-G4NucleiModel::generateParticleFate(G4CascadParticle& cparticle,
-                                    G4ElementaryParticleCollider* theElementaryParticleCollider) {
+std::vector<G4CascadParticle> G4NucleiModel::generateParticleFate(G4CascadParticle& cparticle,
+                                                                    G4ElementaryParticleCollider* theElementaryParticleCollider) {
 
   if (verboseLevel > 3) {
@@ -814 +813 @@
 
         G4CollisionOutput output = theElementaryParticleCollider->collide(&bullet, &target);
-        high_energy_interaction = theElementaryParticleCollider->HighEnergyFlag();
 
         if (verboseLevel > 2){