Changeset 962 for trunk/source/processes/hadronic/models/util

Timestamp:

Apr 6, 2009, 12:30:29 PM (17 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/hadronic/models/util

Files:

• History (modified) (1 diff)
• include/G4ExcitedString.hh (modified) (3 diffs)
• include/G4Fancy3DNucleus.hh (modified) (1 diff)
• src/G4ExcitedString.cc (modified) (3 diffs)
• src/G4Fancy3DNucleus.cc (modified) (3 diffs)

trunk/source/processes/hadronic/models/util/History

@@ -15 +15 @@
      ---------------------------------------------------------------
 
-27 Apr 2008 Gunter Folger (hadr-mod-util-V09-00-04)
+24 October 2008 Dennis Wright (hadr-mod-util-V09-01-07)
+-------------------------------------------------------
+- replace G4NucleiPropertiesTable::GetBindingEnergy with 
+  G4NucleiProperties::GetBindingEnergy in G4Fancy3DNucleus
+
+19 June 2008 G.Folger (hadr-mod-util-V09-01-06)
+-----------------------------------------------
+-  Attempt to fix memory leak in G4Fancy3DNucleus::SortNucleonsInZ().
+-   remove debug introduced code by VU
+
+19 June 2008 G. Cosmo (hadr-mod-util-V09-01-05)
+-----------------------------------------------
+-  Fixed noisy compilation warning in G4ExcitedString.hh for
+   unnecessary const qualifier to function return argument.
+
+19 June 2008 V. Uzhinsky (hadr-mod-util-V09-01-04)
+-------------------------------------------------
+-  Update of include/G4ExcitedString.hh
+
+18 June 2008 V. Uzhinsky (hadr-mod-util-V09-01-03)
+--------------------------------------------------
+-  G4ExcitedString::GetTimeOfCreation() const;
+-  G4ExcitedString::SetTimeOfCreation(G4double aTime);
+   Two new methods for operations with Time of a string Creation
+
+14 May 2008 G.Folger      (hadr-mod-util-V09-01-02)
 ---------------------------------------------------
-- Corrected 'if' logic in G4Fragment::CalculateExcitationEnergy().
-- Tag for release 9.1.p02.
+-  G4Fancy3DNucleus::SortNucleonsInZ() new method to sort nucleons 
+     using z-coordinate 
+
+5 May 2008 G.Folger       (hadr-mod-util-V09-01-01)
+---------------------------------------------------
+- correct logic bug in CalculateExcitationEnergy() introduced by gcc-4.3 fix.
 
 21 Mar 2008 Dennis Wright (hadr-mod-util-V09-01-00)

trunk/source/processes/hadronic/models/util/include/G4ExcitedString.hh

@@ -71 +71 @@
       int operator!=(const G4ExcitedString &right) const;
 
+      G4double GetTimeOfCreation() const;               // Uzhi 15.05.08
+
+      void  SetTimeOfCreation(G4double aTime);          // Uzhi 15.05.08
+
       const G4ThreeVector & GetPosition() const;
 
@@ -107 +111 @@
 
       G4int    theDirection;  // must be 1 or -1 (PROJECTILE or TARGET)
+      G4double theTimeOfCreation;                   // Uzhi 15.05.08
       G4ThreeVector thePosition;
       G4PartonVector thePartons;  // would like initial capacity for 3 Partons.
@@ -123 +128 @@
 {
         return this != &right;
+}
+
+inline
+G4double G4ExcitedString::GetTimeOfCreation() const      // Uzhi 15.05.08
+{
+        return theTimeOfCreation;
+}
+
+inline
+void G4ExcitedString::SetTimeOfCreation(G4double aTime)  // Uzhi 15.05.08
+{
+        theTimeOfCreation=aTime;                         // Uzhi 15.05.08
 }
 

trunk/source/processes/hadronic/models/util/include/G4Fancy3DNucleus.hh

@@ -85 +85 @@
       void DoTranslation(const G4ThreeVector & theShift);
       const G4VNuclearDensity * GetNuclearDensity() const;
+      void SortNucleonsInZ();
       
   private:

trunk/source/processes/hadronic/models/util/src/G4ExcitedString.cc

@@ -47 +47 @@
     thePartons.push_back(Color);
     thePartons.push_back(AntiColor);
+    theTimeOfCreation = 0.;                           // Uzhi 15.05.08
     thePosition = Color->GetPosition();
     theDirection = Direction;
@@ -57 +58 @@
     thePartons.push_back(Gluon);
     thePartons.push_back(AntiColor);
+    theTimeOfCreation = 0.;                            // Uzhi 15.05.08
     thePosition = Color->GetPosition();
     theDirection = Direction;
@@ -64 +66 @@
 G4ExcitedString::G4ExcitedString(G4KineticTrack * track)
 {
+        theTimeOfCreation = track->GetFormationTime(); // Uzhi 15.05.08
         thePosition = track->GetPosition();
         theTrack= track;

trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc

@@ -37 +37 @@
 #include "G4NuclearFermiDensity.hh"
 #include "G4NuclearShellModelDensity.hh"
-#include "G4NucleiPropertiesTable.hh"
+#include "G4NucleiProperties.hh"
 #include "Randomize.hh"
 #include "G4ios.hh"
 #include <algorithm>
 #include "G4HadronicException.hh"
+
 
 G4Fancy3DNucleus::G4Fancy3DNucleus()
@@ -131 +132 @@
 }
 
+   bool G4Fancy3DNucleusHelperForSortInZ(const G4Nucleon* nuc1, const G4Nucleon* nuc2)
+{
+        return nuc1->GetPosition().z() < nuc2->GetPosition().z();
+}    
+
+void G4Fancy3DNucleus::SortNucleonsInZ()
+{
+        
+        GetNucleons();   // make sure theRWNucleons is initialised
+
+        if (theRWNucleons.size() < 2 ) return; 
+
+        sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
+
+// now copy sorted nucleons to theNucleons array. TheRWNucleons are pointers in theNucleons
+//  so we need to copy to new, and then swap. 
+        G4Nucleon * sortedNucleons = new G4Nucleon[myA];
+        for ( unsigned int i=0; i<theRWNucleons.size(); i++ )
+        {
+           sortedNucleons[i]= *(theRWNucleons[i]);
+        }
+
+        theRWNucleons.clear();   // about to delete array these point to....
+        delete [] theNucleons;
+        
+        theNucleons=sortedNucleons;
+
+        return;
+}
+
+
 G4double G4Fancy3DNucleus::BindingEnergy()
 {
-        return G4NucleiPropertiesTable::GetBindingEnergy(myZ,myA);
-}
+  return G4NucleiProperties::GetBindingEnergy(myA,myZ);
+}
+
 
 G4double G4Fancy3DNucleus::GetNuclearRadius()
@@ -261 +294 @@
         G4bool          freeplace;
         static G4double nd2 = sqr(nucleondistance);
-        G4double maxR=GetNuclearRadius(0.01);   //  there are no nucleons at a
+        G4double maxR=GetNuclearRadius(0.001);   //  there are no nucleons at a
                                                 //  relative Density of 0.01
         G4int jr=0;