Changeset 1055 for trunk/source/processes/hadronic/models/neutron_hp/src

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/neutron_hp/src

Files:

• G4NeutronHPInelasticCompFS.cc (modified) (4 diffs)
• G4NeutronHPPhotonDist.cc (modified) (9 diffs)

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc

@@ -36 +36 @@
 //        introduce theNDLDataA,Z which has A and Z of NDL data by T. Koi
 // 081024 G4NucleiPropertiesTable:: to G4NucleiProperties::
+// 090514 Fix bug in IC electron emission case 
+//        Contribution from Chao Zhang (Chao.Zhang@usd.edu) and Dongming Mei(Dongming.Mei@usd.edu)
 //
 #include "G4NeutronHPInelasticCompFS.hh"
@@ -69 +71 @@
 void G4NeutronHPInelasticCompFS::Init (G4double A, G4double Z, G4String & dirName, G4String & aFSType)
 {
+
   gammaPath = "/Inelastic/Gammas/";
     if(!getenv("G4NEUTRONHPDATA")) 
@@ -460 +463 @@
 
       aHadron.SetMomentum( Vector*p ); 
-                                      
+
     }
 
@@ -577 +580 @@
       {
         theSec = new G4DynamicParticle;    
-        theSec->SetDefinition(G4Gamma::Gamma());
+        //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+        //theSec->SetDefinition(G4Gamma::Gamma());
+        theSec->SetDefinition( thePhotons->operator[](i)->GetDefinition() );
+        //But never cause real effect at least with G4NDL3.13 TK
         theSec->SetMomentum(thePhotons->operator[](i)->GetMomentum());
         theResult.AddSecondary(theSec); 

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPPhotonDist.cc

@@ -36 +36 @@
 // 080801 Correcting data disorder which happened when both InitPartial 
 //        and InitAnglurar methods was called in a same instance by T. Koi
+// 090514 Fix bug in IC electron emission case 
+//        Contribution from Chao Zhang (Chao.Zhang@usd.edu) and Dongming Mei(Dongming.Mei@usd.edu)
+//        But it looks like never cause real effect in G4NDL3.13 (at least Natural elements) TK
 //
 // there is a lot of unused (and undebugged) code in this file. Kept for the moment just in case. @@
@@ -48 +51 @@
 G4bool G4NeutronHPPhotonDist::InitMean(std::ifstream & aDataFile)
 {
+
   G4bool result = true;
   if(aDataFile >> repFlag)
   {
+
     aDataFile >> targetMass;
     if(repFlag==1)
@@ -73 +78 @@
        theBaseEnergy*=eV;
        aDataFile >> theInternalConversionFlag;
+       // theInternalConversionFlag == 1 No IC, theInternalConversionFlag == 2 with IC 
        aDataFile >> nGammaEnergies;
        theLevelEnergies = new G4double[nGammaEnergies];
@@ -118 +124 @@
   if (isoFlag != 1)
   {
+if ( repFlag == 2 ) G4cout << "TKDB repFlag == 2 && isoFlag !=1  " << G4endl;
     aDataFile >> tabulationType >> nDiscrete2 >> nIso;
 //080731
@@ -547 +554 @@
     {
       theOne->SetDefinition(G4Electron::Electron());
+      //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+      //But never enter at least with G4NDL3.13
+      totalEnergy += G4Electron::Electron()->GetPDGMass(); //proposed correction: add this line for electron
     }
     theOne->SetTotalEnergy(totalEnergy);
-    if( isoFlag == 1)
+    if( isoFlag == 1 )
     {
       G4double costheta = 2.*G4UniformRand()-1;
@@ -555 +565 @@
       G4double phi = twopi*G4UniformRand();
       G4double sinth = std::sin(theta);
-      G4double en = theOne->GetTotalEnergy();
+      //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+      //G4double en = theOne->GetTotalEnergy();
+      G4double en = theOne->GetTotalMomentum();
+      //But never cause real effect at least with G4NDL3.13 TK
       G4ThreeVector temp(en*sinth*std::cos(phi), en*sinth*std::sin(phi), en*std::cos(theta) );
       theOne->SetMomentum( temp ) ;
@@ -569 +582 @@
       if(ii<nIso)
       {
+        //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
         // isotropic distribution
-        G4double theta = pi*G4UniformRand();
+        //G4double theta = pi*G4UniformRand();
+        G4double theta = std::acos(2.*G4UniformRand()-1.);
+        //But this is alos never cause real effect at least with G4NDL3.13 TK  not repFlag == 2 AND isoFlag != 1
         G4double phi = twopi*G4UniformRand();
         G4double sinth = std::sin(theta);
-        G4double en = theOne->GetTotalEnergy();
+        //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+        //G4double en = theOne->GetTotalEnergy();
+        G4double en = theOne->GetTotalMomentum();
+        //But never cause real effect at least with G4NDL3.13 TK
         G4ThreeVector tempVector(en*sinth*std::cos(phi), en*sinth*std::sin(phi), en*std::cos(theta) );
         theOne->SetMomentum( tempVector ) ;
@@ -594 +613 @@
         G4double phi = twopi*G4UniformRand();
         G4double sinth = std::sin(theta);
-        G4double en = theOne->GetTotalEnergy();
+        //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+        //G4double en = theOne->GetTotalEnergy();
+        G4double en = theOne->GetTotalMomentum();
+        //But never cause real effect at least with G4NDL3.13 TK
         G4ThreeVector tempVector(en*sinth*std::cos(phi), en*sinth*std::sin(phi), en*std::cos(theta) );
         theOne->SetMomentum( tempVector ) ;
@@ -612 +634 @@
         G4double phi = twopi*G4UniformRand();
         G4double sinth = std::sin(theta);
-        G4double en = theOne->GetTotalEnergy();
+        //Bug reported Chao Zhang (Chao.Zhang@usd.edu), Dongming Mei(Dongming.Mei@usd.edu) Feb. 25, 2009 
+        //G4double en = theOne->GetTotalEnergy();
+        G4double en = theOne->GetTotalMomentum();
+        //But never cause real effect at least with G4NDL3.13 TK
         G4ThreeVector tmpVector(en*sinth*std::cos(phi), en*sinth*std::sin(phi), en*costh );
         theOne->SetMomentum( tmpVector ) ;