Changeset 1055 for trunk/source/processes/hadronic/models/qmd

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

Location:

trunk/source/processes/hadronic/models/qmd

Files:

• GNUmakefile (modified) (2 diffs)
• History (modified) (1 diff)
• include/G4QMDReaction.hh (modified) (4 diffs)
• src/G4QMDCollision.cc (modified) (5 diffs)
• src/G4QMDReaction.cc (modified) (5 diffs)

trunk/source/processes/hadronic/models/qmd/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.1 2007/11/17 16:27:35 dennis Exp $
+# $Id: GNUmakefile,v 1.2 2008/11/22 06:30:46 tkoi Exp $
 # -----------------------------------------------------------
 # GNUmakefile for hadronic library.  Gabriele Cosmo, 18/9/96.
@@ -27 +27 @@
             -I$(G4BASE)/processes/hadronic/models/management/include \
             -I$(G4BASE)/processes/hadronic/models/util/include \
+            -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
+            -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
             -I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
+            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
+            -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
+            -I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
+            -I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
+            -I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
+            -I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
             -I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
             -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \

trunk/source/processes/hadronic/models/qmd/History

@@ -13 +13 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+31-March-2009 Tatsumi Koi (hadr-qmd-V09-02-01)
+- Fix bug in gamma(mass zero) partiticpants
+        src/G4QMDCollision.cc  
+- Chnage meber object to pointer
+        include/G4QMDReaction.hh  
+        src/G4QMDReaction.cc  
+
+28-February-2009 Tatsumi Koi (hadr-qmd-V09-02-00)
+- Fix bug in Absorption 
+        src/G4QMDCollision.cc  
+- Add Be8 -> Alpha Alpha including opening angle by Q value  
+        src/G4QMDReaction.cc  
 
 20-November-2008 Tatsumi Koi (hadr-qmd-V09-01-08)

trunk/source/processes/hadronic/models/qmd/include/G4QMDReaction.hh

@@ -28 +28 @@
 //
 //
-//      File name:    G4QMDReaction.hh 
+//      File name: G4QMDReaction.hh 
 //
 //      Author: Koi, Tatsumi (tkoi@slac.stanford.edu)       
@@ -37 +37 @@
 // 081107 Add UnUseGEM (then use the default channel of G4Evaporation)
 //            UseFrag (chage criterion of a inelastic reaction)
+// 090331 Change member shenXS and genspaXS object to pointer 
 //
 
@@ -70 +71 @@
       void UseFRAG(){ frag = true; };
 
+      void EnableFermiG(){ heg = true; setHighEnergyModel(); };
+
    private:
 
       void setEvaporationCh();
+      void setHighEnergyModel();
 
       G4QMDMeanField* meanField;
@@ -107 +111 @@
       G4double coulomb_collision_pz_targ;
 
-      G4IonsShenCrossSection shenXS;
-      G4IonsShenCrossSection genspaXS;
+//090331
+      G4IonsShenCrossSection* shenXS;
+      G4GeneralSpaceNNCrossSection* genspaXS;
 
       G4bool gem;
       G4bool frag;
+      G4bool heg;
 
 };

trunk/source/processes/hadronic/models/qmd/src/G4QMDCollision.cc

@@ -28 +28 @@
 //        Add several required updating of Mean Filed 
 //        Modified handling of absorption case by T. Koi
+// 090126 Fix in absorption case by T. Koi  
+// 090331 Fix for gamma participant by T. Koi 
 //
 #include "G4QMDCollision.hh"
-#include "G4ParticleDefinition.hh"
 #include "G4Scatterer.hh"
 #include "Randomize.hh"
@@ -260 +261 @@
       G4double rmi =  theSystem->GetParticipant( i )->GetMass();
       G4ParticleDefinition* pdi =  theSystem->GetParticipant( i )->GetDefinition();
+//090331 gamma 
+      if ( pdi->GetPDGMass() == 0.0 ) continue;
 
       //std::cout << " p4i00 " << p4i << std::endl;
@@ -295 +298 @@
          G4double rmj =  theSystem->GetParticipant( j )->GetMass();
          G4ParticleDefinition* pdj =  theSystem->GetParticipant( j )->GetDefinition();
+//090331 gamma 
+         if ( pdj->GetPDGMass() == 0.0 ) continue;
 
          G4double rr2 = theMeanField->GetRR2( i , j );
@@ -332 +337 @@
          G4double pidr = p4i.vect()*dr;
          G4double pjdr = p4j.vect()*dr;
-  
+
          G4double aij = 1.0 - ( rmi*rmj /pij ) * ( rmi*rmj /pij ); 
          G4double bij = pidr / rmi - pjdr*rmi/pij;
@@ -660 +665 @@
       else 
       {
-         if ( theMeanField->IsPauliBlocked ( i ) == false ) 
+         //if ( theMeanField->IsPauliBlocked ( i ) == false ) 
+         //090126                            i-1 cause jth is erased
+         if ( theMeanField->IsPauliBlocked ( i-1 ) == false ) 
          { 
             //G4cout << "Absorption Happen " << theSystem->GetTotalNumberOfParticipant() << G4endl;

trunk/source/processes/hadronic/models/qmd/src/G4QMDReaction.cc

@@ -31 +31 @@
 //            UseFrag (chage criterion of a inelastic reaction)
 //        Fix bug in nucleon projectiles  by T. Koi    
+// 090122 Be8 -> Alpha + Alpha 
+// 090331 Change member shenXS and genspaXS object to pointer 
 //
 #include "G4QMDReaction.hh"
@@ -45 +47 @@
 , frag ( false )
 {
+
+   //090331
+   shenXS = new G4IonsShenCrossSection();
+   //genspaXS = new G4GeneralSpaceNNCrossSection();
    meanField = new G4QMDMeanField();
    collision = new G4QMDCollision();
@@ -99 +105 @@
      G4double aTemp = projectile.GetMaterial()->GetTemperature();
 
-     //G4double xs_0 = shenXS.GetCrossSection ( proj_dp , targ_ele , aTemp );
-     G4double xs_0 = genspaXS.GetCrossSection ( proj_dp , targ_ele , aTemp );
+     //090331
+     G4double xs_0 = shenXS->GetCrossSection ( proj_dp , targ_ele , aTemp );
+     //G4double xs_0 = genspaXS->GetCrossSection ( proj_dp , targ_ele , aTemp );
      G4double bmax_0 = std::sqrt( xs_0 / pi );
      //std::cout << "bmax_0 in fm (fermi) " <<  bmax_0/fermi << std::endl;
@@ -470 +477 @@
           // Secondary from this nucleus (*it) 
           G4ParticleDefinition* pd = (*itt)->GetDefinition();
+
           G4LorentzVector p4 ( (*itt)->GetMomentum()/GeV , (*itt)->GetTotalEnergy()/GeV );  //in nucleus(*it) rest system
           G4LorentzVector p4_CM = CLHEP::boostOf( p4 , -nucleus_p4CM.findBoostToCM() );  // Back to CM
           G4LorentzVector p4_LAB = CLHEP::boostOf( p4_CM , boostBackToLAB ); // Back to LAB  
 
-          G4DynamicParticle* dp = new G4DynamicParticle( pd , p4_LAB*GeV );  
-          theParticleChange.AddSecondary( dp ); 
+
+//090122
+          //theParticleChange.AddSecondary( dp ); 
+          if ( !( pd->GetAtomicNumber() == 4 && pd->GetAtomicMass() == 8 ) )
+          {
+             G4DynamicParticle* dp = new G4DynamicParticle( pd , p4_LAB*GeV );  
+             theParticleChange.AddSecondary( dp ); 
+          }
+          else
+          {
+             //Be8 -> Alpha + Alpha + Q
+             G4ThreeVector randomized_direction( G4UniformRand() , G4UniformRand() , G4UniformRand() );
+             randomized_direction = randomized_direction.unit();
+             G4double q_decay = (*itt)->GetMass() - 2*G4Alpha::Alpha()->GetPDGMass();
+             G4double p_decay = std::sqrt ( std::pow(G4Alpha::Alpha()->GetPDGMass()+q_decay/2,2) - std::pow(G4Alpha::Alpha()->GetPDGMass() , 2 ) ); 
+             G4LorentzVector p4_a1 ( p_decay*randomized_direction , G4Alpha::Alpha()->GetPDGMass()+q_decay/2 );  //in Be8 rest system
+             
+             G4LorentzVector p4_a1_Be8 = CLHEP::boostOf ( p4_a1/GeV , -p4.findBoostToCM() );
+             G4LorentzVector p4_a1_CM = CLHEP::boostOf ( p4_a1_Be8 , -nucleus_p4CM.findBoostToCM() );
+             G4LorentzVector p4_a1_LAB = CLHEP::boostOf ( p4_a1_CM , boostBackToLAB );
+
+             G4LorentzVector p4_a2 ( -p_decay*randomized_direction , G4Alpha::Alpha()->GetPDGMass()+q_decay/2 );  //in Be8 rest system
+             
+             G4LorentzVector p4_a2_Be8 = CLHEP::boostOf ( p4_a2/GeV , -p4.findBoostToCM() );
+             G4LorentzVector p4_a2_CM = CLHEP::boostOf ( p4_a2_Be8 , -nucleus_p4CM.findBoostToCM() );
+             G4LorentzVector p4_a2_LAB = CLHEP::boostOf ( p4_a2_CM , boostBackToLAB );
+             
+             G4DynamicParticle* dp1 = new G4DynamicParticle( G4Alpha::Alpha() , p4_a1_LAB*GeV );  
+             G4DynamicParticle* dp2 = new G4DynamicParticle( G4Alpha::Alpha() , p4_a2_LAB*GeV );  
+             theParticleChange.AddSecondary( dp1 ); 
+             theParticleChange.AddSecondary( dp2 ); 
+          }
+//090122
 
 /*
@@ -698 +737 @@
 
 }
-