Changeset 1196 for trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

File:

• trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc (modified) (11 diffs)

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

@@ -68 +68 @@
   if(theNucleons) delete [] theNucleons;
 
-// this was delected already:
-//  std::for_each(theRWNucleons.begin(), theRWNucleons.end(), DeleteNucleon());
   theRWNucleons.clear();
 
@@ -119 +117 @@
 }
 
-
 const std::vector<G4Nucleon *> & G4Fancy3DNucleus::GetNucleons()
 {
@@ -132 +129 @@
 }
 
+//void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.08.08
+
    bool G4Fancy3DNucleusHelperForSortInZ(const G4Nucleon* nuc1, const G4Nucleon* nuc2)
 {
@@ -137 +136 @@
 }    
 
-void G4Fancy3DNucleus::SortNucleonsInZ()
+//void G4Fancy3DNucleus::SortNucleonsInZ()
+void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.08.08
 {
         
@@ -162 +162 @@
 }
 
+void G4Fancy3DNucleus::SortNucleonsDecZ() // on decreased Z-coordinates Uzhi 29.08.08
+{
+        G4Nucleon * sortedNucleons = new G4Nucleon[myA];
+        
+        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. 
+        for ( unsigned int i=0; i<theRWNucleons.size(); i++ )
+        {
+           sortedNucleons[i]= *(theRWNucleons[myA-1-i]);  // Uzhi 29.08.08
+        }
+        theRWNucleons.clear();   // about to delete array elements these point to....
+        delete [] theNucleons;
+        theNucleons=sortedNucleons;
+
+        return;
+}
 
 G4double G4Fancy3DNucleus::BindingEnergy()
@@ -300 +321 @@
         G4double arand[600];
         G4double *prand=arand;
-//      G4int Attempt=0;
         while ( i < myA )
         {
            do
            {    
-//              ++Attempt;
                 if ( jr < 3 ) 
                 {
@@ -350 +369 @@
            }
         }
-//      G4cout << "Att " << myA << " " << Attempt << G4endl;
 
 }
@@ -384 +402 @@
               {
                   G4cerr << "G4Fancy3DNucleus: difficulty finding proton momentum" << G4endl;
-                  mom=0;
+                  mom=G4ThreeVector(0,0,0);
               }
 
@@ -400 +418 @@
 //     ;
 //     G4cout << "final sum / mag() " << sum << " / " << sum.mag() << G4endl;
-
 
     G4double energy;
@@ -531 +548 @@
         // Now we have a nucleon with a bigger Fermi Momentum.
         // Exchange with last nucleon.. and iterate.
-//      G4cout << " Nucleon to swap with : " << swapit << G4endl;
-//      G4cout << " Fermi momentum test, and better.. " << PFermi << " / "
-//             << theFermi.GetFermiMomentum(density) << G4endl;
-//      cout << theNucleons[swapit]<< G4endl << theNucleons[myA-1] << G4endl;
-//      cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
         G4Nucleon swap= theNucleons[swapit];
         G4ThreeVector mom_swap=momentum[swapit];
@@ -545 +557 @@
         momentum[myA-1]=mom_swap;
         pFermiM[myA-1]=pf;
-//      cout << "after swap" <<G4endl<< theNucleons[swapit] << G4endl << theNucleons[myA-1] << G4endl;
-//      cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
         return ReduceSum(momentum,pFermiM);
 }